From 99fbecc8345b66197650970c2f1ee568bc430ce5 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Fri, 11 Mar 2022 14:06:12 +0800
Subject: [PATCH 001/208] =?UTF-8?q?gitea=20=E8=AF=B7=E6=B1=82=E5=BB=B6?=
 =?UTF-8?q?=E9=95=BF=E5=88=B020=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb
index 7cdfdd49..b0c842db 100644
--- a/app/services/gitea/client_service.rb
+++ b/app/services/gitea/client_service.rb
@@ -82,7 +82,7 @@ class Gitea::ClientService < ApplicationService
         req.headers['Content-Type'] = 'application/json'
         req.response :logger # 显示日志
         req.adapter Faraday.default_adapter
-        req.options.timeout = 100           # open/read timeout in seconds
+        req.options.timeout = 1200           # open/read timeout in seconds
         req.options.open_timeout = 10      # connection open timeout in seconds
         if token.blank?
           req.basic_auth(username, secret)

From bc639488aa641450ab15622e0b327c3afc906fd3 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 22 Mar 2022 10:45:14 +0800
Subject: [PATCH 002/208] fix: issues filter error

---
 app/controllers/issues_controller.rb        | 2 +-
 app/controllers/pull_requests_controller.rb | 2 +-
 app/services/issues/list_query_service.rb   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index ad53a4b3..b546ea71 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -24,7 +24,7 @@ class IssuesController < ApplicationController
     @filter_issues = @all_issues
     @filter_issues = @filter_issues.where.not(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::ADD
     @filter_issues = @filter_issues.where(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::SOLVING
-    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
+    @filter_issues = @filter_issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
     @open_issues = @all_issues.where.not(status_id: IssueStatus::CLOSED)
     @close_issues = @all_issues.where(status_id: IssueStatus::CLOSED)
     scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 5500ed79..189c5c6b 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -16,7 +16,7 @@ class PullRequestsController < ApplicationController
     issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
     @all_issues = issues.distinct
     @filter_issues = @all_issues
-    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
+    @filter_issues = @filter_issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
     @open_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::OPEN})
     @close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
     @merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::MERGED})
diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb
index f85e2cb9..def9644d 100644
--- a/app/services/issues/list_query_service.rb
+++ b/app/services/issues/list_query_service.rb
@@ -27,12 +27,12 @@ class Issues::ListQueryService < ApplicationService
       issues = issues.joins(:pull_request).where(pull_requests: {status: 1})
     end
 
-    if search_name.present?
-      issues = issues.where("subject LIKE ? OR description LIKE ? ", "%#{search_name}%", "%#{search_name}%")
-    end
+    # if search_name.present?
+    #   issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%")
+    # end
 
     if start_time&.present? || end_time&.present?
-      issues = issues.where("start_date between ? and ?",start_time&.present? ? start_time.to_date : Time.now.to_date, end_time&.present? ? end_time.to_date : Time.now.to_date)
+      issues = issues.where("issues.start_date between ? and ?",start_time&.present? ? start_time.to_date : Time.now.to_date, end_time&.present? ? end_time.to_date : Time.now.to_date)
     end
 
     issues = issues.where(author_id: params[:author_id]) if params[:author_id].present? && params[:author_id].to_s != "all"

From d0d906d04c4e7c97ec9c602bbcbd578b92e4a157 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 28 Mar 2022 11:05:21 +0800
Subject: [PATCH 003/208] fix: readme image regex error rescued

---
 app/helpers/repositories_helper.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index c6924185..e6e7e87f 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -57,6 +57,7 @@ module RepositoriesHelper
       total_images = ss + ss_src
       if total_images.length > 0
         total_images.each do |s|
+         begin
           image_title = /\"(.*?)\"/
           r_content = s[0]
           remove_title = r_content.to_s.scan(image_title)
@@ -75,6 +76,9 @@ module RepositoriesHelper
             new_r_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{r_content}&ref=#{ref}"].join
           end
           content = content.gsub(/#{r_content}/, new_r_content)
+         rescue
+          next
+         end
         end
       end
   
@@ -96,7 +100,9 @@ module RepositoriesHelper
 
   def decode64_content(entry, owner, repo, ref, path=nil)
     if is_readme?(entry['type'], entry['name'])
+      Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
       content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
+      Rails.logger.info("content===#{content}")
       readme_render_decode64_content(content, owner, repo, ref)
     else
       file_type = File.extname(entry['name'].to_s)[1..-1]

From 747646cd9d4bdd214dc8312e02b72d925468fffc Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 30 Mar 2022 16:19:32 +0800
Subject: [PATCH 004/208] add: trace client and api completed

---
 app/libs/trace.rb                          |  21 +++
 app/services/trace/add_user_service.rb     |  37 ++++++
 app/services/trace/check_result_service.rb |  33 +++++
 app/services/trace/check_service.rb        |  36 ++++++
 app/services/trace/client_service.rb       | 143 +++++++++++++++++++++
 app/services/trace/login_service.rb        |  29 +++++
 app/services/trace/pdf_report_service.rb   |  26 ++++
 app/services/trace/reload_check_service.rb |  25 ++++
 config/configuration.yml.example           |   4 +
 9 files changed, 354 insertions(+)
 create mode 100644 app/libs/trace.rb
 create mode 100644 app/services/trace/add_user_service.rb
 create mode 100644 app/services/trace/check_result_service.rb
 create mode 100644 app/services/trace/check_service.rb
 create mode 100644 app/services/trace/client_service.rb
 create mode 100644 app/services/trace/login_service.rb
 create mode 100644 app/services/trace/pdf_report_service.rb
 create mode 100644 app/services/trace/reload_check_service.rb

diff --git a/app/libs/trace.rb b/app/libs/trace.rb
new file mode 100644
index 00000000..b1c3c476
--- /dev/null
+++ b/app/libs/trace.rb
@@ -0,0 +1,21 @@
+module Trace 
+  class << self
+    def trace_config 
+      trace_config = {}
+
+      begin
+        config = Rails.application.config_for(:configuration).symbolize_keys!
+        trace_config = config[:trace].symbolize_keys!
+        raise 'trace config missing' if trace_config.blank?
+      rescue => exception
+        raise ex if Rails.env.production?
+
+        puts %Q{\033[33m [warning] gitea config or configuration.yml missing,
+                 please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m}
+        trace_config = {}
+      end
+
+      trace_config 
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/services/trace/add_user_service.rb b/app/services/trace/add_user_service.rb
new file mode 100644
index 00000000..9c7b12b4
--- /dev/null
+++ b/app/services/trace/add_user_service.rb
@@ -0,0 +1,37 @@
+# 代码溯源 添加用户
+class Trace::AddUserService  < Trace::ClientService
+
+  # 用户名 密码 单位 手机号 邮箱 昵称
+  attr_accessor :username, :password, :unit, :telnumber, :email, :name
+
+  def initialize(username, password, unit, telnumber, email, name) 
+    @username = username 
+    @password = password
+    @unit = unit 
+    @telnumber = telnumber
+    @email = email 
+    @name = name
+  end
+
+  def call 
+    result = post(url, request_params)
+    response = render_response(result)
+  end
+
+  private 
+
+  def request_params 
+    {
+      username: username,
+      password: password, 
+      unit: unit, 
+      telnumber: telnumber,
+      email: email,
+      name: name
+    }
+  end
+
+  def url
+    "/user/addccfuser".freeze
+  end
+end
\ No newline at end of file
diff --git a/app/services/trace/check_result_service.rb b/app/services/trace/check_result_service.rb
new file mode 100644
index 00000000..f1dd61ab
--- /dev/null
+++ b/app/services/trace/check_result_service.rb
@@ -0,0 +1,33 @@
+# 代码溯源 查询检测结果
+class Trace::CheckResultService < Trace::ClientService
+
+  attr_accessor :token, :project_name, :file_name, :page_num, :page_size
+
+  def initialize(token, project_name=nil, file_name=nil, page_num=1, page_size=15) 
+    @token = token 
+    @project_name = project_name 
+    @file_name = file_name
+    @page_num = page_num
+    @page_size = page_size
+  end
+
+  def call
+    result = authed_get(token, url, request_params)
+    reponse = render_response(result)
+  end
+
+  private 
+  def request_params 
+    {
+      product_name: project_name, 
+      file_name: file_name,
+      pageNum: page_num,
+      pageSize: page_size,
+    }
+  end
+
+  def url 
+    "/user/checkresult".freeze
+  end
+end
+
diff --git a/app/services/trace/check_service.rb b/app/services/trace/check_service.rb
new file mode 100644
index 00000000..841627b5
--- /dev/null
+++ b/app/services/trace/check_service.rb
@@ -0,0 +1,36 @@
+# 代码溯源 开始检测
+class Trace::CheckService < Trace::ClientService
+
+  attr_accessor :token, :project, :if_branch, :branch_tag 
+
+  def initialize(token, project, if_branch, branch_tag) 
+    @token = token 
+    @project = project 
+    @if_branch = if_branch
+    @branch_tag = branch_tag
+  end
+
+  def call
+    result = authed_post(token, url, request_params)
+    reponse = render_response(result)
+  end
+
+  private 
+  def request_params 
+   repo = Gitea::Repository::GetService.call(project&.owner&.login, project&.identifier)
+    {
+      product_name: project&.name, 
+      product_type: project&.category&.name,
+      code_type: project&.language&.name,
+      product_desc: project&.description,
+      git_url: repo['clone_url'],
+      if_branch: if_branch,
+      branch_tag: branch_tag
+    }
+  end
+
+  def url 
+    "/user/check".freeze
+  end
+end
+
diff --git a/app/services/trace/client_service.rb b/app/services/trace/client_service.rb
new file mode 100644
index 00000000..ff6b7281
--- /dev/null
+++ b/app/services/trace/client_service.rb
@@ -0,0 +1,143 @@
+class Trace::ClientService < ApplicationService
+
+  def post(url, params={})
+    puts "[trace][POST] request params: #{params}"
+    conn.post do |req|
+      req.url = full_url(url)
+      req.body = params[:data].to_json 
+    end
+  end
+
+  def authed_post(token, url, params={})
+    puts "[trace][POST] request params: #{params}"
+    puts "[trace][POST] request token: #{token}"
+    conn.post do |req|
+      req.url = full_url(url)
+      req.body = params[:data].to_json 
+      req.headers['Authorization'] = token
+    end
+  end
+
+  def get(url, params={})
+    puts "[trace][GET] request params: #{params}"
+    conn.get do |req|
+      req.url full_url(url, 'get')
+      params.each_pair do |key, value|
+        req.params["#{key}"] = value
+      end
+    end
+  end
+
+  def authed_get(token, url, params={})
+    puts "[trace][GET] request params: #{params}"
+    puts "[trace][GET] request token: #{token}"
+    conn.get do |req|
+      req.url full_url(url, 'get')
+      params.each_pair do |key, value|
+        req.params["#{key}"] = value
+      end
+      req.headers['Authorization'] = token
+    end
+  end
+
+  def delete(url, params={})
+    puts "[trace][DELETE] request params: #{params}"
+    conn.delete do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+    end
+  end
+
+  def authed_delete(token, url, params={})
+    puts "[trace][DELETE] request params: #{params}"
+    puts "[trace][DELETE] request token: #{token}"
+    conn.delete do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+      req.headers['Authorization'] = token
+    end
+  end
+
+  def patch(url, params={})
+    puts "[trace][PATCH] request params: #{params}"
+    conn.patch do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+    end
+  end
+
+  def authed_patch(token, url, params={})
+    puts "[trace][PATCH] request params: #{params}"
+    puts "[trace][PATCH] request token: #{token}"
+    conn.patch do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+      req.headers['Authorization'] = token
+    end
+  end
+
+  def put(url, params={})
+    puts "[trace][PUT] request params: #{params}"
+    conn.put do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+    end
+  end
+
+  def authed_put(token, url, params={})
+    puts "[trace][PUT] request params: #{params}"
+    puts "[trace][PUT] request token: #{token}"
+    conn.put do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+      req.headers['Authorization'] = token
+    end
+  end
+
+  private 
+  def conn 
+    @client ||= begin
+      Faraday.new(url: domain) do |req|
+        req.request :url_encoded
+        req.headers['Content-Type'] = 'application/json'
+        req.adapter Faraday.default_adapter
+      end
+    end
+
+    @client
+  end
+
+  def base_url 
+    Trace.trace_config[:base_url]
+  end
+
+  def domain
+    Trace.trace_config[:domain]
+  end
+
+  def api_url
+    [domain, base_url].join('')
+  end
+
+  def full_url(api_rest, action='post')
+    url = [api_url, api_rest].join('').freeze
+    url = action === 'get' ? url : URI.escape(url)
+    url = URI.escape(url) unless url.ascii_only?
+    puts "[trace] request url: #{url}"
+    return url
+  end
+  
+  def log_error(status, body)
+    puts "[trace] status:  #{status}"
+    puts "[trace] body:    #{body}"
+  end
+
+  def render_response(response)
+    status = response.status
+    body = JSON.parse(response&.body)
+
+    log_error(status, body)
+
+    return [body["code"], body["Data"], body["Error"]]
+  end
+end
\ No newline at end of file
diff --git a/app/services/trace/login_service.rb b/app/services/trace/login_service.rb
new file mode 100644
index 00000000..b245ea73
--- /dev/null
+++ b/app/services/trace/login_service.rb
@@ -0,0 +1,29 @@
+# 代码溯源 用户登录
+class Trace::LoginService  < Trace::ClientService
+
+  # 用户名 密码
+  attr_accessor :username, :password
+
+  def initialize(username, password) 
+    @username = username 
+    @password = password
+  end
+
+  def call 
+    result = post(url, request_params)
+    response = render_response(result)
+  end
+
+  private 
+
+  def request_params 
+    {
+      username: username,
+      password: password, 
+    }
+  end
+
+  def url
+    "/user/login".freeze
+  end
+end
\ No newline at end of file
diff --git a/app/services/trace/pdf_report_service.rb b/app/services/trace/pdf_report_service.rb
new file mode 100644
index 00000000..e91a78b3
--- /dev/null
+++ b/app/services/trace/pdf_report_service.rb
@@ -0,0 +1,26 @@
+# 代码溯源 导出pdf
+class Trace::PdfReportService < Trace::ClientService
+  
+  attr_accessor :token, :task_id 
+
+  def initialize(token, task_id)
+    @token = token 
+    @task_id = task_id
+  end
+
+  def call 
+    result = authed_get(token, url, request_params)
+    response = render_response(result)
+  end
+
+  private 
+  def request_params 
+    {
+      task_id: task_id
+    }
+  end
+
+  def url
+    "/user/pdfreport".freeze
+  end
+end
\ No newline at end of file
diff --git a/app/services/trace/reload_check_service.rb b/app/services/trace/reload_check_service.rb
new file mode 100644
index 00000000..b2c4a0ff
--- /dev/null
+++ b/app/services/trace/reload_check_service.rb
@@ -0,0 +1,25 @@
+# 代码溯源 重新检测
+class Trace::ReloadCheckService < Trace::ClientService
+
+  attr_accessor :token, :fake_project_id 
+  def initialize(token, fake_project_id)
+    @token = token
+    @fake_project_id = fake_project_id
+  end
+
+  def call
+    result = authed_post(token, url, request_params)
+    response = render_response(result)
+  end
+
+  private 
+  def request_params 
+    {
+      project_id: fake_project_id
+    }
+  end
+
+  def url 
+    '/user/reloadcheck'.freeze
+  end
+end
\ No newline at end of file
diff --git a/config/configuration.yml.example b/config/configuration.yml.example
index b5653012..61e66635 100644
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -62,6 +62,10 @@ default: &default
     write_domain: ''
     read_domain: ''
     base_url: ''
+  
+  trace: 
+    domain: ''
+    base_url: ''
 
 production:
   <<: *default

From 4bbb843edfb6143eaad79e320446ec4e24f2e788 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 31 Mar 2022 12:54:39 +0800
Subject: [PATCH 005/208] add: trace users and get trace token

---
 app/models/trace_user.rb                      | 58 +++++++++++++++++++
 app/models/user.rb                            | 17 ++++++
 .../20220331031530_create_trace_users.rb      | 17 ++++++
 spec/models/trace_user_spec.rb                |  5 ++
 4 files changed, 97 insertions(+)
 create mode 100644 app/models/trace_user.rb
 create mode 100644 db/migrate/20220331031530_create_trace_users.rb
 create mode 100644 spec/models/trace_user_spec.rb

diff --git a/app/models/trace_user.rb b/app/models/trace_user.rb
new file mode 100644
index 00000000..e8964156
--- /dev/null
+++ b/app/models/trace_user.rb
@@ -0,0 +1,58 @@
+# == Schema Information
+#
+# Table name: trace_users
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  username   :string(255)
+#  password   :string(255)
+#  unit       :string(255)
+#  telnumber  :string(255)
+#  email      :string(255)
+#  name       :string(255)
+#  token      :text(65535)
+#  expired_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_trace_users_on_user_id  (user_id)
+#
+
+# 代码溯源 用户
+class TraceUser < ApplicationRecord
+
+  belongs_to :user
+
+
+  def build_self_data
+    return if user.nil? 
+
+    self.username = user.login 
+    self.password = SecureRandom.hex
+    self.unit = user.custom_department.blank? ? 'GitLink' : user.custom_department
+    self.telnumber = user.phone.blank? ? '13800000000' : user.phone
+    self.email = user.mail 
+    self.name = user.nickname.blank? ? user.login : user.nickname 
+
+    self
+  end
+
+
+  def build_token 
+    return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? 
+
+    response = Trace::AddUserService.call(username, password, unit, telnumber, email, name)
+    self.token = response[1]['token']
+    self.expired_at = Time.now + 1.hours
+  end
+
+  def refresh_token 
+    return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? 
+
+    response = Trace::LoginService.call(username, password)
+    self.token = response[1]['token']
+    self.expired_at = Time.now + 1.hours
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 5ca3356b..903b60c3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -173,6 +173,7 @@ class User < Owner
 
   has_many :system_notification_histories
   has_many :system_notifications, through: :system_notification_histories
+  has_one :trace_user, dependent: :destroy
   
   # Groups and active users
   scope :active, lambda { where(status: STATUS_ACTIVE) }
@@ -776,6 +777,22 @@ class User < Owner
     self.nickname.present? && self.mail.present?
   end
 
+  def trace_token 
+    if trace_user.present?
+      if trace_user.expired_at < Time.now
+        trace_user.refresh_token
+        trace_user.save
+      end
+    else
+      trace_user = TraceUser.new
+      trace_user.build_self_data
+      trace_user.build_token 
+      trace_user.save
+    end
+
+    trace_user.token
+  end
+
   protected
   def validate_password_length
     # 管理员的初始密码是5位
diff --git a/db/migrate/20220331031530_create_trace_users.rb b/db/migrate/20220331031530_create_trace_users.rb
new file mode 100644
index 00000000..5c8b532c
--- /dev/null
+++ b/db/migrate/20220331031530_create_trace_users.rb
@@ -0,0 +1,17 @@
+class CreateTraceUsers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :trace_users do |t|
+      t.references :user 
+      t.string :username 
+      t.string :password
+      t.string :unit 
+      t.string :telnumber
+      t.string :email 
+      t.string :name
+      t.text :token
+      t.datetime :expired_at
+
+      t.timestamps
+    end
+  end
+end
diff --git a/spec/models/trace_user_spec.rb b/spec/models/trace_user_spec.rb
new file mode 100644
index 00000000..ddcc25e4
--- /dev/null
+++ b/spec/models/trace_user_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe TraceUser, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 9ced678f910f2b56d79ae2f1ecc7e638a2083831 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 31 Mar 2022 13:03:54 +0800
Subject: [PATCH 006/208] fix: user trace token

---
 app/models/user.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 903b60c3..d661ab59 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -783,14 +783,16 @@ class User < Owner
         trace_user.refresh_token
         trace_user.save
       end
+      return trace_user.token
     else
-      trace_user = TraceUser.new
-      trace_user.build_self_data
-      trace_user.build_token 
-      trace_user.save
-    end
+      tu = TraceUser.new
+      tu.user = self
+      tu.build_self_data
+      tu.build_token 
+      tu.save
 
-    trace_user.token
+      return tu.token
+    end
   end
 
   protected

From ecfc39565ca4da5c9e9b22958cc962421f4e5826 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 31 Mar 2022 13:18:38 +0800
Subject: [PATCH 007/208] fix

---
 app/services/trace/client_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/trace/client_service.rb b/app/services/trace/client_service.rb
index ff6b7281..df9a4321 100644
--- a/app/services/trace/client_service.rb
+++ b/app/services/trace/client_service.rb
@@ -3,7 +3,7 @@ class Trace::ClientService < ApplicationService
   def post(url, params={})
     puts "[trace][POST] request params: #{params}"
     conn.post do |req|
-      req.url = full_url(url)
+      req.url full_url(url)
       req.body = params[:data].to_json 
     end
   end
@@ -12,7 +12,7 @@ class Trace::ClientService < ApplicationService
     puts "[trace][POST] request params: #{params}"
     puts "[trace][POST] request token: #{token}"
     conn.post do |req|
-      req.url = full_url(url)
+      req.url full_url(url)
       req.body = params[:data].to_json 
       req.headers['Authorization'] = token
     end

From db4031b8bfcd1cfc6664b7eae35c7151e6639665 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 31 Mar 2022 14:24:47 +0800
Subject: [PATCH 008/208] fix

---
 app/services/trace/add_user_service.rb     | 2 +-
 app/services/trace/check_service.rb        | 2 +-
 app/services/trace/login_service.rb        | 2 +-
 app/services/trace/reload_check_service.rb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/services/trace/add_user_service.rb b/app/services/trace/add_user_service.rb
index 9c7b12b4..0099f6e9 100644
--- a/app/services/trace/add_user_service.rb
+++ b/app/services/trace/add_user_service.rb
@@ -14,7 +14,7 @@ class Trace::AddUserService  < Trace::ClientService
   end
 
   def call 
-    result = post(url, request_params)
+    result = post(url, {data: request_params})
     response = render_response(result)
   end
 
diff --git a/app/services/trace/check_service.rb b/app/services/trace/check_service.rb
index 841627b5..d31bbcf0 100644
--- a/app/services/trace/check_service.rb
+++ b/app/services/trace/check_service.rb
@@ -11,7 +11,7 @@ class Trace::CheckService < Trace::ClientService
   end
 
   def call
-    result = authed_post(token, url, request_params)
+    result = authed_post(token, url, {data: request_params})
     reponse = render_response(result)
   end
 
diff --git a/app/services/trace/login_service.rb b/app/services/trace/login_service.rb
index b245ea73..9f59d8e1 100644
--- a/app/services/trace/login_service.rb
+++ b/app/services/trace/login_service.rb
@@ -10,7 +10,7 @@ class Trace::LoginService  < Trace::ClientService
   end
 
   def call 
-    result = post(url, request_params)
+    result = post(url, {data: request_params})
     response = render_response(result)
   end
 
diff --git a/app/services/trace/reload_check_service.rb b/app/services/trace/reload_check_service.rb
index b2c4a0ff..62530af1 100644
--- a/app/services/trace/reload_check_service.rb
+++ b/app/services/trace/reload_check_service.rb
@@ -8,7 +8,7 @@ class Trace::ReloadCheckService < Trace::ClientService
   end
 
   def call
-    result = authed_post(token, url, request_params)
+    result = authed_post(token, url, {data: request_params})
     response = render_response(result)
   end
 

From 882a50cf56bd54720283bfbdbbd65b9303dc7eb2 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 31 Mar 2022 16:04:48 +0800
Subject: [PATCH 009/208] add: setting navbar varible

---
 app/controllers/settings_controller.rb | 12 ++++++++++++
 app/views/settings/show.json.jbuilder  |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index b2dc2e90..15da47a3 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -1,6 +1,7 @@
 class SettingsController < ApplicationController
   def show
     @old_projects_url = nil
+    get_navbar
     get_add_menu
     get_common_menu
     get_personal_menu
@@ -8,6 +9,17 @@ class SettingsController < ApplicationController
   end
 
   private
+    def get_navbar 
+      @navbar = []
+      default_laboratory.navbar.each do |site|
+        hash = {}
+        site.each {|k, v|
+          hash.merge!("#{k}":  get_site_url(k, v))
+        }
+        @navbar << hash
+      end
+    end
+    
     def get_add_menu
       @add = []
       Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index 0e6e1606..b9319e4e 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -18,7 +18,7 @@ json.setting do
   #
   # end
 
-  nav_bar = default_setting.navbar
+  # nav_bar = default_setting.navbar
 
   # if User.current.logged?
   #   nav_bar[2]["link"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects"
@@ -39,7 +39,7 @@ json.setting do
   json.moop_cases_banner_url default_setting.moop_cases_banner_url&.[](1..-1)
   json.oj_banner_url default_setting.oj_banner_url&.[](1..-1)
 
-  json.navbar nav_bar
+  json.navbar @navbar
 
   json.footer default_setting.footer
 

From 35369189382027f6960f81477f9fc39b5459219c Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 31 Mar 2022 16:18:16 +0800
Subject: [PATCH 010/208] fix

---
 app/controllers/settings_controller.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 15da47a3..e1a5be1d 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -10,13 +10,10 @@ class SettingsController < ApplicationController
 
   private
     def get_navbar 
-      @navbar = []
-      default_laboratory.navbar.each do |site|
-        hash = {}
-        site.each {|k, v|
-          hash.merge!("#{k}":  get_site_url(k, v))
-        }
-        @navbar << hash
+      @navbar = default_laboratory.navbar
+      if User.current.logged?
+        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("link", "/current_user"), "hidden"=>false}
+        @navbar << pernal_index
       end
     end
     

From 70559744432c9a2b109b42d93e00f7a432f1ca3b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 6 Apr 2022 17:04:31 +0800
Subject: [PATCH 011/208] fix

---
 app/services/issues/list_query_service.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb
index def9644d..73f0b438 100644
--- a/app/services/issues/list_query_service.rb
+++ b/app/services/issues/list_query_service.rb
@@ -27,9 +27,9 @@ class Issues::ListQueryService < ApplicationService
       issues = issues.joins(:pull_request).where(pull_requests: {status: 1})
     end
 
-    # if search_name.present?
-    #   issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%")
-    # end
+    if search_name.present?
+      issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%")
+    end
 
     if start_time&.present? || end_time&.present?
       issues = issues.where("issues.start_date between ? and ?",start_time&.present? ? start_time.to_date : Time.now.to_date, end_time&.present? ? end_time.to_date : Time.now.to_date)

From dec264d1693bbb70f572f7e61458570e44251901 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 7 Apr 2022 16:28:40 +0800
Subject: [PATCH 012/208] fix: sync user pwd

---
 app/controllers/concerns/login_helper.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index d8f2445f..e608b783 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -108,7 +108,11 @@ module LoginHelper
   def sync_pwd_to_gitea!(user, hash={})
     return true if user.is_sync_pwd?
 
-    sync_params = { email: user.mail }
+    sync_params = { 
+      login_name: user.name,
+      source_id: 0,
+      email: user.mail 
+    }
     interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params.merge(hash))
     if interactor.success?
       Rails.logger.info "########_ login is #{user.login} sync_pwd_to_gitea success _########"

From 551f333261895546a1e7eeacf0af46bd74a5569d Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 8 Apr 2022 14:52:56 +0800
Subject: [PATCH 013/208] fix

---
 app/controllers/settings_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index e1a5be1d..80edd1e5 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -12,7 +12,7 @@ class SettingsController < ApplicationController
     def get_navbar 
       @navbar = default_laboratory.navbar
       if User.current.logged?
-        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("link", "/current_user"), "hidden"=>false}
+        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "/current_user"), "hidden"=>false}
         @navbar << pernal_index
       end
     end

From eac7331070371acb0599745d204edbea01b506ba Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 8 Apr 2022 15:03:40 +0800
Subject: [PATCH 014/208] fix: settings need prefix

---
 app/controllers/settings_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 80edd1e5..95224353 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -12,7 +12,7 @@ class SettingsController < ApplicationController
     def get_navbar 
       @navbar = default_laboratory.navbar
       if User.current.logged?
-        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "/current_user"), "hidden"=>false}
+        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "#{Rails.application.config_for(:configuration)['platform_url']}/current_user"), "hidden"=>false}
         @navbar << pernal_index
       end
     end

From 910ae4855688441b48414d1a635462a7043c51ec Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 11 Apr 2022 10:50:18 +0800
Subject: [PATCH 015/208] fix: exception to ex

---
 app/libs/notice.rb | 2 +-
 app/libs/trace.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/libs/notice.rb b/app/libs/notice.rb
index 93d5cb42..18fdb070 100644
--- a/app/libs/notice.rb
+++ b/app/libs/notice.rb
@@ -7,7 +7,7 @@ module Notice
         config = Rails.application.config_for(:configuration).symbolize_keys!
         notice_config = config[:notice].symbolize_keys!
         raise 'notice config missing' if notice_config.blank?
-      rescue => exception
+      rescue => ex
         raise ex if Rails.env.production?
 
         puts %Q{\033[33m [warning] gitea config or configuration.yml missing,
diff --git a/app/libs/trace.rb b/app/libs/trace.rb
index b1c3c476..3ec3b56a 100644
--- a/app/libs/trace.rb
+++ b/app/libs/trace.rb
@@ -7,7 +7,7 @@ module Trace
         config = Rails.application.config_for(:configuration).symbolize_keys!
         trace_config = config[:trace].symbolize_keys!
         raise 'trace config missing' if trace_config.blank?
-      rescue => exception
+      rescue => ex
         raise ex if Rails.env.production?
 
         puts %Q{\033[33m [warning] gitea config or configuration.yml missing,

From 0076468a150eb7e9ac9f63f31eb9b89509bdcd54 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 11 Apr 2022 15:30:28 +0800
Subject: [PATCH 016/208] fix: trace client request data

---
 app/services/trace/client_service.rb | 56 +++++++---------------------
 1 file changed, 13 insertions(+), 43 deletions(-)

diff --git a/app/services/trace/client_service.rb b/app/services/trace/client_service.rb
index df9a4321..298c2cf0 100644
--- a/app/services/trace/client_service.rb
+++ b/app/services/trace/client_service.rb
@@ -2,20 +2,14 @@ class Trace::ClientService < ApplicationService
 
   def post(url, params={})
     puts "[trace][POST] request params: #{params}"
-    conn.post do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json 
-    end
+    conn.post(full_url(url), params[:data]) 
   end
 
   def authed_post(token, url, params={})
     puts "[trace][POST] request params: #{params}"
     puts "[trace][POST] request token: #{token}"
-    conn.post do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json 
-      req.headers['Authorization'] = token
-    end
+    conn.headers['Authorization'] = token
+    conn.post(full_url(url), params[:data]) 
   end
 
   def get(url, params={})
@@ -42,67 +36,43 @@ class Trace::ClientService < ApplicationService
 
   def delete(url, params={})
     puts "[trace][DELETE] request params: #{params}"
-    conn.delete do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-    end
+    conn.delete(full_url(url), params[:data])
   end
 
   def authed_delete(token, url, params={})
     puts "[trace][DELETE] request params: #{params}"
     puts "[trace][DELETE] request token: #{token}"
-    conn.delete do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-      req.headers['Authorization'] = token
-    end
+    conn.headers['Authorization'] = token
+    conn.delete(full_url(url), params[:data])
   end
 
   def patch(url, params={})
     puts "[trace][PATCH] request params: #{params}"
-    conn.patch do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-    end
+    conn.patch(full_url(url), params[:data])
   end
 
   def authed_patch(token, url, params={})
     puts "[trace][PATCH] request params: #{params}"
     puts "[trace][PATCH] request token: #{token}"
-    conn.patch do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-      req.headers['Authorization'] = token
-    end
+    conn.headers['Authorization'] = token
+    conn.patch(full_url(url), params[:data])
   end
 
   def put(url, params={})
     puts "[trace][PUT] request params: #{params}"
-    conn.put do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-    end
+    conn.put(full_url(url), params[:data])
   end
 
   def authed_put(token, url, params={})
     puts "[trace][PUT] request params: #{params}"
     puts "[trace][PUT] request token: #{token}"
-    conn.put do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-      req.headers['Authorization'] = token
-    end
+    conn.headers['Authorization'] = token
+    conn.put(full_url(url), params[:data])
   end
 
   private 
   def conn 
-    @client ||= begin
-      Faraday.new(url: domain) do |req|
-        req.request :url_encoded
-        req.headers['Content-Type'] = 'application/json'
-        req.adapter Faraday.default_adapter
-      end
-    end
+    @client ||= Faraday.new(url: domain)
 
     @client
   end

From 720c073f32a8f616ee35b2bf9e208a3ae00a8445 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 11 Apr 2022 15:48:47 +0800
Subject: [PATCH 017/208] fix

---
 app/services/trace/client_service.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/services/trace/client_service.rb b/app/services/trace/client_service.rb
index 298c2cf0..6dbe87d5 100644
--- a/app/services/trace/client_service.rb
+++ b/app/services/trace/client_service.rb
@@ -70,11 +70,8 @@ class Trace::ClientService < ApplicationService
     conn.put(full_url(url), params[:data])
   end
 
-  private 
   def conn 
-    @client ||= Faraday.new(url: domain)
-
-    @client
+    Faraday.new(url: domain)
   end
 
   def base_url 

From 2dfd69ae212ffa4e164c920073a22d2b30380ec0 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 11 Apr 2022 16:08:50 +0800
Subject: [PATCH 018/208] fix: response data result

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

diff --git a/app/services/trace/client_service.rb b/app/services/trace/client_service.rb
index 6dbe87d5..72ffa8ca 100644
--- a/app/services/trace/client_service.rb
+++ b/app/services/trace/client_service.rb
@@ -105,6 +105,6 @@ class Trace::ClientService < ApplicationService
 
     log_error(status, body)
 
-    return [body["code"], body["Data"], body["Error"]]
+    return [body["code"], body["data"], body["error"]]
   end
 end
\ No newline at end of file

From 8f5bb0e2d9b8c146cb42f8f84e642eb59c5344b5 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 18 Apr 2022 10:52:48 +0800
Subject: [PATCH 019/208] fix: organization gitea_token read by associations

---
 app/models/organization.rb                   | 4 ++++
 app/services/organizations/create_service.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/organization.rb b/app/models/organization.rb
index 40c676e0..56351a41 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -83,6 +83,10 @@ class Organization < Owner
 
   after_save :reset_cache_data
 
+  def gitea_token 
+    team_users.joins(:team).where(teams: {authorize: "owner"}).take&.user&.gitea_token
+  end
+
   def reset_cache_data
     Cache::V2::OwnerCommonService.new(self.id).reset
   end
diff --git a/app/services/organizations/create_service.rb b/app/services/organizations/create_service.rb
index a430ed6f..26377919 100644
--- a/app/services/organizations/create_service.rb
+++ b/app/services/organizations/create_service.rb
@@ -47,7 +47,7 @@ class Organizations::CreateService < ApplicationService
   end
 
   def create_org_and_extension
-    @organization = Organization.build(params[:name], params[:nickname], user.gitea_token)
+    @organization = Organization.build(params[:name], params[:nickname])
     org_extension = OrganizationExtension.build(organization.id, description, website,
                                                 location, repo_admin_change_team_access,
                                                 visibility, max_repo_creation)

From fc3cf01d3f6f730d9ae82b5da0a9ee66164d50ed Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 18 Apr 2022 13:49:08 +0800
Subject: [PATCH 020/208] add: get user image action

---
 app/controllers/users_controller.rb         | 7 +++++++
 app/helpers/application_helper.rb           | 9 +++++++++
 app/views/users/get_user_info.json.jbuilder | 2 +-
 config/routes.rb                            | 1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 00ea926f..acc82661 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -97,6 +97,13 @@ class UsersController < ApplicationController
     render_error(-1, '头像修改失败！')
   end
 
+  def get_image
+    return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) 
+    return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
+
+    redirect_to Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(@user).to_s
+  end
+
   def me
     @user = current_user
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f2a9f93b..e7f8611e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -147,6 +147,15 @@ module ApplicationHelper
     end
   end
 
+  def url_to_avatar_with_platform_url(source)
+    platform_url = Rails.application.config_for(:configuration)['platform_url']
+    if platform_url
+      return Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(source).to_s
+    else 
+      return url_to_avatar(source).to_s
+    end
+  end
+
   # 主页banner图
   def banner_img(source_type)
     if File.exist?(disk_filename(source_type, "banner"))
diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder
index 2f96c696..5fa4df16 100644
--- a/app/views/users/get_user_info.json.jbuilder
+++ b/app/views/users/get_user_info.json.jbuilder
@@ -22,4 +22,4 @@ json.city @user.city
 json.custom_department @user.custom_department
 json.description @user.description
 json.(@user, :show_email, :show_department, :show_location)
-json.message_unread_total @message_unread_total
+json.message_unread_total @message_unread_total
diff --git a/config/routes.rb b/config/routes.rb
index 7e280820..da63dab6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -214,6 +214,7 @@ Rails.application.routes.draw do
         get :fan_users
         get :hovercard
         put :update_image
+        get :get_image
       end
       collection do
         post :following

From 088c617cc12be188a51c5840d82cfbc237e741ce Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 26 Apr 2022 17:15:59 +0800
Subject: [PATCH 021/208] add: name query for branches

---
 app/controllers/projects_controller.rb                     | 2 +-
 app/controllers/pull_requests_controller.rb                | 4 ++--
 app/controllers/version_releases_controller.rb             | 2 +-
 app/services/branches/list_service.rb                      | 7 ++++---
 .../gitea/repository/branches/list_name_service.rb         | 7 ++++---
 app/services/gitea/repository/branches/list_service.rb     | 7 ++++---
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index be9a93d9..b14b105b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -88,7 +88,7 @@ class ProjectsController < ApplicationController
     return @branches = [] unless @project.forge?
 
     # result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
-    result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier)
+    result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier, params[:name])
     @branches =  result.is_a?(Hash) ? (result.key?(:status) ? [] : result["branch_name"]) : result
   end
 
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 189c5c6b..0ac7a714 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -29,7 +29,7 @@ class PullRequestsController < ApplicationController
   end
 
   def new
-    @all_branches = Branches::ListService.call(@owner, @project)
+    @all_branches = Branches::ListService.call(@owner, @project, params[:branch_name])
     @is_fork = @project.forked_from_project_id.present?
     @projects_names = [{
       project_user_login: @owner.try(:login),
@@ -50,7 +50,7 @@ class PullRequestsController < ApplicationController
   end
 
   def get_branches
-    branch_result = Branches::ListService.call(@owner, @project)
+    branch_result = Branches::ListService.call(@owner, @project, params[:name])
     render json: branch_result
     # return json: branch_result
   end
diff --git a/app/controllers/version_releases_controller.rb b/app/controllers/version_releases_controller.rb
index 2d7546a1..dd59098f 100644
--- a/app/controllers/version_releases_controller.rb
+++ b/app/controllers/version_releases_controller.rb
@@ -14,7 +14,7 @@ class VersionReleasesController < ApplicationController
   def new
     #获取所有的分支
     @all_branches = []
-    get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @repository.try(:identifier)).call
+    get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @repository.try(:identifier), params[:branch_name]).call
     if get_all_branches && get_all_branches.size > 0
       get_all_branches.each do |b|
         @all_branches.push(b["name"])
diff --git a/app/services/branches/list_service.rb b/app/services/branches/list_service.rb
index a3b77a7b..7b47658e 100644
--- a/app/services/branches/list_service.rb
+++ b/app/services/branches/list_service.rb
@@ -1,17 +1,18 @@
 class Branches::ListService < ApplicationService
 
-  attr_reader :user, :project
+  attr_reader :user, :project, :name
 
-  def initialize(user, project)
+  def initialize(user, project, name=nil)
     @user = user
     @project = project
+    @name = name
   end
 
   def call
     all_branches = []
     user_name = user.try(:show_real_name)
     identifier = project.repository.try(:identifier)
-    get_all_branches = Gitea::Repository::Branches::ListService.new(user, identifier).call
+    get_all_branches = Gitea::Repository::Branches::ListService.new(user, identifier, name).call
     all_branches = branch_lists(user_name,user.try(:login), identifier, get_all_branches) if get_all_branches && get_all_branches.size > 0
     return all_branches
   end
diff --git a/app/services/gitea/repository/branches/list_name_service.rb b/app/services/gitea/repository/branches/list_name_service.rb
index 716ee464..c005c835 100644
--- a/app/services/gitea/repository/branches/list_name_service.rb
+++ b/app/services/gitea/repository/branches/list_name_service.rb
@@ -1,9 +1,10 @@
 class Gitea::Repository::Branches::ListNameService < Gitea::ClientService
-  attr_reader :user, :repo
+  attr_reader :user, :repo, :name
 
-  def initialize(user, repo)
+  def initialize(user, repo, name=nil)
     @user = user
     @repo = repo
+    @name = name
   end
 
   def call
@@ -13,7 +14,7 @@ class Gitea::Repository::Branches::ListNameService < Gitea::ClientService
 
   private
   def params
-    Hash.new.merge(token: user.gitea_token)
+    Hash.new.merge(token: user.gitea_token, name: name)
   end
 
   def url
diff --git a/app/services/gitea/repository/branches/list_service.rb b/app/services/gitea/repository/branches/list_service.rb
index f4296509..7722ecd0 100644
--- a/app/services/gitea/repository/branches/list_service.rb
+++ b/app/services/gitea/repository/branches/list_service.rb
@@ -1,9 +1,10 @@
 class Gitea::Repository::Branches::ListService < Gitea::ClientService
-  attr_reader :user, :repo
+  attr_reader :user, :repo, :name
 
-  def initialize(user, repo)
+  def initialize(user, repo, name=nil)
     @user = user
     @repo = repo
+    @name = name
   end
 
   def call
@@ -13,7 +14,7 @@ class Gitea::Repository::Branches::ListService < Gitea::ClientService
 
   private
   def params
-    Hash.new.merge(token: user.gitea_token)
+    Hash.new.merge(token: user.gitea_token, name: name)
   end
 
   def url

From 396ac55429d37e72d56fd505258e9900f2c4f7e7 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Apr 2022 10:42:55 +0800
Subject: [PATCH 022/208] add: user super description

---
 app/controllers/users_controller.rb           |  1 +
 app/models/user.rb                            |  2 +-
 app/models/user_extension.rb                  | 57 +++++++++----------
 app/views/users/get_user_info.json.jbuilder   |  3 +-
 app/views/users/show.json.jbuilder            |  1 +
 ...dd_super_description_to_user_extensions.rb |  6 ++
 6 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 db/migrate/20220428015313_add_super_description_to_user_extensions.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index acc82661..532f29ba 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -313,6 +313,7 @@ class UsersController < ApplicationController
                                   :occupation, :technical_title,
                                   :school_id, :department_id, :province, :city,
                                   :custom_department, :identity, :student_id, :description,
+                                  :show_super_description, :super_description,
                                   :show_email, :show_location, :show_department]
                                 )
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index d661ab59..fa940c29 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -187,7 +187,7 @@ class User < Owner
   attr_accessor :password, :password_confirmation
 
   delegate :description, :gender, :department_id, :school_id, :location, :location_city,
-           :show_email, :show_location, :show_department,
+           :show_email, :show_location, :show_department, :super_description, :show_super_description,
            :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true
 
   before_save :update_hashed_password, :set_lastname
diff --git a/app/models/user_extension.rb b/app/models/user_extension.rb
index ee208af7..379243bf 100644
--- a/app/models/user_extension.rb
+++ b/app/models/user_extension.rb
@@ -2,35 +2,34 @@
 #
 # Table name: user_extensions
 #
-#  id                 :integer          not null, primary key
-#  user_id            :integer          not null
-#  birthday           :date
-#  brief_introduction :string(255)
-#  gender             :integer
-#  location           :string(255)
-#  occupation         :string(255)
-#  work_experience    :integer
-#  zip_code           :integer
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  technical_title    :string(255)
-#  identity           :integer
-#  student_id         :string(255)
-#  teacher_realname   :string(255)
-#  student_realname   :string(255)
-#  location_city      :string(255)
-#  school_id          :integer
-#  description        :string(255)      default("")
-#  department_id      :integer
-#  honor              :text(65535)
-#  edu_background     :integer
-#  edu_entry_year     :integer
-#  province           :string(255)
-#  city               :string(255)
-#  custom_department  :string(255)
-#  show_email         :boolean          default("0")
-#  show_location      :boolean          default("0")
-#  show_department    :boolean          default("0")
+#  id                     :integer          not null, primary key
+#  user_id                :integer          not null
+#  birthday               :date
+#  brief_introduction     :string(255)
+#  gender                 :integer
+#  location               :string(255)
+#  occupation             :string(255)
+#  work_experience        :integer
+#  zip_code               :integer
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  technical_title        :string(255)
+#  identity               :integer
+#  student_id             :string(255)
+#  teacher_realname       :string(255)
+#  student_realname       :string(255)
+#  location_city          :string(255)
+#  school_id              :integer
+#  description            :string(255)      default("")
+#  department_id          :integer
+#  province               :string(255)
+#  city                   :string(255)
+#  custom_department      :string(255)
+#  show_email             :boolean          default("0")
+#  show_location          :boolean          default("0")
+#  show_department        :boolean          default("0")
+#  super_description      :text(4294967295)
+#  show_super_description :boolean
 #
 # Indexes
 #
diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder
index 5fa4df16..8fcadb1c 100644
--- a/app/views/users/get_user_info.json.jbuilder
+++ b/app/views/users/get_user_info.json.jbuilder
@@ -21,5 +21,6 @@ json.province @user.province
 json.city @user.city
 json.custom_department @user.custom_department
 json.description @user.description
-json.(@user, :show_email, :show_department, :show_location)
+json.super_description @user.super_description
+json.(@user, :show_email, :show_department, :show_location, :show_super_description)
 json.message_unread_total @message_unread_total
diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
index 1c9e7793..f35705ce 100644
--- a/app/views/users/show.json.jbuilder
+++ b/app/views/users/show.json.jbuilder
@@ -13,4 +13,5 @@ json.email @user.show_email ? @user.mail : nil
 json.province @user.show_location ? @user.province : nil
 json.city @user.show_location ? @user.city : nil
 json.custom_department @user.show_department ? @user.custom_department : nil
+json.super_description @user.show_super_description ? @user.super_description : nil
 json.description @user.description
\ No newline at end of file
diff --git a/db/migrate/20220428015313_add_super_description_to_user_extensions.rb b/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
new file mode 100644
index 00000000..07651677
--- /dev/null
+++ b/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
@@ -0,0 +1,6 @@
+class AddSuperDescriptionToUserExtensions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :user_extensions, :super_description, :text, :limit => 4294967295
+    add_column :user_extensions, :show_super_description, :boolean
+  end
+end

From ec3a556a6f31fb162d47db88c88ba0e3f99f2c34 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Apr 2022 11:03:42 +0800
Subject: [PATCH 023/208] fix: default value for show super description

---
 app/models/user_extension.rb                                    | 2 +-
 .../20220428015313_add_super_description_to_user_extensions.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user_extension.rb b/app/models/user_extension.rb
index 379243bf..c1046ac2 100644
--- a/app/models/user_extension.rb
+++ b/app/models/user_extension.rb
@@ -29,7 +29,7 @@
 #  show_location          :boolean          default("0")
 #  show_department        :boolean          default("0")
 #  super_description      :text(4294967295)
-#  show_super_description :boolean
+#  show_super_description :boolean          default("0")
 #
 # Indexes
 #
diff --git a/db/migrate/20220428015313_add_super_description_to_user_extensions.rb b/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
index 07651677..3e00416e 100644
--- a/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
+++ b/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
@@ -1,6 +1,6 @@
 class AddSuperDescriptionToUserExtensions < ActiveRecord::Migration[5.2]
   def change
     add_column :user_extensions, :super_description, :text, :limit => 4294967295
-    add_column :user_extensions, :show_super_description, :boolean
+    add_column :user_extensions, :show_super_description, :boolean, default: false
   end
 end

From 3abd6037d99e16931f6ad44ece25d004ec28cf9e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Apr 2022 11:12:16 +0800
Subject: [PATCH 024/208] fix: show super description aways desplay

---
 app/views/users/show.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
index f35705ce..dfeb45cf 100644
--- a/app/views/users/show.json.jbuilder
+++ b/app/views/users/show.json.jbuilder
@@ -14,4 +14,5 @@ json.province @user.show_location ? @user.province : nil
 json.city @user.show_location ? @user.city : nil
 json.custom_department @user.show_department ? @user.custom_department : nil
 json.super_description @user.show_super_description ? @user.super_description : nil
+json.show_super_description @user.show_super_description
 json.description @user.description
\ No newline at end of file

From f15cd44dff87a2df8072133140fa7f2c787a4c13 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Apr 2022 18:53:33 +0800
Subject: [PATCH 025/208] add: compare add paginate

---
 app/controllers/compare_controller.rb | 12 ++++++++++++
 app/helpers/repositories_helper.rb    |  1 -
 app/views/compare/show.json.jbuilder  |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb
index 382e7506..1aab7adb 100644
--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@@ -9,6 +9,10 @@ class CompareController < ApplicationController
     load_compare_params
     compare
     @merge_status, @merge_message = get_merge_message
+    @page_size = page_size <= 0 ? 1 : page_size
+    @page_limit = page_limit <=0 ? 15 : page_limit
+    @page_offset = (@page_size -1) * @page_limit
+    Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
   end
 
   private
@@ -53,4 +57,12 @@ class CompareController < ApplicationController
   def gitea_compare(base, head)
     Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, Addressable::URI.escape(base), Addressable::URI.escape(head), current_user.gitea_token)
   end
+
+  def page_size 
+    params.fetch(:page, 1).to_i
+  end
+
+  def page_limit
+    params.fetch(:limit, 15).to_i
+  end
 end
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index e6e7e87f..b8bfc31c 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -36,7 +36,6 @@ module RepositoriesHelper
   end
 
   def render_cache_commit_author(author_json)
-    Rails.logger.info author_json['Email'] 
     if author_json["name"].present? && author_json["email"].present?
       return find_user_in_redis_cache(author_json['name'], author_json['email']) 
     end
diff --git a/app/views/compare/show.json.jbuilder b/app/views/compare/show.json.jbuilder
index deca4103..26a7cb76 100644
--- a/app/views/compare/show.json.jbuilder
+++ b/app/views/compare/show.json.jbuilder
@@ -1,7 +1,7 @@
-json.commits_count @compare_result['Commits']&.size
+json.commits_count @compare_result['CommitsCount']
 # json.commits @compare_result['Commits'], partial: 'pull_requests/commit', as: :commit
 json.commits do
-  json.array! @compare_result['Commits'] do |commit|
+  json.array! @compare_result['Commits'][@page_offset...(@page_offset + @page_limit)] do |commit|
     json.author do
       json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
     end

From 7c88ea3d6713065f29421d025288947a5194b11b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 5 May 2022 10:00:02 +0800
Subject: [PATCH 026/208] add: quit repo

---
 app/controllers/projects_controller.rb | 21 ++++++++++++++++++++-
 config/routes.rb                       |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b14b105b..c4e440af 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -13,6 +13,8 @@ class ProjectsController < ApplicationController
   def menu_list
     menu = []
 
+    user_is_admin = current_user.admin? || @project.manager?(current_user)
+
     menu.append(menu_hash_by_name("home"))
     menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
     menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
@@ -22,7 +24,8 @@ class ProjectsController < ApplicationController
     menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge?
     menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources") && @project.forge?
     menu.append(menu_hash_by_name("activity"))
-    menu.append(menu_hash_by_name("settings")) if (current_user.admin? || @project.manager?(current_user)) && @project.forge?
+    menu.append(menu_hash_by_name("settings")) if user_is_admin && @project.forge?
+    menu.append(menu_hash_by_name("quit")) if !user_is_admin && @project.member(current_user.id) && @project.forge?
 
     render json: menu
   end
@@ -177,6 +180,22 @@ class ProjectsController < ApplicationController
     tip_exception(e.message)
   end
 
+  def quit
+    user_is_admin = current_user.admin? || @project.manager?(current_user)
+    if !user_is_admin && @project.member(current_user.id) && @project.forge? 
+      ActiveRecord::Base.transaction do
+        Projects::DeleteMemberInteractor.call(@project.owner, @project, current_user)
+        SendTemplateMessageJob.perform_later('ProjectMemberLeft', current_user.id, current_user.id, @project.id) if Site.has_notice_menu?
+        render_ok
+      end
+    else 
+      render_forbidden('你不能退出该仓库')
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
   def watch_users
     watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct
     @watchers_count = watchers.size
diff --git a/config/routes.rb b/config/routes.rb
index da63dab6..01ff4fa3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -436,6 +436,7 @@ Rails.application.routes.draw do
           get :stargazers, to: 'projects#praise_users'
           get :forks, to: 'projects#fork_users'
           match :about, :via => [:get, :put, :post]
+          post :quit
         end
       end
 

From 55c74de8e46c59ec353593fe7bd92543c2688d26 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Thu, 5 May 2022 10:41:02 +0800
Subject: [PATCH 027/208] =?UTF-8?q?fork=5Fusers=E5=8A=A0=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/fork_user.rb                      | 2 +-
 app/services/pull_requests/create_service.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/fork_user.rb b/app/models/fork_user.rb
index bddf8f75..4177392e 100644
--- a/app/models/fork_user.rb
+++ b/app/models/fork_user.rb
@@ -17,7 +17,7 @@
 
 class ForkUser < ApplicationRecord
   belongs_to :project
-  belongs_to :user
+  belongs_to :owner
   belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id
 
   after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb
index 703bb5de..258d0e31 100644
--- a/app/services/pull_requests/create_service.rb
+++ b/app/services/pull_requests/create_service.rb
@@ -157,7 +157,7 @@ class PullRequests::CreateService < ApplicationService
     raise "head参数不能为空" if @params[:head].blank?
     raise "base参数不能为空" if @params[:base].blank?
     raise "fork_project_id参数错误" if is_original && !@project.forked_projects.pluck(:id).include?(@params[:fork_project_id].to_i)
-    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:user).where(users: {login: @params[:merge_user_login]}).blank?
+    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:owner).where(users: {login: @params[:merge_user_login]}).blank?
     raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !is_original
     raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: is_original, fork_project_id: @params[:fork_project_id]).present?
     raise @pull_issue.errors.full_messages.join(", ") unless pull_issue.valid?

From ae7d0d13296e595a9a3e2fa52b627d6d41d023f0 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 6 May 2022 09:56:22 +0800
Subject: [PATCH 028/208] add: issues description and journals notes validate

---
 app/controllers/issues_controller.rb              |  4 ++--
 app/controllers/journals_controller.rb            | 11 +++++++++--
 app/forms/issues/create_form.rb                   |  4 ++--
 app/forms/issues/update_form.rb                   |  4 +++-
 app/forms/journals/create_form.rb                 |  7 +++++++
 app/forms/journals/update_form.rb                 |  8 ++++++++
 config/locales/forms/create_issuse_form.zh-CN.yml |  8 +++++++-
 7 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 app/forms/journals/create_form.rb
 create mode 100644 app/forms/journals/update_form.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index b546ea71..e21c087b 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -109,7 +109,7 @@ class IssuesController < ApplicationController
 
   def create
     issue_params = issue_send_params(params)
-    Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
+    Issues::CreateForm.new(issue_params.slice(:subject, :description)).validate!
     @issue = Issue.new(issue_params)
     if @issue.save!
       SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if Site.has_notice_menu?
@@ -223,7 +223,7 @@ class IssuesController < ApplicationController
       normal_status(-1, "不允许修改为关闭状态")
     else
       issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-      Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
+      Issues::UpdateForm.new(issue_params.slice(:subject, :description)).validate!
       if @issue.update_attributes(issue_params)
         if @issue&.pull_request.present?
           SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 8fbe4692..2dd1fef6 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -23,6 +23,7 @@ class JournalsController < ApplicationController
       normal_status(-1, "评论内容不能为空")
     else
       ActiveRecord::Base.transaction do
+        Journals::CreateForm.new({notes: notes.to_s.strip}).validate!
         journal_params = {
           journalized_id: @issue.id ,
           journalized_type: "Issue",
@@ -53,6 +54,9 @@ class JournalsController < ApplicationController
         end
       end
     end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
   end
 
   def destroy
@@ -70,7 +74,8 @@ class JournalsController < ApplicationController
 
   def update
     content = params[:content]
-    if content.present?
+    if content.present? 
+      Journals::UpdateForm.new({notes: notes.to_s.strip}).validate!
       if @journal.update_attribute(:notes, content)
         normal_status(0, "更新成功")
       else
@@ -79,7 +84,9 @@ class JournalsController < ApplicationController
     else
       normal_status(-1, "评论的内容不能为空")
     end
-
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
   end
 
   def get_children_journals
diff --git a/app/forms/issues/create_form.rb b/app/forms/issues/create_form.rb
index 602775ff..7ab942bc 100644
--- a/app/forms/issues/create_form.rb
+++ b/app/forms/issues/create_form.rb
@@ -1,11 +1,11 @@
 class Issues::CreateForm
   include ActiveModel::Model
 
-  attr_accessor :subject
+  attr_accessor :subject, :description
 
   validates :subject, presence: { message: "不能为空" }
 
   validates :subject, length: { maximum: 200, too_long: "不能超过200个字符" }
 
-
+  validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"}
 end
diff --git a/app/forms/issues/update_form.rb b/app/forms/issues/update_form.rb
index 64acdfb5..1aa971e9 100644
--- a/app/forms/issues/update_form.rb
+++ b/app/forms/issues/update_form.rb
@@ -1,10 +1,12 @@
 class Issues::UpdateForm
   include ActiveModel::Model
 
-  attr_accessor :subject
+  attr_accessor :subject, :description
 
   validates :subject, presence: { message: "不能为空" }
 
   validates :subject, length: { maximum: 200, too_long: "不能超过200个字符" }
 
+  validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"}
+
 end
\ No newline at end of file
diff --git a/app/forms/journals/create_form.rb b/app/forms/journals/create_form.rb
new file mode 100644
index 00000000..8b96bc64
--- /dev/null
+++ b/app/forms/journals/create_form.rb
@@ -0,0 +1,7 @@
+class Journals::CreateForm
+  include ActiveModel::Model
+  
+  attr_accessor :notes
+
+  validates :notes, length: { maximum: 65535, too_long: "不能超过65535个字符"}
+end
diff --git a/app/forms/journals/update_form.rb b/app/forms/journals/update_form.rb
new file mode 100644
index 00000000..74f8fa6f
--- /dev/null
+++ b/app/forms/journals/update_form.rb
@@ -0,0 +1,8 @@
+class Journals::UpdateForm
+  include ActiveModel::Model
+
+  attr_accessor :notes
+
+  validates :notes, length: { maximum: 65535, too_long: "不能超过65535个字符"}
+
+end
\ No newline at end of file
diff --git a/config/locales/forms/create_issuse_form.zh-CN.yml b/config/locales/forms/create_issuse_form.zh-CN.yml
index 643c6866..bebab7e2 100644
--- a/config/locales/forms/create_issuse_form.zh-CN.yml
+++ b/config/locales/forms/create_issuse_form.zh-CN.yml
@@ -3,5 +3,11 @@
     attributes:
       issues/create_form:
         subject: 标题
+        description: 描述
       issues/update_form:
-        subject: 标题
\ No newline at end of file
+        subject: 标题
+        description: 描述
+      journals/create_form:
+        notes: 评论
+      journals/update_form:
+        notes: 评论
\ No newline at end of file

From 6aa3321d17e33a563a373e0c2d0bf32ff73216f1 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 6 May 2022 14:29:05 +0800
Subject: [PATCH 029/208] fix: pr title description validate

---
 app/controllers/pull_requests_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 0ac7a714..bb040784 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -58,6 +58,7 @@ class PullRequestsController < ApplicationController
   def create
     # return normal_status(-1, "您不是目标分支开发者，没有权限，请联系目标分支作者.") unless @project.operator?(current_user)
     ActiveRecord::Base.transaction do
+      Issues::CreateForm.new({subject: params[:title], description: params}).validate!
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
         @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
@@ -89,7 +90,7 @@ class PullRequestsController < ApplicationController
     else
       ActiveRecord::Base.transaction do
         begin
-          return normal_status(-1, "title不能超过255个字符") if params[:title].length > 255
+          Issues::UpdateForm.new({subject: params[:title], description: params[:body]}).validate!
           merge_params
 
           @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?

From 000197b0d1b723932fbd47bec1fb866cf8449d66 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 6 May 2022 17:25:34 +0800
Subject: [PATCH 030/208] fix: issues and pull_request length calculate

---
 app/controllers/issues_controller.rb                       | 4 ++--
 app/controllers/journals_controller.rb                     | 4 ++--
 app/controllers/pull_requests_controller.rb                | 4 ++--
 app/models/journal.rb                                      | 2 +-
 app/models/pull_request.rb                                 | 6 +++---
 ..._change_issues_description_and_journals_notes_column.rb | 7 +++++++
 6 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20220506083813_change_issues_description_and_journals_notes_column.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index e21c087b..ee0b5eff 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -109,7 +109,7 @@ class IssuesController < ApplicationController
 
   def create
     issue_params = issue_send_params(params)
-    Issues::CreateForm.new(issue_params.slice(:subject, :description)).validate!
+    Issues::CreateForm.new({subject: issue_params[:subject], description: issue_params[:description].b}).validate!
     @issue = Issue.new(issue_params)
     if @issue.save!
       SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if Site.has_notice_menu?
@@ -223,7 +223,7 @@ class IssuesController < ApplicationController
       normal_status(-1, "不允许修改为关闭状态")
     else
       issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-      Issues::UpdateForm.new(issue_params.slice(:subject, :description)).validate!
+      Issues::UpdateForm.new({subject: issue_params[:subject], description: issue_params[:description].b}).validate!
       if @issue.update_attributes(issue_params)
         if @issue&.pull_request.present?
           SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 2dd1fef6..7c067659 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -23,7 +23,7 @@ class JournalsController < ApplicationController
       normal_status(-1, "评论内容不能为空")
     else
       ActiveRecord::Base.transaction do
-        Journals::CreateForm.new({notes: notes.to_s.strip}).validate!
+        Journals::CreateForm.new({notes: notes.to_s.strip.b}).validate!
         journal_params = {
           journalized_id: @issue.id ,
           journalized_type: "Issue",
@@ -75,7 +75,7 @@ class JournalsController < ApplicationController
   def update
     content = params[:content]
     if content.present? 
-      Journals::UpdateForm.new({notes: notes.to_s.strip}).validate!
+      Journals::UpdateForm.new({notes: notes.to_s.strip.b}).validate!
       if @journal.update_attribute(:notes, content)
         normal_status(0, "更新成功")
       else
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index bb040784..bf5646a4 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -58,7 +58,7 @@ class PullRequestsController < ApplicationController
   def create
     # return normal_status(-1, "您不是目标分支开发者，没有权限，请联系目标分支作者.") unless @project.operator?(current_user)
     ActiveRecord::Base.transaction do
-      Issues::CreateForm.new({subject: params[:title], description: params}).validate!
+      Issues::CreateForm.new({subject: params[:title], description: params[:body].b}).validate!
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
         @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
@@ -90,7 +90,7 @@ class PullRequestsController < ApplicationController
     else
       ActiveRecord::Base.transaction do
         begin
-          Issues::UpdateForm.new({subject: params[:title], description: params[:body]}).validate!
+          Issues::UpdateForm.new({subject: params[:title], description: params[:body].b}).validate!
           merge_params
 
           @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
diff --git a/app/models/journal.rb b/app/models/journal.rb
index a1834ae2..5bf05b0d 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -6,7 +6,7 @@
 #  journalized_id   :integer          default("0"), not null
 #  journalized_type :string(30)       default(""), not null
 #  user_id          :integer          default("0"), not null
-#  notes            :text(65535)
+#  notes            :text(4294967295)
 #  created_on       :datetime         not null
 #  private_notes    :boolean          default("0"), not null
 #  parent_id        :integer
diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb
index 7338a1d7..e36af832 100644
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@@ -3,8 +3,8 @@
 # Table name: pull_requests
 #
 #  id              :integer          not null, primary key
-#  pull_request_id :integer
-#  gpid            :integer
+#  gitea_id        :integer
+#  gitea_number    :integer
 #  user_id         :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
@@ -12,7 +12,7 @@
 #  project_id      :integer
 #  title           :string(255)
 #  milestone       :integer
-#  body            :text(65535)
+#  body            :text(4294967295)
 #  head            :string(255)
 #  base            :string(255)
 #  issue_id        :integer
diff --git a/db/migrate/20220506083813_change_issues_description_and_journals_notes_column.rb b/db/migrate/20220506083813_change_issues_description_and_journals_notes_column.rb
new file mode 100644
index 00000000..a8b934c7
--- /dev/null
+++ b/db/migrate/20220506083813_change_issues_description_and_journals_notes_column.rb
@@ -0,0 +1,7 @@
+class ChangeIssuesDescriptionAndJournalsNotesColumn < ActiveRecord::Migration[5.2]
+  def change
+    change_column :issues, :description, :text, :limit => 4294967295
+    change_column :journals, :notes, :text, :limit => 4294967295
+    change_column :pull_requests, :body, :text, :limit => 4294967295
+  end
+end

From a6cee63d1780d353b16db4643c6c334d2942f284 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Sat, 7 May 2022 11:57:58 +0800
Subject: [PATCH 031/208] fix: change owner must fix foreign_key

---
 app/controllers/projects_controller.rb      | 2 +-
 app/models/fork_user.rb                     | 2 +-
 app/views/projects/fork_users.json.jbuilder | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c4e440af..8bc2fb47 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -209,7 +209,7 @@ class ProjectsController < ApplicationController
   end
 
   def fork_users
-    fork_users = @project.fork_users.includes(:user, :project, :fork_project).order("fork_users.created_at desc").distinct
+    fork_users = @project.fork_users.includes(:owner, :project, :fork_project).order("fork_users.created_at desc").distinct
     @forks_count = fork_users.size
     @fork_users = paginate(fork_users)
   end
diff --git a/app/models/fork_user.rb b/app/models/fork_user.rb
index 4177392e..2d74af4a 100644
--- a/app/models/fork_user.rb
+++ b/app/models/fork_user.rb
@@ -17,7 +17,7 @@
 
 class ForkUser < ApplicationRecord
   belongs_to :project
-  belongs_to :owner
+  belongs_to :owner, class_name: 'Owner', foreign_key: :user_id
   belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id
 
   after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
diff --git a/app/views/projects/fork_users.json.jbuilder b/app/views/projects/fork_users.json.jbuilder
index f5147e19..730576c1 100644
--- a/app/views/projects/fork_users.json.jbuilder
+++ b/app/views/projects/fork_users.json.jbuilder
@@ -1,7 +1,7 @@
 json.count @forks_count
 json.users do
   json.array! @fork_users.each do |f|
-    user = f.user.present? ? f.user : Organization.find_by(id: f.user_id)
+    user = f.owner.present? ? f.owner : Organization.find_by(id: f.user_id)
     json.id f.fork_project.id
     json.identifier f.fork_project.identifier
     json.name "#{user.try(:show_real_name)}/#{f.fork_project.try(:name)}"

From 50dc5cce5dd0dd5e0a4588bd148c15e35af9a412 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Sat, 7 May 2022 14:06:48 +0800
Subject: [PATCH 032/208] fix

---
 app/controllers/issues_controller.rb        | 4 ++--
 app/controllers/journals_controller.rb      | 4 ++--
 app/controllers/pull_requests_controller.rb | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index ee0b5eff..ddb0facd 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -109,7 +109,7 @@ class IssuesController < ApplicationController
 
   def create
     issue_params = issue_send_params(params)
-    Issues::CreateForm.new({subject: issue_params[:subject], description: issue_params[:description].b}).validate!
+    Issues::CreateForm.new({subject: issue_params[:subject], description: issue_params[:description].blank? ? issue_params[:description] : issue_params[:description].b}).validate!
     @issue = Issue.new(issue_params)
     if @issue.save!
       SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if Site.has_notice_menu?
@@ -223,7 +223,7 @@ class IssuesController < ApplicationController
       normal_status(-1, "不允许修改为关闭状态")
     else
       issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-      Issues::UpdateForm.new({subject: issue_params[:subject], description: issue_params[:description].b}).validate!
+      Issues::UpdateForm.new({subject: issue_params[:subject], description: issue_params[:description].blank? ? issue_params[:description] : issue_params[:description].b}).validate!
       if @issue.update_attributes(issue_params)
         if @issue&.pull_request.present?
           SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 7c067659..6dc1e29c 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -23,7 +23,7 @@ class JournalsController < ApplicationController
       normal_status(-1, "评论内容不能为空")
     else
       ActiveRecord::Base.transaction do
-        Journals::CreateForm.new({notes: notes.to_s.strip.b}).validate!
+        Journals::CreateForm.new({notes: notes.to_s.strip.blank? ? notes.to_s.strip : notes.to_s.strip.b}).validate!
         journal_params = {
           journalized_id: @issue.id ,
           journalized_type: "Issue",
@@ -75,7 +75,7 @@ class JournalsController < ApplicationController
   def update
     content = params[:content]
     if content.present? 
-      Journals::UpdateForm.new({notes: notes.to_s.strip.b}).validate!
+      Journals::UpdateForm.new({notes: notes.to_s.strip.blank? ? notes.to_s.strip : notes.to_s.strip.b}).validate!
       if @journal.update_attribute(:notes, content)
         normal_status(0, "更新成功")
       else
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index bf5646a4..f45d1f35 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -58,7 +58,7 @@ class PullRequestsController < ApplicationController
   def create
     # return normal_status(-1, "您不是目标分支开发者，没有权限，请联系目标分支作者.") unless @project.operator?(current_user)
     ActiveRecord::Base.transaction do
-      Issues::CreateForm.new({subject: params[:title], description: params[:body].b}).validate!
+      Issues::CreateForm.new({subject: params[:title], description: params[:body].blank? ? params[:body] :  params[:body].b}).validate!
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
         @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
@@ -90,7 +90,7 @@ class PullRequestsController < ApplicationController
     else
       ActiveRecord::Base.transaction do
         begin
-          Issues::UpdateForm.new({subject: params[:title], description: params[:body].b}).validate!
+          Issues::UpdateForm.new({subject: params[:title], description: params[:body].blank? ? params[:body] : params[:body].b}).validate!
           merge_params
 
           @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?

From 77620f77358a402ed257dd144055b5ed512c3079 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 16 May 2022 16:59:25 +0800
Subject: [PATCH 033/208] add: download and import user template xlsx

---
 .../admins/import_users_controller.rb         |   2 +-
 .../admins/new_import_user_from_excel.rb      |  15 ++++
 .../admins/import_user_from_excel_service.rb  |  71 ++++++++++++++++++
 app/views/admins/users/index.html.erb         |   4 +-
 public/导入用户模板.xlsx                | Bin 0 -> 9230 bytes
 5 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 app/imports/admins/new_import_user_from_excel.rb
 create mode 100644 app/services/admins/import_user_from_excel_service.rb
 create mode 100644 public/导入用户模板.xlsx

diff --git a/app/controllers/admins/import_users_controller.rb b/app/controllers/admins/import_users_controller.rb
index 5d8a60ce..4575b08d 100644
--- a/app/controllers/admins/import_users_controller.rb
+++ b/app/controllers/admins/import_users_controller.rb
@@ -2,7 +2,7 @@ class Admins::ImportUsersController < Admins::BaseController
   def create
     return render_error('请上传正确的文件') if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
 
-    result = Admins::ImportUserService.call(params[:file].to_io)
+    result = Admins::ImportUserFromExcelService.call(params[:file].to_io)
     render_ok(result)
   rescue Admins::ImportUserService::Error => ex
     render_error(ex)
diff --git a/app/imports/admins/new_import_user_from_excel.rb b/app/imports/admins/new_import_user_from_excel.rb
new file mode 100644
index 00000000..b9a452cf
--- /dev/null
+++ b/app/imports/admins/new_import_user_from_excel.rb
@@ -0,0 +1,15 @@
+class Admins::NewImportUserFromExcel < BaseImportXlsx
+  UserData = Struct.new(:login, :email, :password, :nickname)
+
+  def read_each(&block)
+    sheet.each_row_streaming(pad_cells: true, offset: 1) do |row|
+      data = row.map(&method(:cell_value))[0..3]
+      block.call UserData.new(*data)
+    end
+  end
+
+  private 
+  def cell_value(obj)
+    obj&.cell_value 
+  end
+end
\ No newline at end of file
diff --git a/app/services/admins/import_user_from_excel_service.rb b/app/services/admins/import_user_from_excel_service.rb
new file mode 100644
index 00000000..709551c2
--- /dev/null
+++ b/app/services/admins/import_user_from_excel_service.rb
@@ -0,0 +1,71 @@
+class Admins::ImportUserFromExcelService < ApplicationService 
+  Error = Class.new(StandardError)
+
+  attr_reader :file, :result
+
+  def initialize(file)
+    @file = file 
+    @result = { success: 0, fail: [] }
+  end
+
+  def call 
+    raise Error, '文件不存在' if file.blank?
+    excel = Admins::NewImportUserFromExcel.new(file)
+
+    excel.read_each(&method(:save_user))
+    result 
+  rescue ApplicationImport::Error => ex 
+    raise Error, ex.message
+  end
+
+  private 
+  def save_user(data)
+    user = find_user(data)
+    if user.blank? 
+      create_user(data)
+      result[:success] +=1
+    else 
+      fail_data = data.as_json
+      fail_data[:data] = fail_data.values.join(",")
+      fail_data[:message] = '用户已存在'
+      result[:fail] << fail_data  
+    end
+
+  rescue Exception => ex 
+    fail_data = data.as_json
+    fail_data[:data] = fail_data.values.join(",")
+    fail_data[:message] = ex.message
+    result[:fail] << fail_data  
+  end
+
+  def create_user(data)
+    ActiveRecord::Base.transaction do 
+      username = data.login&.gsub(/\s+/, "")
+      email = data.email&.gsub(/\s+/, "")
+      password = data.password
+      nickname = data.nickname&.gsub(/\s+/, "")
+      raise Error, "无法使用以下关键词：#{username}，请重新命名" if ReversedKeyword.check_exists?(data.login)
+      Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge'}).validate!
+      user = User.new(admin: false, login: username, mail: email, nickname: nickname, platform: 'forge' , type: "User")
+      user.password = password
+      user.activate
+      raise Error, user.errors.full_messages.join(",") unless user.valid?
+      interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
+      if interactor.success?
+        gitea_user = interactor.result
+        result = Gitea::User::GenerateTokenService.call(username, password)
+        user.gitea_token = result['sha1']
+        user.gitea_uid = gitea_user[:body]['id']
+        UserExtension.create!(user_id: user.id) if user.save! 
+      else 
+        raise interactor.error, 'gitea user create error' 
+      end
+
+      user
+    end
+  end
+
+  def find_user(data)
+    User.find_by(login: data.login)
+  end
+end
\ No newline at end of file
diff --git a/app/views/admins/users/index.html.erb b/app/views/admins/users/index.html.erb
index e21a3d66..2f41ffdb 100644
--- a/app/views/admins/users/index.html.erb
+++ b/app/views/admins/users/index.html.erb
@@ -31,7 +31,9 @@
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
   <% end %>
 
-  <%= javascript_void_link '导入用户', class: 'btn btn-secondary btn-sm', data: { toggle: 'modal', target: '.admin-import-user-modal'} %>
+  <%= link_to '下载导入模板', "/导入用户模板.xlsx", class: 'btn btn-secondary mr-3' %>
+
+  <%= javascript_void_link '导入用户', class: 'btn btn-secondary', data: { toggle: 'modal', target: '.admin-import-user-modal'} %>
   
 </div>
 
diff --git a/public/导入用户模板.xlsx b/public/导入用户模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c538bed63aab06831ab7286e6a1ffe52a0337864
GIT binary patch
literal 9230
zcmai41z45K)}|W?>5$rVNJvXccS}fz^rlmgR=T@ex{>ab?(XhxkRSA(qjJwZ|2)s`
z72muwv)0<{{ba<!A>cqB$0w;}-pAL!2JFKdJ)o|P70|-^rObmE+QSzxKg4QTr;6x7
zK|o%Cfq)?YE~af^LFZs*ni$$F2F`#cc;Ru6Tnc2OC6;5P^!UsPt!j(U1e|V?Kn>d%
zyr!kIA-aS%KLsk>A}~E4%&D@n*W6!gIDtt9#>JH{dRCHUhg%B4V(E*UDY4fpCj|vj
zz*0z3nwSt~tHIdNonJUC6@Ulhfcc`6t=a@`8U#RA_z3w}mP^`D?cn-ao>Cj+iBYqa
zY-fRbn#SpWLSTW(^0HcOfHyKusJL7h9?lJV`Ht=@9T>dp?z@7>HiyhADvZ^WrLC3k
z-epUiJm6Dv>LPodi?sc!GKO5R*DM;`nX9T$n>g0fVnvzFle6u^gFDlZr^|O&M|)><
zbW1eXTLsarn=(7#3|ru`yHK?rZ76~2EtwrSEslyJ!5=}SeVVx5v`Dh~GlOI$zG?Wr
zT($L<_2$a_2=Y&K=U(4HQ$C>k@&R3x-_g|tTIoN+8yU(V-Aa$_Z4dbVW|gZXF&8o)
zfX|!A%by0*W-v7|PHaarV>bOUIJ}$)2197U`QmC$z2x;a2fN!zE(2*AHXkh3kcfUI
zsgruquv)}rQ{bwtZi)c;p`nVpCVC6w5SxQtAS5Q*B_J%|eM^)friVV3a|w8#3kE)!
zUwntri{%lslC|Y<An1k{O|efCDH5K2(`b-@jgS}v@!tFx7cU$Fvmt%6Zk+7x9^zv8
zeOc;TGO2==?vB`g%WP9hC`%iHdYnMB8H2t2V3ZU2+wZ5B!@+S>BYR>Xxp0&*7ENzf
zay_k_H5Wxmb6sMZ!5DoVSiGt!fMqwI&fpZ;yH6r|<!h8j*h%aI=3Q;_3GU|X-|%&g
zn2qv$jwrtB^Kt-Hfc$Q|ybb>+uCYrmdhZ_abbY|~`5(C2TH654er((jK50*SG`9n?
z@1L?RhUHoy<dh*Q{h=ijYQrl{0p+A-e7;AGGx{6{FEksXUoJSC-lPf@i|jz9i(?5x
zfaO%9cydP`?iCATL-gCL+N2Madga+zsLd^uV49E_-4Wu$!0m}SoV!xd+uhPAZlt-{
z64saGo@keon_jyvmNI`(l5>`Tozmjw1fs>6b2yx#``;JIVY%j5ceZkP&-&eUy&a_H
z`HbpXX*5zvDT*?;hUh2yF8y^k0dhA?Dzn-7)yh7+$5yEX(O@E6Hcve_bU{pY(S|mf
zu#u<JQ9D~bCy-i9&M(aH`4B~4sn-%u+aZvz{g8C;x@sHu5v_j?1>g^8Ihg(k0{<-V
z?5BV|(8|QxP+#BXX}};KK-%(p*v`6;ARt)(CHq5#;Sv8pg>Lg1dgOY{O&*v!;dokL
zaRM33FqENt%1&&Q5Qes#g6MS6J@=boIX%FqO~TL*Ou%`X<>Pae!$lY|rm0l`tS&0A
zd{-EAZNlx<odpw#J4-nwWi;aIDni_BA@@hsq>SkuoF<5_!Oeuxj&gsBVL?QXZJEkJ
zLOD^=FU<whf;Eb~;u`>mh>jxwY6No|6V0eFo1S6`7)vP|j9~z|Y*P;3U5!D({$x@Q
z(ov*e68(hK0Pk`K3700LYr1qXzbGyBa|}5Fjp-ShjiFmAY1uj=r)*`9+`H6zzGaN?
z8OHwJsZ4Pt@wYAH=mk-vt&EfNkZ`#Pv!wo#Vu!OTxB3>tp0-+>=a?202oaMesFN?u
zGiTLWg<t#8eq|~SD5u|rF<E>~uK64f;cfx4!~_B5jKODzZr*d}CLB)e%cgsL#p=DX
z(RM;_t6oBXsnG>lVz;#8HI(UF+))-pazF@ls|xtS5)2+6xub(m0z0+}t@kPx)`Ghh
zTL&d9gp1umI8t1uc3jXf-TG&Uc0OE6y0|cSUwh%v>XnOSZY0e!)jhh81fz=DZxGdK
zBVR+Z*(fW|$=!$p{27$Wi$B>r`1u;m61+WP<j@)NgSX>p3o|k0Y8y5&Woi@R!blC$
zK!{q#XK<MI$G!-X+N?jb5Ix11s%Yo16$NY=CP-$LnILx_L^=)YYJ?MDYvy0idbFJH
zmss9SOP55ZVC47uI?*t6hHXWSSW6)owhB;3iZ<-V;0M*$E4QRsB5oOllxA{X@{I*C
zb1cee(^<0hg-jsDEMQI5NPHb$q^Z&mWJS|zT&5QfQ%SHz3eqLbbR=kjJ#|IuZ~KmS
zcUI*D`oE9CV@7;91~!KJX8KPuq6B`_;LOA3CdB?3TmBaNA^c-+@2N-vaakYt_DAL2
z`cS<c5=LU^O73McJ5&KNKfD}u<7gE7YC=lR8uacGUiUPkA#wM4CyHq(5jTxt%@r2G
zc(5yYe5<$Aa%sk$T|~4xnt=WIrIp@8#OfNWGj0BQ-Cjs-qs}7r-0K%o;22@AwlD34
zJ%j0Pl0qmDQS>SIFRf{A^J)oPEg<*0u*fIDZxnV@f(XQ8_Y|mz-LwI8B?#GvrY#O0
zfDdc3q^p|{w`Ap|iUlmxu*5kBnG~R3zmh#i)%s|^R4LtTPvwmRLqR~5?SPLfWdcXE
zo+e&xA7I$|37g-Ju>~pfKo$Uay?Lp4xAE4lNMTS)TVM@Jt<^l`9<H{9Fu{C_-SHJ2
zdBFtk*}BG-Cis_koo8xy28}A$BOquH#ls2yTV*8+^9Rgu`Jmr;I6hpc*6+o6v)%%W
zEay$We1tFJtG>U+ai!nnN29HSTD$DPY0v<g+3sLycv^k1MqJ3<Kij5#kYXU+vO!cg
zd-b)}e=I5lHXT~Zp;nflyb^9h98KYkin_5MtoT}%s`wyy2Q-KbuOC2^i+$h_0#c??
zU7$PW`9X+4iNZ(<en7y+l?>sy&uBmr3|qHeXJZo4B#L-Zk>>5?bvx6+nSXY6a8fe&
z_1fvt%7`$}MgvVNc!W^aQr<!1<;{$AePfc##dh~w^E&#Y#{1JLV5936R13E%qtn&d
z2u~7^%T?dT$M1)2pbIO8rY*vN=9XGt={imt_lm8i$=;)w#@KcWp|(<9hD*Du{hmp%
z`2>>fmOWighYL25&+rar=S|BT0ap^JoxQBfZD21Lgf6h{p%#7OdOjZ-MhWeAU-h=l
z@oi2r+hb-b8Q+v4l!sTnv(q&ls*{wZlJ%0O;W`VDWU$NM=O$8m7c9~gtMz<qj(nb*
zxIZMIYmzD>a|l$F@TD~-pGXCIe7f^IcY2}X#bHUH7oz(Y&s!LI>VSzsiL|ygD=$=I
zs9WUjNkJ>N4R_xic-Yt=dVLL^HvTG8b4%r-&{JGOg8g!WAx9mOYJhz7z?-%h-`x@;
zRw2>#mS>_k@sq*rXkuuNUt?{WgJbI7jM{gBi?L?iyl7Uc8Nl$UO-Ufj)OY_v&a~gP
z#@w5Kjo-fop<Td8xErNG4&ainJHejsvFlt|X{&a8rqt&2e4mG6i0hR&P<Il2hjzQ3
zzwxc%{l}ug`19kLiM32LPqDmKE!XAojRU=vBWHdJ{BP{-pZJrTAYY|efOvkB(&Vso
z#P89${9?x_p|wODR36wFd+XKZfR&CQb-=92?kljwfvV8~F^h9nJo2?=M8&GD<#t>p
zF9+9v?gd!)nnQ(bP-`IH`lf-2V>s2ENo8om5giQ03@eegghBYEU5Ftqlw!!~9gfF3
zVd~p+CFOE_8anC=e}#e)5MzC%MX%N7>f9C9Z7nb%3p0MSPgK&5xtLR9-5=s(=g}nc
zz;X}e(!aRrXU+KSbgbo!t!3H;NvHt=tja_;yEb2t>7XsAag1#`8rB&V&h$j6o+?oI
zDPz4-jlK_T7qmvS%bVtvm!~w`PPDmQw*wa=<5lTQZra1=Cc_>Lk|9?UAaS@t7fAwM
z`csH^c<&OSY=BOrh3E0{1J+-Vigv#3c{#!>UqBS6W(E(jlt?-OrQ$fz#W%bMSm}m<
z9+s$ONFz@C2<bgg(Q>5_uZfpWGlekB70~(|DDnRGnFp##xiOU+5z3)oc9bv^;83X)
ztyKT6;8hmCUEhR9jnA>AKp7S~emmL;USVckMtWl;1APO!iH{o&5hczNn;haeLhhJk
zPhqI_<fQEYi(Dv^fb|p;t)i^@NP*5cf<H?!YL7p&qvsfL+aO)vvt;p$+|^1<)vs1k
z6txf#bpgrgJ4xw8Sff$lDx+vCw%AH>>H*XBx+P6aUlOxLv2qvQRjK=`O_3ywG%tE{
z@Jtpc(IQA<Y>43--L-mO!Gq)SfE;Z$*Un-`5@W(3PTxWQS!e1Mr6l7$)JZQTK|m0H
zrVMKvM^k<4#|mfcof&Xu9Q`}D*1fw{u?viWKXK02Q7eodGMN-yH~=`5=^H}v2uU|$
zt}wV=M9AT+*qLY8^ciZEX-zd48t2+amFCKxg`)Qo8C}Wen0EW{FAp;5NI5DfIKXs#
zmmNR$S8p`P;7%ZYDzxf+#@~4{ZEUM9k3O?=<<dE0lE+h{U%;$L8c?IrxO1H}rxd&^
zQ{Qm42Q>2<3N=}n{kkUtilH&7bdkQfsG5m-e!i#8`tAbB6sZCGvbh+yxl^kM^#z38
zR|4X+RJ9@I0u5|CeCfH_L!mb&Sl(g-1dg(5%u}S^A5NSI=;Ctut88z%zgVeV?GFgM
zo=)F4a1#Lwsopl&ulZFL8hwqN04#jBG5dbu)q`_oeaB&Nd^h8#>U*{lnUfWnI?OPp
z=>07%8KVE>YTKy6i^U9Jz<7fG(ssSannF7xQlvU+3iIZgD$sk>5gli)FVOvfly98*
zGh<C@HOhDX>JeMej~rHZ1NL{kz92%#YgBe0?G3{@JF**Hk9LU~Od4^$+_?D-V>WR*
zUesG}I=H&gDSbvbzK5AZ7jLceE!P5mEl`bux~HLz7NJdUnnQ3OeN7UbZ>({mmnAEz
ztO*Pyu~uakmTGWYiy(0*^7%mOmJV_ttA%X13OAk?Gybm9ND2xe#}N^}KFVO;Gz}ZW
zNj-xX8<1mL@GQf&o=|%{u%ps0wYxGNrPf-p>n-1!>7*Z1&{`toJscdqTSiUW;F57g
z+O>CSfn_RXu@=CL{~PnmSBUFm4)u1j?yY<LFp0h^HTgu$2%~vTk$r)l=4eyy@0+2$
z8yanGKob3+5gEaZy=T8J?$@U{D~uh5L<JL`s%Hn6PwpJv$-?{2W=`N00STrDsV6Ks
z6_#xJ^4|Ky_~Z&aGw!Q66UrMiR@&(^DAUJLq%piYR?7<;7)zDP#?qX4u7-GMo33Os
zo=ZEIkAb$MO56x_tR_^ZI6<_EBeZj@+oxTid}Wz$3$Gy_WJ}Yt{fdKAJW3E3^4<4n
z0`6xG?LNVAu+$iqIjR-6I^v|>qk%Y1=-`yfVZJWvra5VqcH5jvvRm>Y;<)VsK|NtQ
zB*JA8)W_7J14Q<uiXOOn{uMmf4jcs@IB<oI)Z<Ei6&_9s=8M#ohw@D9BIwk~e8%td
z6lH>Y`HV@o{4sZ<7Q`(Tw{d;Yq#3nUYj>bsCii7GrNrS4B36gjeN2#uV<e#Z=ee(O
zub>T$w}eA^yjWebYd4(LG3S+Z{4Njh#3s2s0@Erv%5VA&VTQdRk^8xyOH%jw<S_Tf
zX>{(fcJZ}Dlf}n`Neh??mj|=ve?~{URO4_;wXF4c&8Hp{4pxin%t;Q~M*2)#%CF8m
zp_5LfxX*+{ICMZLh%h@4Pf!DwNQBX?Gwb4RsL+Hdrt}+BkBS5HDLN5$8RlSXuoSv)
zJEgkU%t;(Ix<r8(#@&feM0yvdToA8L%3`2OX1|H<H_Zs5Pbi{RbQ!S~)<nK-!``n>
zOf%Oo{Okwp=HkC3eRpW0s`3@PTymR<_u=|bKIMDfJEW%kB?Bm0O-8`NT2olIfoO(Q
zDYHjt<zxt62~A*DYU0G!W#E7QiBe6uMZuv#>|(Kr>w3ws$^;r?{-#rPF;C55SCo6<
zGqVU?J@#ejod2N_L^;nbVuV)-sS@fbZFW!siMDM~hM1CeA%?RYbP-vh*UNRU+Tz2O
z5>P41rdzyBB_BTggh&VTHL<XfSN^#WM;VY~08v?ZMxHB$e4eWh?$6mskID58mebU9
z?6;#+g<3*W8Qbv!3vE)?++oE{NWlzz!itq;ok-8DGTAn|sW5@svl?rkyS6f-S?a#@
zY4>?8a##SdJIyAS=!~)yQqO|aeVxj!)|nQ3qAR7};Op&*HEA!4cBQkYpsA&<o!2TV
zxNc^^*Gt>b$S<duYOBJ@zrjM^aImUwSTPQgvErSI+-f5&LYCxR#!K`Qz!RW(mYK5j
zq0Se_yukQdQFJAI4;3@1b)N6(yQ%<zV$~#A;<v8fAVHqnzK`xt9P4=to`O<Sr<hl+
zj(5rz-J3US`lURah~lc`t+xiOP4WadOpj&HUP6@<9I$7~+A5SqtX8LqeV9#{Rnhd`
z>xFRy5VNmccL=_PZ206jFjIxO{53ugv|M?MV!zG6b}}g1iC-4T@EV3>A)$Ne+9@%n
zaecX%QW+d-Kon$WP0K-jc%p;(bB&LgTn=j%7NGG*D%>8jK8K&IVogZ!<6(p>HxSz7
zp?V?VoPw$ff|9utxm{T?JcTMkS6Un`bkGvYMW2sW98j2iyUcr;eP6|Tb$4{xon9u*
zlhklu4VD?Y3D;pEVSFj080VkV4oNRrMaWB@+a#fs<}Uy*6l_c&ES=;TFrXo`l085W
zbdcPJ>K>8q=0fEwz$6Yt7Cse{)FPf}>a@028>mXLi(cVRqLnhaKj>V^26kEvm6N14
zb?T4kknZb%4M}hku^z&nzq;$;;U;Lj$m?F<3D8gTuJVE*D3l)2Yk^!AUn2JCZwjtj
zH2~kwG8LGNm5UaA9kNM8{Okp0L>tctUWn8gvio}x_xNs~W=x<8puxMq)t6;tgs1Vf
zOB=v{(36OdpZJJ3t>!a_y5C$`?LnQxwO2QqHZ-*zYHVzG5`?r@GG%+y<tp}bYGS0y
zZ~Y`u*Z~)5&&l7&ztm>B+BjO>|ESyTz{5mDB>gdKh~xWm#N5j?IH`~>fe&`}$JyaW
zo(q8o3-KS0(bLgWA!cq+RTWx;8ub7<#ALM2;nG0^+;^T~ReTUqiral#D+B#OJTbE_
z2!bDvj}~HhQJ9!>f?`3mx<5&e1I$SqBSY<|$KuyuGzg?Vca=pNrBN1!@eH|kyuv6U
zK@>5FeP4P6K_7}J?in^2Krrikv<o`gTNcb6(7v)|#!r!bvwX6(HSs=JO4Idp|CHxq
z;01T`?Yb8OG771r+%lyQ(K5_A9%+q1T(1rU-%?LKkv@~lar6<82blrP{@7~}MQrtb
zlmLrBb5~Ot!`jq!Q6rc{?3#|F2N$dFs)UWlYq=4`lGkGyrhv%EF;+uxh_TGVo&b;$
zaEbM)(Tt!3P=q*R>(=seffJE6D@Zd!i;UqG-m<V}h=MTdSH*d>M~+zqz51ILxSbsl
zrKzRZ0=;O%tCjs*>e{O)8DeGB@{UTfd}>LEt95PAfP(kA+%|NtX%ogFruDYL3S36L
zPxdYm7<TqRv0R)7@vDbu&-K+L=kGyyYCsv%?CZB?k4Spc3djx?c!L8&j)4S1K(9kA
zh+9P=_YtL!)n#LbW(UgGs`4|&g|R;BY9?cql@rDW?@gR%jE!o>9pM?F?!qQ3T65V?
zOmyC4V_v56d>(f`eC5Z3#m41)e$l2HsdVeF)3mC(*`f~097Xk!sd`+g8cD!qmre#Z
z0RvYScIsuK*>{3J%gE|IDe9$%@=^GqUHRC0e`qOK8){qW>&e?#8JWNTQBAspl!&$Q
zBKtTu+bd_W#+S*2&T&yE^Ac!@j_WaS;@Sxf$-$!t6w4Hsk8Df%x02TgEVSUU2>VfQ
z+!(mJ3P~36lhCOX6Uep#didCAbhb){Eu5_CtU){`b&TRaOSM*z#Ki5<3byG~2@cCJ
zef=aSCtIsU>0i*=oY0O&gQS}asOX*wGu~i(WyLyhp;!EZ5A6s{rIi~?aGrwY?nK!B
zzW#%gLRerJ_2o-f;QPB>6N%`P+V6V?615Y8_utvGc0aoq>MnOf*(x}izfLN0dJh@I
zTHD?_aH~(t`z)CL<DZc1^a<DDJ;2fZ@Id+r$z#h=2M9Fz(LI#yk$UKh*O43{jnC(d
zl=G1q%fW)CVJg5**ZQ&sDmLoXX54bcD`eua@AY$caIUOv>%F>ZL5?g#mmtTcFAog=
zwog6jS~pAU)(*%=n^wtR#3jk!o{85#XjvMm1}6c-rQVb~Cfz968vM*=`GVF~6*E8t
zqBTjFK&ESwh%DVPN&jLNMt`YS#^>Ims!|b=yL#PlFpEi)mlidVfOCyxv`5KkHW8g+
z=`Nn$=0X&FggEPc4(c~J0|@ot34Tx-yt@@yqiycqQapz{YOCik2*&nsHx30zA!pyj
zCK}VG?R{xzjs;nEk9khg4X1HQ%2osqJW=GW>_3}0MI6geiM6Oo3H$V@lGv2Nn!>Cs
ze$ZHLXS2NWzW(tS<)3@EP!B+ATIriU?b$lB+11@Y{I>AWw}t;(hVD_aAZ$RajUKt<
zz~caUy+P6*9c9YqCGoDLo{L+I#Qh-I^DvdYhI&3(n$a5Q;MlA6_=OL8wYYPH8Vp%M
zbsn~|9=yOVy9U|A4-U$69wPbmW8jVo7A+99+s8ULUY_f(Bc|y9q3R#x1{ptbQidB1
zZ7Im`CUY_iX0!9?l6bPzo6DGgI~M9lejy|Ix_zGNvvVz!C7XBM6%d%a)4#|SoBn2i
ziF#EbG||>H1U<m>L;7SR@|hqM6#IacEqBj>z1XMx0s~q^!FS#<@_w^x?;0&>VmseS
z5%`g&^j-0ejBK<thYqQg_lR(Kk*4k30~kBoR-+ubnKebMj%oAk|KASbKf$?nn1;3Y
z0AtMqoH!4!56AhZ*zY^|FLaGt=@B{(JnKD&Tr7tJ8H5rwI#MPIoI!M{KN{*li>t+d
zP3}rnNwJB3hmh>mctGAWGgo~uibQ6tOE06xPJuvo%`ytr@azETWy)u>!%BZp!~l_E
z>Vtzyf=QJq@zHW{N=sP16zvxp6=V}yKuUjbs4WGCvnatVRitrzvp}ctjRB6kGdHWH
zob!3!=^JvHPnIF8_w~Ap70(vZZuS`tBVi;1B{zB4yBz=>EMr|z7;6%r`7}Q{zC-uv
zl+v)yia9N~?29|1;cQ`d33KA`S3_uzL&%N^8YMjLwWJI+73aXjs=u^c`xj2(KQZq&
zPT?P69hJizd4N;mAtaFeg!R8Pe(?)G@bwPi69;EN_CD~qC+eN+D})X$opLJneo-fK
z2l~d21vgHDpHb}QKoZFVvUx>!{=>mh#~wS>nPBF18<bBWw4mw8?iBVV+de@OpCVrp
z1Aq)1Gq*T#|DeMjj$$vTko)Zz#XH1&V#jpb3TnZ8^>1x^r5UKQaWqoz%gJpr2yVWM
zMlT@5n8$3><5GNb1hK7Kjk@LGr1k%L8n^o%5XD1$IxRx#z|Bm7A*@4~h7`uaulS)i
zr|WRJ?j6@eL*g32j#`|W|D4JfdZ@vXFF=-<h95oaN4$R0vtN!>t=~W3f%wpnek8io
z-T=*Q^v!KF6&x+}t<@hxWkE!b6c_`V&jndSYla$=yoGjvw$_q<4qzF4^t|cSX;hNO
z;dv6J78sv<K)fi&-c{rMZ9RezwTU08!07x~zUG-SsFYLYT)qK8c=T}+dW@HRivu*X
z8hGi@;k7Zn3Urf4F8+AFDCKL5pi)rk;$u*}J_(m{;vxEe2V^TcgC?MJJttkg_@Z2_
zDk2Ns>t+QS396*Gr_L(?4?d;W<`|XvalXg_QN*G04K~|ua^|q;itEgin{KRno=53k
zcI);{mHUBdzN&l-7!37r;w)9iR(LMFQa-tjib0d7BRNsLIPl^q3WJsTypiqzA~Hmt
zq<cMaf+ed<y7bCxon^4_uhC3MI8iF=5|`gBOa&m$l86&Ub|pHI`6x_5!kEXB&iB9I
z`PZL?jzfK)<Hg|Old{Qi+W<CNgQ%=S9QJfxWnY~17q^yEo_&Mc>tEcU<)3!R-I_mZ
z2(4_SsXJ*t(Pg=Xk`V_5L;I1v|9NE|76$|rgz(|H1OFe_>8FAJ9k?G2{N&&_ADD-~
z4#=NQp9b<rjh{{t9s<!%ogW9|-<&;iA3w(<;r}>(yEouZe^2iYcohEWkNkJF|J*C^
z6r!i>_b+Ylhb{fL)4#azr|M5h-e2l-4}tfW`rnlAzfJm)_xw2?Ck+qr9~Sg+y8pZ+
zf1>mX_qQ<r^g^HJgGWC<QBwO|?Z2|aQ#((~#9wv-F#ow|d}`rozw(y_!H4$cW7+w4
z_wwJs`g886&_7iF;>!NqAy3(|Umn?iSNp}CJ-y_oh2Sp($q)4M!zKR?+rM4(BXRw6
zJgzX!&lUbHf&829W5E469(CRD{&xHy3jCi><Jyyi^=RSex|jYB3s2J5Q!Jix>%R;t
c|JQVWnUWEQd@TGP^22kGxCc26g2zw)2al(vY5)KL

literal 0
HcmV?d00001


From 9cd18397f7a7ddeec987fc9851d661171b294698 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 18 May 2022 10:11:09 +0800
Subject: [PATCH 034/208] fix: import user login length required

---
 app/libs/custom_regexp.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/libs/custom_regexp.rb b/app/libs/custom_regexp.rb
index 25c3ae98..72184630 100644
--- a/app/libs/custom_regexp.rb
+++ b/app/libs/custom_regexp.rb
@@ -1,7 +1,7 @@
 module CustomRegexp
   PHONE = /1\d{10}/
   EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/
-  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]{4,15}/ #只含有数字、字母、下划线不能以下划线开头和结尾
   LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/
   NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/
   PASSWORD = /\A[a-z_A-Z0-9\-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'_<>~\·`\?:;|]{8,16}\z/

From ca3c56452917b968d0b302728686757e20708657 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 18 May 2022 11:03:39 +0800
Subject: [PATCH 035/208] fix: not found user return 404

---
 app/controllers/owners_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/owners_controller.rb b/app/controllers/owners_controller.rb
index 067fe4da..863f8aa3 100644
--- a/app/controllers/owners_controller.rb
+++ b/app/controllers/owners_controller.rb
@@ -11,6 +11,8 @@ class OwnersController < ApplicationController
   end
 
   def show 
+    return render_not_found unless @user.present?
+
     @owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
     # return render_not_found unless @owner.present?
     # 组织

From e237fd46f7d151a3162f806a6042dae03abad34e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 18 May 2022 11:37:23 +0800
Subject: [PATCH 036/208] fix: not found user return 404

---
 app/controllers/owners_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/owners_controller.rb b/app/controllers/owners_controller.rb
index 863f8aa3..28a5210d 100644
--- a/app/controllers/owners_controller.rb
+++ b/app/controllers/owners_controller.rb
@@ -11,10 +11,8 @@ class OwnersController < ApplicationController
   end
 
   def show 
-    return render_not_found unless @user.present?
-
     @owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
-    # return render_not_found unless @owner.present?
+    return render_not_found unless @owner.present?
     # 组织
     if @owner.is_a?(Organization)
       return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition

From 83e43f0c9792010817828abcc117294e2e287303 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 20 May 2022 11:43:22 +0800
Subject: [PATCH 037/208] add: new readme delay function

---
 app/helpers/repositories_helper.rb | 39 +++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index b8bfc31c..9fd45249 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -87,6 +87,42 @@ module RepositoriesHelper
     end
   end
 
+  # author hui.he
+  def new_readme_render_decode64_content(str, owner, repo, ref)
+    path = [owner&.login, repo&.identifier, 'tree', ref].join("/")
+    return nil if str.blank?
+    content = Base64.decode64(str).force_encoding('UTF-8')
+    s_regex = /\[.*?\]\((.*?)\)/
+    src_regex = /src=\"(.*?)\"/
+    ss = content.to_s.scan(s_regex)
+    ss_src = content.to_s.scan(src_regex)
+    total_sources = ss + ss_src
+    total_sources.uniq! 
+    total_sources.each do |s|
+      begin
+        s_content = s[0]
+        # 链接直接跳过不做替换
+        next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:')
+        # 路径替换
+        if s_content.starts_with?('./') || s_content.starts_with?("../") || s_content.starts_with?("/")
+          s_content = File.expand_path(s_content, path)
+          s_content = s_content.split("#{Rails.root}/")[1]
+          content = content.gsub(s[0], "/#{s_content}")
+        else
+          # 图片资源替换
+          s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{s_content}&ref=#{ref}"].join
+          content = content.gsub(s[0], s_content)
+        end
+      rescue
+        next
+      end
+    end
+
+    return content
+  rescue
+    return str
+  end
+
   # unix_time values for example: 1604382982
   def render_format_time_with_unix(unix_time)
     Time.at(unix_time).strftime("%Y-%m-%d %H:%M")
@@ -102,7 +138,8 @@ module RepositoriesHelper
       Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
       content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
       Rails.logger.info("content===#{content}")
-      readme_render_decode64_content(content, owner, repo, ref)
+      # readme_render_decode64_content(content, owner, repo, ref)
+      new_readme_render_decode64_content(content, owner, repo, ref)
     else
       file_type = File.extname(entry['name'].to_s)[1..-1]
       if image_type?(file_type)

From 779c86108a547da22ef3cb2148906c49cbea196f Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 20 May 2022 17:00:02 +0800
Subject: [PATCH 038/208] fix: readme relative delay and replace_content

---
 app/controllers/repositories_controller.rb    |  3 +-
 app/helpers/repositories_helper.rb            | 30 +++++++++++++------
 .../repositories/_simple_entry.json.jbuilder  |  7 +++--
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 272e121a..a2ab33b2 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -225,7 +225,8 @@ class RepositoriesController < ApplicationController
     @path = Gitea.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/"
     @readme = result[:status] === :success ? result[:body] : nil
     @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path)
-    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha")
+    @readme['replace_content'] = readme_decode64_content(@readme, @owner, @repository, params[:ref], @path)
+    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha", "replace_content")
   rescue 
     render json: nil
   end
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 9fd45249..1897f3ae 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -88,8 +88,8 @@ module RepositoriesHelper
   end
 
   # author hui.he
-  def new_readme_render_decode64_content(str, owner, repo, ref)
-    path = [owner&.login, repo&.identifier, 'tree', ref].join("/")
+  def new_readme_render_decode64_content(str, owner, repo, ref, readme_path, readme_name)
+    file_path = readme_path.include?('/') ? readme_path.gsub("/#{readme_name}", '') : readme_path.gsub("#{readme_name}", '')
     return nil if str.blank?
     content = Base64.decode64(str).force_encoding('UTF-8')
     s_regex = /\[.*?\]\((.*?)\)/
@@ -103,15 +103,19 @@ module RepositoriesHelper
         s_content = s[0]
         # 链接直接跳过不做替换
         next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:')
-        # 路径替换
-        if s_content.starts_with?('./') || s_content.starts_with?("../") || s_content.starts_with?("/")
+        ext = File.extname(s_content)[1..-1]
+
+        if image_type?(ext) || download_type(ext) 
+          s_content = File.expand_path(s_content, file_path)
+          s_content = s_content.split("#{Rails.root}/")[1]
+          # content = content.gsub(s[0], "/#{s_content}")
+          s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{s_content}&ref=#{ref}"].join
+          content = content.gsub(s[0], s_content)
+        else
+          path = [owner&.login, repo&.identifier, 'tree', ref, file_path].join("/")
           s_content = File.expand_path(s_content, path)
           s_content = s_content.split("#{Rails.root}/")[1]
           content = content.gsub(s[0], "/#{s_content}")
-        else
-          # 图片资源替换
-          s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{s_content}&ref=#{ref}"].join
-          content = content.gsub(s[0], s_content)
         end
       rescue
         next
@@ -133,13 +137,21 @@ module RepositoriesHelper
     date.to_time.strftime("%Y-%m-%d %H:%M")
   end
 
+  def readme_decode64_content(entry, owner, repo, ref, path=nil)
+    Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
+    content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
+    Rails.logger.info("content===#{content}")
+    # readme_render_decode64_content(content, owner, repo, ref)
+    new_readme_render_decode64_content(content, owner, repo, ref, entry['path'], entry['name'])
+  end
+
   def decode64_content(entry, owner, repo, ref, path=nil)
     if is_readme?(entry['type'], entry['name'])
       Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
       content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
       Rails.logger.info("content===#{content}")
       # readme_render_decode64_content(content, owner, repo, ref)
-      new_readme_render_decode64_content(content, owner, repo, ref)
+      return Base64.decode64(content).force_encoding('UTF-8')
     else
       file_type = File.extname(entry['name'].to_s)[1..-1]
       if image_type?(file_type)
diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder
index 9d0998c8..3a0d16e2 100644
--- a/app/views/repositories/_simple_entry.json.jbuilder
+++ b/app/views/repositories/_simple_entry.json.jbuilder
@@ -8,7 +8,10 @@ if @project.forge?
   json.path entry['path']
   json.type entry['type']
   json.size entry['size']
-
+  is_readme = is_readme?(entry['type'], entry['name'])
+  if is_readme 
+    json.replace_content readme_decode64_content(entry, @owner, @repository, @ref, @path)
+  end
   json.content direct_download ? nil : decode64_content(entry, @owner, @repository, @ref, @path)
   json.target entry['target']
   
@@ -24,7 +27,7 @@ if @project.forge?
 
   json.direct_download direct_download
   json.image_type image_type
-  json.is_readme_file is_readme?(entry['type'], entry['name'])
+  json.is_readme_file is_readme
   json.commit do
     json.partial! 'last_commit', latest_commit: entry['latest_commit']
   end

From fe23c2afbf9d5287649da474eea7c25608f81a85 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Sat, 21 May 2022 16:45:42 +0800
Subject: [PATCH 039/208] fix: replace content next if blank

---
 app/helpers/repositories_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 1897f3ae..9cb64b35 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -102,7 +102,7 @@ module RepositoriesHelper
       begin
         s_content = s[0]
         # 链接直接跳过不做替换
-        next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:')
+        next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:') || s_content.blank?
         ext = File.extname(s_content)[1..-1]
 
         if image_type?(ext) || download_type(ext) 

From fbebd0a623fbbc0aec9ae2d0b488e26c536b773a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 23 May 2022 09:27:09 +0800
Subject: [PATCH 040/208] fix

---
 app/libs/custom_regexp.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/libs/custom_regexp.rb b/app/libs/custom_regexp.rb
index 72184630..b60a80cc 100644
--- a/app/libs/custom_regexp.rb
+++ b/app/libs/custom_regexp.rb
@@ -1,7 +1,7 @@
 module CustomRegexp
   PHONE = /1\d{10}/
   EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/
-  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]{4,15}/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]{4,15}\z/ #只含有数字、字母、下划线不能以下划线开头和结尾
   LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/
   NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/
   PASSWORD = /\A[a-z_A-Z0-9\-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'_<>~\·`\?:;|]{8,16}\z/

From b0092487e699c72d96add9b34ca0e2f11de4827d Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 23 May 2022 18:10:41 +0800
Subject: [PATCH 041/208] fix: is readme use regex

---
 app/helpers/repositories_helper.rb | 2 +-
 app/libs/custom_regexp.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 9cb64b35..73ce9823 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -22,7 +22,7 @@ module RepositoriesHelper
   def is_readme?(type, str)
     return false if type != 'file' || str.blank?
     readme_types = ["readme.md", "readme", "readme_en.md", "readme_zh.md", "readme_en", "readme_zh"]
-    readme_types.include?(str.to_s.downcase)
+    readme_types.include?(str.to_s.downcase) || str =~ CustomRegexp::MD_REGEX
   end
 
   def render_commit_author(author_json)
diff --git a/app/libs/custom_regexp.rb b/app/libs/custom_regexp.rb
index b60a80cc..e778c549 100644
--- a/app/libs/custom_regexp.rb
+++ b/app/libs/custom_regexp.rb
@@ -11,5 +11,5 @@ module CustomRegexp
 
   URL_REGEX = /\A(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?\z/i
   REPOSITORY_NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
-  
+  MD_REGEX = /^.+(\.[m|M][d|D])$/
 end

From c27cc063e67003e091afedc1b83d1b622281f762 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 24 May 2022 10:59:52 +0800
Subject: [PATCH 042/208] add: new update user info simple and sync gitea

---
 app/controllers/accounts_controller.rb      | 776 ++++++++++----------
 app/controllers/concerns/register_helper.rb |  28 +
 app/forms/gitea/user/update_form.rb         |   2 +-
 config/routes.rb                            |   1 +
 4 files changed, 428 insertions(+), 379 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index e40630c6..1af348ab 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,378 +1,398 @@
-class AccountsController < ApplicationController
-  include ApplicationHelper
-
-  #skip_before_action :check_account, :only => [:logout]
-
-  def index
-    render json: session
-  end
-
-  # 其他平台同步注册的用户
-  def remote_register
-    Register::RemoteForm.new(remote_register_params).validate!
-    username = params[:username]&.gsub(/\s+/, "")
-    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username)
-    email = params[:email]&.gsub(/\s+/, "")
-    password = params[:password]
-    platform = (params[:platform] || 'forge')&.gsub(/\s+/, "")
-
-    ActiveRecord::Base.transaction do
-      result = autologin_register(username, email, password, platform)
-      if result[:message].blank?
-        render_ok({user: result[:user]})
-      else
-        render_error(result[:message])
-      end
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(-1, e.message)
-  end
-
-  # 其他平台修改用户的信息，这边同步修改
-  def remote_update
-    ActiveRecord::Base.transaction do
-      user_params = params[:user_params]
-      user_extension_params = params[:user_extension_params]
-
-      u = User.find_by(login: params[:old_user_login])
-      user_mail = u.try(:mail)
-
-      if u.present?
-        ue = u.user_extension
-        u.login = user_params["login"] if user_params["login"]
-        u.mail = user_params["mail"] if user_params["mail"]
-        u.lastname = user_params["lastname"] if user_params["lastname"]
-
-        ue.gender = user_extension_params["gender"]
-        ue.school_id = user_extension_params["school_id"]
-        ue.location = user_extension_params["location"]
-        ue.location_city = user_extension_params["location_city"]
-        ue.identity = user_extension_params["identity"]
-        ue.technical_title = user_extension_params["technical_title"]
-        ue.student_id = user_extension_params["student_id"]
-        ue.description = user_extension_params["description"]
-        ue.save!
-        u.save!
-
-        sync_params = {}
-
-        if (user_params["mail"] && user_params["mail"] != user_mail)
-          sync_params = sync_params.merge(email: user_params["mail"])
-        end
-
-        if sync_params.present?
-          interactor = Gitea::User::UpdateInteractor.call(u.login, sync_params)
-          if interactor.success?
-            render_ok
-          else
-            render_error(interactor.error)
-          end
-        end
-      end
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(-1, e.message)
-  end
-
-  # 其他平台同步登录
-  def remote_login
-    @user = User.try_to_login(params[:login], params[:password])
-    if @user
-      successful_authentication(@user)
-      render_ok({user: {id: @user.id, token: @user.gitea_token}})
-    else
-      render_error("用户不存在")
-    end
-  end
-
-  #修改密码
-  def remote_password
-    @user = User.find_by(login: params[:login])
-    return render_error("未找到相关用户!") if @user.blank?
-
-    sync_params = {
-      password: params[:password].to_s,
-      email: @user.mail
-    }
-
-    interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
-    if interactor.success?
-      @user.update_attribute(:password, params[:password])
-      render_ok
-    else
-      render_error(interactor.error)
-    end
-  end
-
-
-
-  # 用户注册
-  # 注意：用户注册需要兼顾本地版，本地版是不需要验证码及激活码以及使用授权的，注册完成即可使用
-  # params[:login] 邮箱或者手机号
-  # params[:namespace] 登录名
-  # params[:code]  验证码
-  # code_type 1：注册手机验证码  8：邮箱注册验证码
-  # 本地forge注册入口需要重新更改逻辑
-  def register
-    # type只可能是1或者8
-    user = nil
-    begin
-      Register::Form.new(register_params).validate!
-
-      user = Users::RegisterService.call(register_params)
-      password = register_params[:password].strip
-
-      # gitea用户注册, email, username, password
-      interactor = Gitea::RegisterInteractor.call({username: user.login, email: user.mail, password: password})
-      if interactor.success?
-        gitea_user = interactor.result
-        result = Gitea::User::GenerateTokenService.call(user.login, password)
-        user.gitea_token = result['sha1']
-        user.gitea_uid = gitea_user[:body]['id']
-        if user.save!
-          UserExtension.create!(user_id: user.id)
-          successful_authentication(user)
-          render_ok
-        end
-      else
-        tip_exception(-1, interactor.error)
-      end
-    rescue Register::BaseForm::EmailError => e
-      render_error(-2, e.message)
-    rescue Register::BaseForm::LoginError => e
-      render_error(-3, e.message)
-    rescue Register::BaseForm::PhoneError => e
-      render_error(-4, e.message)
-    rescue Register::BaseForm::PasswordFormatError => e
-      render_error(-5, e.message)
-    rescue Register::BaseForm::VerifiCodeError => e
-      render_error(-6, e.message)
-    rescue Exception => e
-      Gitea::User::DeleteService.call(user.login) unless user.nil?
-      uid_logger_error(e.message)
-      tip_exception(-1, e.message)
-    end
-  end
-
-  # 用户登录
-  def login
-    Users::LoginForm.new(account_params).validate!
-    @user = User.try_to_login(params[:login], params[:password])
-
-    return normal_status(-2, "错误的账号或密码") if @user.blank?
-    # user is already in local database
-    return normal_status(-2, "违反平台使用规范，账号已被锁定") if @user.locked?
-
-    login_control = LimitForbidControl::UserLogin.new(@user)
-    return normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码") if login_control.forbid?
-
-    password_ok = @user.check_password?(params[:password].to_s)
-    unless password_ok
-      if login_control.remain_times-1 == 0
-        normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码")
-      else
-        normal_status(-2, "你已经输错密码#{login_control.error_times+1}次，还剩余#{login_control.remain_times-1}次机会")
-      end
-      login_control.increment!
-      return
-    end
-
-    successful_authentication(@user)
-    sync_pwd_to_gitea!(@user, {password: params[:password].to_s}) # TODO用户密码未同步
-
-    # session[:user_id] = @user.id
-  end
-
-  def change_password 
-    @user = User.find_by(login: params[:login])
-    return render_error("未找到相关用户!") if @user.blank?
-    return render_error("旧密码不正确") unless @user.check_password?(params[:old_password])
-
-    sync_params = {
-      password: params[:password].to_s,
-      email: @user.mail,
-      login_name: @user.login,
-      source_id: 0
-    }
-
-    interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
-    if interactor.success?
-      @user.update_attribute(:password, params[:password])
-      render_ok
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  # 忘记密码
-  def reset_password
-    begin
-      code = params[:code]
-      login_type = phone_mail_type(params[:login].strip)
-      # 获取验证码
-      if login_type == 1
-        phone = params[:login]
-        verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 2).last
-        user = User.find_by_phone(phone)
-      else
-        email = params[:login]
-        verifi_code = VerificationCode.where(email: email, code: code, code_type: 3).last
-        user = User.find_by_mail(email)     #这里有问题，应该是为email,而不是mail  6.13-hs
-      end
-      return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
-      return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
-      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:new_password] =~ CustomRegexp::PASSWORD
-
-      user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-      ActiveRecord::Base.transaction do
-        user.save!
-        LimitForbidControl::UserLogin.new(user).clear
-      end
-      sucess_status
-    rescue Exception => e
-      uid_logger_error(e.message)
-      tip_exception(e.message)
-    end
-  end
-
-  def  successful_authentication(user)
-    uid_logger("Successful authentication start: '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}")
-    # Valid user
-    self.logged_user = user
-    # generate a key and set cookie if autologin
-
-    set_autologin_cookie(user)
-    UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id), :ip => request.remote_ip)
-    user.update_column(:last_login_on, Time.now)
-    session[:"#{default_yun_session}"] = user.id
-    Rails.logger.info("#########_____session_default_yun_session__________###############{default_yun_session}")
-    # 注册完成后有一天的试用申请(先去掉)
-    # UserDayCertification.create(user_id: user.id, status: 1)
-  end
-
-  def set_autologin_cookie(user)
-    token = Token.get_or_create_permanent_login_token(user, "autologin")
-    sync_user_token_to_trustie(user.login, token.value)
-
-    cookie_options = {
-                      :value => token.value,
-                      :expires => 1.month.from_now,
-                      :path => '/',
-                      :secure => false,
-                      :httponly => true
-                     }
-    if edu_setting('cookie_domain').present?
-      cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
-    end
-    cookies[autologin_cookie_name] = cookie_options
-    cookies.signed[:user_id] ||= user.id
-
-    logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]} =====> #{cookies[autologin_cookie_name]}")
-  end
-
-  def logout
-    Rails.logger.info("########___logout_current_user____________########{current_user.try(:id)}")
-    UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)
-    logout_user
-    render :json => {status: 1, message: "退出成功!"}
-  end
-
-  # 检验邮箱是否已被注册及邮箱或者手机号是否合法
-  # 参数type为事件类型 1：注册；2：忘记密码；3：绑定
-  def valid_email_and_phone
-    check_mail_and_phone_valid(params[:login], params[:type])
-  end
-
-  # 发送验证码
-  # params[:login]  手机号或者邮箱号
-  # params[:type]为事件通知类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验收手机号有效 # 如果有新的继续后面加
-  # 发送验证码：send_type 1：注册手机验证码 2：找回密码手机验证码 3：找回密码邮箱验证码 4：绑定手机 5：绑定邮箱
-  # 6：手机验证码登录 7：邮箱验证码登录 8：邮箱注册验证码 9: 验收手机号有效
-  def get_verification_code
-    code = %W(0 1 2 3 4 5 6 7 8 9)
-    value = params[:login]
-    type = params[:type].strip.to_i
-    login_type = phone_mail_type(value)
-    send_type = verify_type(login_type, type)
-    verification_code = code.sample(6).join
-
-    sign = Digest::MD5.hexdigest("#{OPENKEY}#{value}")
-    tip_exception(501, "请求不合理") if sign != params[:smscode]
-
-    logger.info "########### 验证码：#{verification_code}"
-    logger.info("########get_verification_code: login_type： #{login_type}， send_type：#{send_type}, ")
-
-    # 记录验证码
-    check_verification_code(verification_code, send_type, value)
-    render_ok
-  end
-
-  # check user's login or email or phone is used
-  # params[:value]  手机号或者邮箱号或者登录名
-  # params[:type] 为事件类型 1：登录名(login) 2：email(邮箱) 3：phone(手机号)
-  def check
-    Register::CheckColumnsForm.new(check_params).validate!
-    render_ok
-  end
-  
-  private
-
-  # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验证手机号是否有效 # 如果有新的继续后面加
-  # login_type 1：手机类型 2：邮箱类型
-  def verify_type login_type, type
-    case type
-    when 1
-      login_type == 1 ? 1 : 8
-    when 2
-      login_type == 1 ? 2 : 3
-    when 3
-      login_type == 1 ? 4 : tip_exception('请填写正确的手机号')
-    when 4
-      login_type == 1 ? tip_exception('请填写正确的邮箱') : 5
-    when 5
-      login_type == 1 ? 9 : tip_exception('请填写正确的手机号')
-    end
-  end
-
-  def generate_login(login)
-    type = phone_mail_type(login.strip)
-
-    if type == 1
-      uid_logger("start register by phone:  type is #{type}")
-      pre = 'p'
-      email = nil
-      phone = login
-    else
-      uid_logger("start register by email:  type is #{type}")
-      pre = 'm'
-      email = login
-      phone = nil
-    end
-    code = generate_identifier User, 8, pre
-
-    { login: pre + code, email: email, phone: phone }
-  end
-
-  def user_params
-    params.require(:user).permit(:login, :email, :phone)
-  end
-
-  def account_params 
-    params.require(:account).permit(:login, :password)
-  end
-
-  def check_params
-    params.permit(:type, :value)
-  end
-
-  def register_params
-    params.permit(:login, :namespace, :password, :code)
-  end
-
-  def remote_register_params
-    params.permit(:username, :email, :password, :platform)
-  end
-  
-end
+class AccountsController < ApplicationController
+  before_action :require_login, only: [:simple_update]
+  include ApplicationHelper
+
+  #skip_before_action :check_account, :only => [:logout]
+
+  def simple_update 
+    simple_update_params.merge!(username: params[:username]&.gsub(/\s+/, ""))
+    simple_update_params.merge!(email: params[:email]&.gsub(/\s+/, ""))
+    simple_update_params.merge!(platform: (params[:platform] || 'forge')&.gsub(/\s+/, ""))
+    Register::RemoteForm.new(simple_update_params).validate!
+
+    ActiveRecord::Base.transaction do 
+      result = auto_update(current_user, simple_update_params)
+      if result[:message].blank?
+        render_ok
+      else
+        render_error(result[:message])
+      end
+    end
+  end
+
+  def index
+    render json: session
+  end
+
+  # 其他平台同步注册的用户
+  def remote_register
+    Register::RemoteForm.new(remote_register_params).validate!
+    username = params[:username]&.gsub(/\s+/, "")
+    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username)
+    email = params[:email]&.gsub(/\s+/, "")
+    password = params[:password]
+    platform = (params[:platform] || 'forge')&.gsub(/\s+/, "")
+
+    ActiveRecord::Base.transaction do
+      result = autologin_register(username, email, password, platform)
+      if result[:message].blank?
+        render_ok({user: result[:user]})
+      else
+        render_error(result[:message])
+      end
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(-1, e.message)
+  end
+
+  # 其他平台修改用户的信息，这边同步修改
+  def remote_update
+    ActiveRecord::Base.transaction do
+      user_params = params[:user_params]
+      user_extension_params = params[:user_extension_params]
+
+      u = User.find_by(login: params[:old_user_login])
+      user_mail = u.try(:mail)
+
+      if u.present?
+        ue = u.user_extension
+        u.login = user_params["login"] if user_params["login"]
+        u.mail = user_params["mail"] if user_params["mail"]
+        u.lastname = user_params["lastname"] if user_params["lastname"]
+
+        ue.gender = user_extension_params["gender"]
+        ue.school_id = user_extension_params["school_id"]
+        ue.location = user_extension_params["location"]
+        ue.location_city = user_extension_params["location_city"]
+        ue.identity = user_extension_params["identity"]
+        ue.technical_title = user_extension_params["technical_title"]
+        ue.student_id = user_extension_params["student_id"]
+        ue.description = user_extension_params["description"]
+        ue.save!
+        u.save!
+
+        sync_params = {}
+
+        if (user_params["mail"] && user_params["mail"] != user_mail)
+          sync_params = sync_params.merge(email: user_params["mail"])
+        end
+
+        if sync_params.present?
+          interactor = Gitea::User::UpdateInteractor.call(u.login, sync_params)
+          if interactor.success?
+            render_ok
+          else
+            render_error(interactor.error)
+          end
+        end
+      end
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(-1, e.message)
+  end
+
+  # 其他平台同步登录
+  def remote_login
+    @user = User.try_to_login(params[:login], params[:password])
+    if @user
+      successful_authentication(@user)
+      render_ok({user: {id: @user.id, token: @user.gitea_token}})
+    else
+      render_error("用户不存在")
+    end
+  end
+
+  #修改密码
+  def remote_password
+    @user = User.find_by(login: params[:login])
+    return render_error("未找到相关用户!") if @user.blank?
+
+    sync_params = {
+      password: params[:password].to_s,
+      email: @user.mail
+    }
+
+    interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
+    if interactor.success?
+      @user.update_attribute(:password, params[:password])
+      render_ok
+    else
+      render_error(interactor.error)
+    end
+  end
+
+
+
+  # 用户注册
+  # 注意：用户注册需要兼顾本地版，本地版是不需要验证码及激活码以及使用授权的，注册完成即可使用
+  # params[:login] 邮箱或者手机号
+  # params[:namespace] 登录名
+  # params[:code]  验证码
+  # code_type 1：注册手机验证码  8：邮箱注册验证码
+  # 本地forge注册入口需要重新更改逻辑
+  def register
+    # type只可能是1或者8
+    user = nil
+    begin
+      Register::Form.new(register_params).validate!
+
+      user = Users::RegisterService.call(register_params)
+      password = register_params[:password].strip
+
+      # gitea用户注册, email, username, password
+      interactor = Gitea::RegisterInteractor.call({username: user.login, email: user.mail, password: password})
+      if interactor.success?
+        gitea_user = interactor.result
+        result = Gitea::User::GenerateTokenService.call(user.login, password)
+        user.gitea_token = result['sha1']
+        user.gitea_uid = gitea_user[:body]['id']
+        if user.save!
+          UserExtension.create!(user_id: user.id)
+          successful_authentication(user)
+          render_ok
+        end
+      else
+        tip_exception(-1, interactor.error)
+      end
+    rescue Register::BaseForm::EmailError => e
+      render_error(-2, e.message)
+    rescue Register::BaseForm::LoginError => e
+      render_error(-3, e.message)
+    rescue Register::BaseForm::PhoneError => e
+      render_error(-4, e.message)
+    rescue Register::BaseForm::PasswordFormatError => e
+      render_error(-5, e.message)
+    rescue Register::BaseForm::VerifiCodeError => e
+      render_error(-6, e.message)
+    rescue Exception => e
+      Gitea::User::DeleteService.call(user.login) unless user.nil?
+      uid_logger_error(e.message)
+      tip_exception(-1, e.message)
+    end
+  end
+
+  # 用户登录
+  def login
+    Users::LoginForm.new(account_params).validate!
+    @user = User.try_to_login(params[:login], params[:password])
+
+    return normal_status(-2, "错误的账号或密码") if @user.blank?
+    # user is already in local database
+    return normal_status(-2, "违反平台使用规范，账号已被锁定") if @user.locked?
+
+    login_control = LimitForbidControl::UserLogin.new(@user)
+    return normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码") if login_control.forbid?
+
+    password_ok = @user.check_password?(params[:password].to_s)
+    unless password_ok
+      if login_control.remain_times-1 == 0
+        normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码")
+      else
+        normal_status(-2, "你已经输错密码#{login_control.error_times+1}次，还剩余#{login_control.remain_times-1}次机会")
+      end
+      login_control.increment!
+      return
+    end
+
+    successful_authentication(@user)
+    sync_pwd_to_gitea!(@user, {password: params[:password].to_s}) # TODO用户密码未同步
+
+    # session[:user_id] = @user.id
+  end
+
+  def change_password 
+    @user = User.find_by(login: params[:login])
+    return render_error("未找到相关用户!") if @user.blank?
+    return render_error("旧密码不正确") unless @user.check_password?(params[:old_password])
+
+    sync_params = {
+      password: params[:password].to_s,
+      email: @user.mail,
+      login_name: @user.login,
+      source_id: 0
+    }
+
+    interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
+    if interactor.success?
+      @user.update_attribute(:password, params[:password])
+      render_ok
+    else
+      render_error(interactor.error)
+    end
+  end
+
+  # 忘记密码
+  def reset_password
+    begin
+      code = params[:code]
+      login_type = phone_mail_type(params[:login].strip)
+      # 获取验证码
+      if login_type == 1
+        phone = params[:login]
+        verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 2).last
+        user = User.find_by_phone(phone)
+      else
+        email = params[:login]
+        verifi_code = VerificationCode.where(email: email, code: code, code_type: 3).last
+        user = User.find_by_mail(email)     #这里有问题，应该是为email,而不是mail  6.13-hs
+      end
+      return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
+      return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
+      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:new_password] =~ CustomRegexp::PASSWORD
+
+      user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation]
+      ActiveRecord::Base.transaction do
+        user.save!
+        LimitForbidControl::UserLogin.new(user).clear
+      end
+      sucess_status
+    rescue Exception => e
+      uid_logger_error(e.message)
+      tip_exception(e.message)
+    end
+  end
+
+  def  successful_authentication(user)
+    uid_logger("Successful authentication start: '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}")
+    # Valid user
+    self.logged_user = user
+    # generate a key and set cookie if autologin
+
+    set_autologin_cookie(user)
+    UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id), :ip => request.remote_ip)
+    user.update_column(:last_login_on, Time.now)
+    session[:"#{default_yun_session}"] = user.id
+    Rails.logger.info("#########_____session_default_yun_session__________###############{default_yun_session}")
+    # 注册完成后有一天的试用申请(先去掉)
+    # UserDayCertification.create(user_id: user.id, status: 1)
+  end
+
+  def set_autologin_cookie(user)
+    token = Token.get_or_create_permanent_login_token(user, "autologin")
+    sync_user_token_to_trustie(user.login, token.value)
+
+    cookie_options = {
+                      :value => token.value,
+                      :expires => 1.month.from_now,
+                      :path => '/',
+                      :secure => false,
+                      :httponly => true
+                     }
+    if edu_setting('cookie_domain').present?
+      cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
+    end
+    cookies[autologin_cookie_name] = cookie_options
+    cookies.signed[:user_id] ||= user.id
+
+    logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]} =====> #{cookies[autologin_cookie_name]}")
+  end
+
+  def logout
+    Rails.logger.info("########___logout_current_user____________########{current_user.try(:id)}")
+    UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)
+    logout_user
+    render :json => {status: 1, message: "退出成功!"}
+  end
+
+  # 检验邮箱是否已被注册及邮箱或者手机号是否合法
+  # 参数type为事件类型 1：注册；2：忘记密码；3：绑定
+  def valid_email_and_phone
+    check_mail_and_phone_valid(params[:login], params[:type])
+  end
+
+  # 发送验证码
+  # params[:login]  手机号或者邮箱号
+  # params[:type]为事件通知类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验收手机号有效 # 如果有新的继续后面加
+  # 发送验证码：send_type 1：注册手机验证码 2：找回密码手机验证码 3：找回密码邮箱验证码 4：绑定手机 5：绑定邮箱
+  # 6：手机验证码登录 7：邮箱验证码登录 8：邮箱注册验证码 9: 验收手机号有效
+  def get_verification_code
+    code = %W(0 1 2 3 4 5 6 7 8 9)
+    value = params[:login]
+    type = params[:type].strip.to_i
+    login_type = phone_mail_type(value)
+    send_type = verify_type(login_type, type)
+    verification_code = code.sample(6).join
+
+    sign = Digest::MD5.hexdigest("#{OPENKEY}#{value}")
+    tip_exception(501, "请求不合理") if sign != params[:smscode]
+
+    logger.info "########### 验证码：#{verification_code}"
+    logger.info("########get_verification_code: login_type： #{login_type}， send_type：#{send_type}, ")
+
+    # 记录验证码
+    check_verification_code(verification_code, send_type, value)
+    render_ok
+  end
+
+  # check user's login or email or phone is used
+  # params[:value]  手机号或者邮箱号或者登录名
+  # params[:type] 为事件类型 1：登录名(login) 2：email(邮箱) 3：phone(手机号)
+  def check
+    Register::CheckColumnsForm.new(check_params).validate!
+    render_ok
+  end
+  
+  private
+
+  # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验证手机号是否有效 # 如果有新的继续后面加
+  # login_type 1：手机类型 2：邮箱类型
+  def verify_type login_type, type
+    case type
+    when 1
+      login_type == 1 ? 1 : 8
+    when 2
+      login_type == 1 ? 2 : 3
+    when 3
+      login_type == 1 ? 4 : tip_exception('请填写正确的手机号')
+    when 4
+      login_type == 1 ? tip_exception('请填写正确的邮箱') : 5
+    when 5
+      login_type == 1 ? 9 : tip_exception('请填写正确的手机号')
+    end
+  end
+
+  def generate_login(login)
+    type = phone_mail_type(login.strip)
+
+    if type == 1
+      uid_logger("start register by phone:  type is #{type}")
+      pre = 'p'
+      email = nil
+      phone = login
+    else
+      uid_logger("start register by email:  type is #{type}")
+      pre = 'm'
+      email = login
+      phone = nil
+    end
+    code = generate_identifier User, 8, pre
+
+    { login: pre + code, email: email, phone: phone }
+  end
+
+  def user_params
+    params.require(:user).permit(:login, :email, :phone)
+  end
+
+  def account_params 
+    params.require(:account).permit(:login, :password)
+  end
+
+  def check_params
+    params.permit(:type, :value)
+  end
+
+  def register_params
+    params.permit(:login, :namespace, :password, :code)
+  end
+
+  def remote_register_params
+    params.permit(:username, :email, :password, :platform)
+  end
+  
+  def simple_update_params
+    params.permit(:username, :email, :password, :platform)
+  end
+end
diff --git a/app/controllers/concerns/register_helper.rb b/app/controllers/concerns/register_helper.rb
index 3a23a210..3d5b0fc0 100644
--- a/app/controllers/concerns/register_helper.rb
+++ b/app/controllers/concerns/register_helper.rb
@@ -27,4 +27,32 @@ module RegisterHelper
     result
   end
 
+  def auto_update(user, params={})
+    return if params.blank?
+    result = {message: nil, user: nil}
+    before_login = user.login
+    user.login = params[:username]
+    user.password = params[:password]
+    user.mail = params[:email]
+
+    if user.save! 
+      sync_params = {
+        password: params[:password].to_s,
+        email: params[:email],
+        login_name: params[:username],
+        new_name: params[:username],
+        source_id: 0
+      }
+  
+      interactor = Gitea::User::UpdateInteractor.call(before_login, sync_params)
+      if interactor.success? 
+        result[:user] = user
+      else
+        result[:message] = '用户同步Gitea失败!'
+      end
+    else
+      result[:message] = user.errors.full_messages.join(",")
+      return
+    end
+  end
 end
diff --git a/app/forms/gitea/user/update_form.rb b/app/forms/gitea/user/update_form.rb
index 7912d51f..401282ff 100644
--- a/app/forms/gitea/user/update_form.rb
+++ b/app/forms/gitea/user/update_form.rb
@@ -4,7 +4,7 @@ class Gitea::User::UpdateForm
 
   attr_accessor :username, :email, :admin, :allow_create_organization, :allow_git_hook, :allow_import_local,
                 :full_name, :location, :login_name, :max_repo_creation, :must_change_password, :password, :prohibit_login,
-                :source_id, :website
+                :source_id, :website, :new_name
 
   validates :username, presence: true
   validates :email, presence: true, format: { with: EMAIL_REGEX, multiline: true }
diff --git a/config/routes.rb b/config/routes.rb
index 01ff4fa3..eae7cf8e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -203,6 +203,7 @@ Rails.application.routes.draw do
         post :remote_password
         post :change_password
         post :check
+        post :simple_update
       end
     end
 

From 1358c23ca6e4bd498855dab49f00937df06dcb40 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 24 May 2022 11:43:47 +0800
Subject: [PATCH 043/208] fix: trasfer project member must remove old
 permission

---
 app/services/projects/transfer_service.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 7d1214eb..15726396 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -24,7 +24,8 @@ class Projects::TransferService < ApplicationService
 
   private
   def update_owner
-    project.members.map{|m| m.destroy! if m.user_id == owner.id || (new_owner.is_a?(Organization) && new_owner.is_member?(m.user_id)) }
+    project.members.map{|m| m.destroy! if m.user_id == owner.id || project.member(new_owner.id) || (new_owner.is_a?(Organization) && new_owner.is_member?(m.user_id)) }
+    project.set_owner_permission(new_owner)
     project.update!(user_id: new_owner.id)
   end
 

From aa18fe0ad42f3715019038c425acc7b7060eb1e1 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 24 May 2022 11:43:47 +0800
Subject: [PATCH 044/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E9=A1=B9=E7=9B=AE=E6=97=B6=E6=96=B0=E6=8E=A5=E5=8F=97?=
 =?UTF-8?q?=E8=80=85=E9=9C=80=E8=A6=81=E7=A7=BB=E9=99=A4=E5=8E=9F=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/projects/transfer_service.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 7d1214eb..15726396 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -24,7 +24,8 @@ class Projects::TransferService < ApplicationService
 
   private
   def update_owner
-    project.members.map{|m| m.destroy! if m.user_id == owner.id || (new_owner.is_a?(Organization) && new_owner.is_member?(m.user_id)) }
+    project.members.map{|m| m.destroy! if m.user_id == owner.id || project.member(new_owner.id) || (new_owner.is_a?(Organization) && new_owner.is_member?(m.user_id)) }
+    project.set_owner_permission(new_owner)
     project.update!(user_id: new_owner.id)
   end
 

From 8e8ec821f24cb2a38a1af45d043b415518511d3e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 24 May 2022 17:26:10 +0800
Subject: [PATCH 045/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E9=82=AE=E7=AE=B1=E6=9D=A5=E8=8E=B7=E5=8F=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/concerns/render_helper.rb  | 2 +-
 app/controllers/users_controller.rb        | 6 ++++++
 app/views/users/email_search.json.jbuilder | 1 +
 config/routes.rb                           | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 app/views/users/email_search.json.jbuilder

diff --git a/app/controllers/concerns/render_helper.rb b/app/controllers/concerns/render_helper.rb
index 81e85d1c..4b289cd0 100644
--- a/app/controllers/concerns/render_helper.rb
+++ b/app/controllers/concerns/render_helper.rb
@@ -3,7 +3,7 @@ module RenderHelper
     render json: { status: 0, message: 'success' }.merge(data)
   end
 
-  def render_error(status = -1, message = '')
+  def render_error(message = '', status=-1)
     render json: { status: status, message: message }
   end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 532f29ba..4b2871c7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -301,6 +301,12 @@ class UsersController < ApplicationController
     end
   end
 
+  def email_search 
+    return render_error('请输入email') if params[:email].blank?
+    @user = User.find_by(mail: params[:email])
+    return render_not_found unless @user.present?
+  end
+
   private
   def load_user
     @user = User.find_by_login(params[:id]) || User.find_by(id: params[:id])
diff --git a/app/views/users/email_search.json.jbuilder b/app/views/users/email_search.json.jbuilder
new file mode 100644
index 00000000..2b31e182
--- /dev/null
+++ b/app/views/users/email_search.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'users/user', locals: { user: @user }
diff --git a/config/routes.rb b/config/routes.rb
index eae7cf8e..393dceb3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -237,6 +237,7 @@ Rails.application.routes.draw do
         get :trustie_projects
         get :trustie_related_projects
         post :sync_user_info
+        get :email_search
 
         scope '/ci', module: :ci do
           scope do

From e36c7a4b6aa1cb19f3872f21214fe50388275186 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 24 May 2022 18:09:36 +0800
Subject: [PATCH 046/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E6=90=9C=E7=B4=A2=E4=B8=8D=E9=9C=80=E8=A6=81return=20?=
 =?UTF-8?q?404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb        | 1 -
 app/views/users/email_search.json.jbuilder | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4b2871c7..98a48c6e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -304,7 +304,6 @@ class UsersController < ApplicationController
   def email_search 
     return render_error('请输入email') if params[:email].blank?
     @user = User.find_by(mail: params[:email])
-    return render_not_found unless @user.present?
   end
 
   private
diff --git a/app/views/users/email_search.json.jbuilder b/app/views/users/email_search.json.jbuilder
index 2b31e182..c077c3fa 100644
--- a/app/views/users/email_search.json.jbuilder
+++ b/app/views/users/email_search.json.jbuilder
@@ -1 +1,5 @@
-json.partial! 'users/user', locals: { user: @user }
+if @user.present?
+  json.partial! 'users/user', locals: { user: @user }
+else 
+  json.null 
+end

From 2ea78b4f208e578ccaf5dc8869d63f820ddc8904 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 25 May 2022 11:47:35 +0800
Subject: [PATCH 047/208] =?UTF-8?q?=E5=A2=9E=E5=8A=A0:=20=E5=B7=B2?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=AF=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E3=80=81=E9=82=AE=E7=AE=B1=E3=80=81=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb        |  7 +++++-
 app/forms/register/base_form.rb               | 24 ++++++++++++++-----
 .../register/login_check_columns_form.rb      | 19 +++++++++++++++
 config/routes.rb                              |  1 +
 4 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 app/forms/register/login_check_columns_form.rb

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 1af348ab..531095b4 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,5 +1,5 @@
 class AccountsController < ApplicationController
-  before_action :require_login, only: [:simple_update]
+  before_action :require_login, only: [:login_check, :simple_update]
   include ApplicationHelper
 
   #skip_before_action :check_account, :only => [:logout]
@@ -333,6 +333,11 @@ class AccountsController < ApplicationController
     Register::CheckColumnsForm.new(check_params).validate!
     render_ok
   end
+
+  def login_check 
+    Register::LoginCheckColumnsForm.new(check_params.merge(user: current_user)).validate!
+    render_ok
+  end
   
   private
 
diff --git a/app/forms/register/base_form.rb b/app/forms/register/base_form.rb
index df5abd87..26382b7e 100644
--- a/app/forms/register/base_form.rb
+++ b/app/forms/register/base_form.rb
@@ -10,28 +10,40 @@ module Register
     VerifiCodeError = Class.new(Error)
     
     private
-    def check_login(login)
+    def check_login(login, user=nil)
       login = strip(login)
       raise LoginError, "登录名格式有误" unless login =~ CustomRegexp::LOGIN
 
       login_exist = Owner.exists?(login: login) || ReversedKeyword.check_exists?(login)
-      raise LoginError, '登录名已被使用' if login_exist
+      if user.present? 
+        raise LoginError, '登录名已被使用' if login_exist && login != user&.login
+      else
+        raise LoginError, '登录名已被使用' if login_exist
+      end
     end
 
-    def check_mail(mail)
+    def check_mail(mail, user=nil)
       mail = strip(mail)
       raise EmailError, "邮件格式有误" unless mail =~ CustomRegexp::EMAIL
   
       mail_exist = Owner.exists?(mail: mail)
-      raise EmailError, '邮箱已被使用' if mail_exist
+      if user.present? 
+        raise EmailError, '邮箱已被使用' if mail_exist && mail != user&.mail
+      else
+        raise EmailError, '邮箱已被使用' if mail_exist
+      end
     end
     
-    def check_phone(phone)
+    def check_phone(phone, user=nil)
       phone = strip(phone)
       raise PhoneError, "手机号格式有误" unless phone =~ CustomRegexp::PHONE
 
       phone_exist = Owner.exists?(phone: phone)
-      raise PhoneError, '手机号已被使用' if phone_exist
+      if user.present?
+        raise PhoneError, '手机号已被使用' if phone_exist && phone != user&.phone
+      else
+        raise PhoneError, '手机号已被使用' if phone_exist
+      end 
     end
 
     def check_password(password)
diff --git a/app/forms/register/login_check_columns_form.rb b/app/forms/register/login_check_columns_form.rb
new file mode 100644
index 00000000..0c6a93af
--- /dev/null
+++ b/app/forms/register/login_check_columns_form.rb
@@ -0,0 +1,19 @@
+module Register
+  class LoginCheckColumnsForm < Register::BaseForm
+    attr_accessor :type, :value, :user
+
+    validates :type, presence: true, numericality: true
+    validates :value, presence: true
+    validate :check!
+    
+    def check!
+      # params[:type] 为事件类型 1：登录名(login) 2：email(邮箱) 3：phone(手机号)
+      case strip(type).to_i
+      when 1 then check_login(strip(value), user)
+      when 2 then check_mail(strip(value), user)
+      when 3 then check_phone(strip(value), user)
+      else raise("type值无效")
+      end
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 393dceb3..4d1e3ade 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -203,6 +203,7 @@ Rails.application.routes.draw do
         post :remote_password
         post :change_password
         post :check
+        post :login_check
         post :simple_update
       end
     end

From bd16ca476d8d84e868b778c2a0f0f9a95dbe8a10 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 26 May 2022 15:08:42 +0800
Subject: [PATCH 048/208] =?UTF-8?q?=E5=A2=9E=E5=8A=A0:=20=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E4=BB=93=E5=BA=93api=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/docs/slate/source/includes/_projects.md | 32 ++++++++++++++
 public/docs/api.html                        | 46 +++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/app/docs/slate/source/includes/_projects.md b/app/docs/slate/source/includes/_projects.md
index d4899a71..e133bcdd 100644
--- a/app/docs/slate/source/includes/_projects.md
+++ b/app/docs/slate/source/includes/_projects.md
@@ -849,4 +849,36 @@ await octokit.request('POST /api/:owner/:repo/applied_transfer_projects/cancel.j
     "created_at": "2021-04-26 09:54",
     "time_ago": "1分钟前"
 }
+```
+
+## 退出项目
+供项目成员(开发者、报告者)退出项目用
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/ceshi1/ceshi_repo1/quit.json
+```
+
+```javascript
+await octokit.request('POST /api/:owner/:repo/quit.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/quit.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner     |是| |string |用户登录名  |
+|repo      |是| |string |项目标识identifier  |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
 ```
\ No newline at end of file
diff --git a/public/docs/api.html b/public/docs/api.html
index 45da6440..8ef6924b 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -467,6 +467,9 @@
                   <li>
                     <a href="#4f8579f6bd" class="toc-h2 toc-link" data-title="取消迁移项目">取消迁移项目</a>
                   </li>
+                  <li>
+                    <a href="#88c0b2e25f" class="toc-h2 toc-link" data-title="退出项目">退出项目</a>
+                  </li>
               </ul>
           </li>
           <li>
@@ -6026,6 +6029,49 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
     </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-04-26 09:54"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1分钟前"</span><span class="w">
 </span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='88c0b2e25f'>退出项目</h2>
+<p>供项目成员(开发者、报告者)退出项目用</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/ceshi1/ceshi_repo1/quit.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/:owner/:repo/quit.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
+<p><code>POST /api/:owner/:repo/quit.json</code></p>
+<h3 id='1f9ac54b15-13'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
 </span></code></pre></div><h1 id='repositories'>Repositories</h1><h2 id='0a366f0c25'>仓库详情</h2>
 <p>仓库详情</p>
 

From a6e50d2a250168a0cb981d403a6a4ec65a37ea5b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 27 May 2022 10:48:20 +0800
Subject: [PATCH 049/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20devops=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=BF=80=E6=B4=BB=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ci/projects_controller.rb            |  2 +-
 .../concerns/ci/cloud_account_manageable.rb          | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb
index 69644e7a..06e51537 100644
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -40,9 +40,9 @@ class Ci::ProjectsController < Ci::BaseController
     begin
       ActiveRecord::Base.transaction do
         if @repo
+          @repo.destroy! if @repo&.repo_user_id == 0
           return render_error('该项目已经激活') if @repo.repo_active?
           @repo.activate!(@project)
-          return render_ok
         else
           @repo = Ci::Repo.auto_create!(@ci_user, @project)
           @ci_user.update_column(:user_syncing, false)
diff --git a/app/controllers/concerns/ci/cloud_account_manageable.rb b/app/controllers/concerns/ci/cloud_account_manageable.rb
index 9f0998ed..f2157657 100644
--- a/app/controllers/concerns/ci/cloud_account_manageable.rb
+++ b/app/controllers/concerns/ci/cloud_account_manageable.rb
@@ -160,9 +160,9 @@ module Ci::CloudAccountManageable
     state = SecureRandom.hex(8)
     # redirect_uri eg:
     #  https://localhost:3000/login/oauth/authorize?client_id=94976481-ad0e-4ed4-9247-7eef106007a2&redirect_uri=http%3A%2F%2F121.69.81.11%3A80%2Flogin&response_type=code&state=9cab990b9cfb1805
-    redirect_uri = CGI.escape("#{@cloud_account.drone_url}/login")
-    clientId = client_id(oauth)
-    grant_url = "#{Gitea.gitea_config[:domain]}/login/oauth/authorize?client_id=#{clientId}&redirect_uri=#{redirect_uri}&response_type=code&state=#{state}"
+    # redirect_uri = CGI.escape("#{@cloud_account.drone_url}/login")
+    # clientId = client_id(oauth)
+    grant_url = "#{@cloud_account.drone_url}/login"
     logger.info "[gitea] grant_url: #{grant_url}"
 
     conn = Faraday.new(url: grant_url) do |req|
@@ -179,7 +179,7 @@ module Ci::CloudAccountManageable
 
   def drone_oauth_user!(url, state)
     logger.info "[drone] drone_oauth_user url: #{url}"
-    conn = Faraday.new(url: "#{Gitea.gitea_config[:domain]}#{url}") do |req|
+    conn = Faraday.new(url: url) do |req|
       req.request :url_encoded
       req.adapter Faraday.default_adapter
       req.headers["cookie"] = "_session_=#{SecureRandom.hex(28)}; _oauth_state_=#{state}"
@@ -188,8 +188,8 @@ module Ci::CloudAccountManageable
     response = conn.get
     logger.info "[drone] response headers: #{response.headers}"
 
-    true
-    # response.headers['location'].include?('error') ? false : true
+    # true
+    response.headers['location'].include?('error') ? false : true
   end
 
   private

From 17fb43cea83ca814ed5c66add62de41d7b1fe2ab Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 30 May 2022 10:24:39 +0800
Subject: [PATCH 050/208] =?UTF-8?q?render=5Ferror=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E6=88=90tip=5Fexception?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ci/projects_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb
index 06e51537..c358611e 100644
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -41,7 +41,7 @@ class Ci::ProjectsController < Ci::BaseController
       ActiveRecord::Base.transaction do
         if @repo
           @repo.destroy! if @repo&.repo_user_id == 0
-          return render_error('该项目已经激活') if @repo.repo_active?
+          return tip_exception('该项目已经激活') if @repo.repo_active?
           @repo.activate!(@project)
         else
           @repo = Ci::Repo.auto_create!(@ci_user, @project)
@@ -55,7 +55,7 @@ class Ci::ProjectsController < Ci::BaseController
       end
       render_ok
     rescue Exception => ex
-      render_error(ex.message)
+      tip_exception(ex.message)
     end
   end
 

From 6448a30e0301ed24eea251f1f766d1755f8991eb Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 30 May 2022 10:25:43 +0800
Subject: [PATCH 051/208] =?UTF-8?q?render=5Ferror=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E6=88=90tip=5Fexception?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ci/cloud_accounts_controller.rb           | 34 +++++++++----------
 app/controllers/ci/pipelines_controller.rb    | 24 ++++++-------
 app/controllers/ci/projects_controller.rb     |  6 ++--
 app/controllers/ci/secrets_controller.rb      |  6 ++--
 app/controllers/ci/templates_controller.rb    |  6 ++--
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/controllers/ci/cloud_accounts_controller.rb b/app/controllers/ci/cloud_accounts_controller.rb
index 7d829dbd..d22b2ba4 100644
--- a/app/controllers/ci/cloud_accounts_controller.rb
+++ b/app/controllers/ci/cloud_accounts_controller.rb
@@ -14,12 +14,12 @@ class Ci::CloudAccountsController < Ci::BaseController
 
   def create
     flag, msg = check_bind_cloud_account!
-    return render_error(msg) if flag === true
+    return tip_exception(msg) if flag === true
 
     ActiveRecord::Base.transaction do
       @cloud_account = bind_account!
       if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
+        tip_exception('激活失败, 请检查你的云服务器信息是否正确.')
         raise ActiveRecord::Rollback
       else
         current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
@@ -27,17 +27,17 @@ class Ci::CloudAccountsController < Ci::BaseController
       end
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def activate
-    return render_error('请先认证') unless current_user.ci_certification?
+    return tip_exception('请先认证') unless current_user.ci_certification?
 
     begin
       @cloud_account = Ci::CloudAccount.find params[:id]
       ActiveRecord::Base.transaction do
         if @repo
-          return render_error('该项目已经激活') if @repo.repo_active?
+          return tip_exception('该项目已经激活') if @repo.repo_active?
           @repo.activate!(@project)
         else
           @repo = Ci::Repo.auto_create!(@ci_user, @project)
@@ -50,7 +50,7 @@ class Ci::CloudAccountsController < Ci::BaseController
       end
       render_ok
     rescue Exception => ex
-      render_error(ex.message)
+      tip_exception(ex.message)
     end
   end
 
@@ -59,39 +59,39 @@ class Ci::CloudAccountsController < Ci::BaseController
 
   def bind
     flag, msg = check_bind_cloud_account!
-    return render_error(msg) if flag === true
+    return tip_exception(msg) if flag === true
 
     ActiveRecord::Base.transaction do
       @cloud_account = bind_account!
       if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
+        tip_exception('激活失败, 请检查你的云服务器信息是否正确.')
         raise ActiveRecord::Rollback
       else
         current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
       end
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def trustie_bind
     account = params[:account].to_s
-    return render_error("account不能为空.") if account.blank?
+    return tip_exception("account不能为空.") if account.blank?
 
     flag, msg = check_trustie_bind_cloud_account!
-    return render_error(msg) if flag === true
+    return tip_exception(msg) if flag === true
 
     ActiveRecord::Base.transaction do
       @cloud_account = trustie_bind_account!
       if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
+        tip_exception('激活失败, 请检查你的云服务器信息是否正确.')
         raise ActiveRecord::Rollback
       else
         current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
       end
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def unbind
@@ -107,18 +107,18 @@ class Ci::CloudAccountsController < Ci::BaseController
       render_ok
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def oauth_grant
     password = params[:password].to_s
-    return render_error('你输入的密码不正确.') unless current_user.check_password?(password)
+    return tip_exception('你输入的密码不正确.') unless current_user.check_password?(password)
 
     oauth = current_user.oauths.last
-    return render_error("服务器出小差了.") if oauth.blank?
+    return tip_exception("服务器出小差了.") if oauth.blank?
 
     result = gitea_oauth_grant!(password, oauth)
-    return render_error('授权失败.') unless result === true
+    return tip_exception('授权失败.') unless result === true
     current_user.set_drone_step!(User::DEVOPS_CERTIFICATION)
   end
 
diff --git a/app/controllers/ci/pipelines_controller.rb b/app/controllers/ci/pipelines_controller.rb
index ea8b25f7..28805965 100644
--- a/app/controllers/ci/pipelines_controller.rb
+++ b/app/controllers/ci/pipelines_controller.rb
@@ -30,7 +30,7 @@ class Ci::PipelinesController < Ci::BaseController
     ActiveRecord::Base.transaction do
       size = Ci::Pipeline.where('branch=? and identifier=? and owner=?', params[:branch], params[:repo], params[:owner]).size
       if size > 0
-        render_error("#{params[:branch]}分支已经存在流水线！")
+        tip_exception("#{params[:branch]}分支已经存在流水线！")
         return
       end
       pipeline = Ci::Pipeline.new(pipeline_name: params[:pipeline_name], file_name: params[:file_name],owner: params[:owner],
@@ -53,7 +53,7 @@ class Ci::PipelinesController < Ci::BaseController
       render_ok({id: pipeline.id})
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   # 在代码库创建文件
@@ -118,7 +118,7 @@ class Ci::PipelinesController < Ci::BaseController
     end
     render_ok
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def destroy
@@ -132,7 +132,7 @@ class Ci::PipelinesController < Ci::BaseController
     end
     render_ok
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def content
@@ -182,7 +182,7 @@ class Ci::PipelinesController < Ci::BaseController
       render_ok
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def update_stage
@@ -192,7 +192,7 @@ class Ci::PipelinesController < Ci::BaseController
     end
     render_ok
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def delete_stage
@@ -205,7 +205,7 @@ class Ci::PipelinesController < Ci::BaseController
       render_ok
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def update_stage_index(pipeline_id, show_index, diff)
@@ -229,7 +229,7 @@ class Ci::PipelinesController < Ci::BaseController
       unless steps.empty?
         steps.each do |step|
           unless step[:template_id]
-            render_error('请选择模板！')
+            tip_exception('请选择模板！')
             return
           end
           if !step[:id]
@@ -246,7 +246,7 @@ class Ci::PipelinesController < Ci::BaseController
       render_ok
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def create_stage_step
@@ -262,7 +262,7 @@ class Ci::PipelinesController < Ci::BaseController
       render_ok
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def update_stage_step
@@ -279,7 +279,7 @@ class Ci::PipelinesController < Ci::BaseController
       render_ok
     end
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def delete_stage_step
@@ -289,6 +289,6 @@ class Ci::PipelinesController < Ci::BaseController
     end
     render_ok
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 end
diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb
index c358611e..53f11fb2 100644
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -30,12 +30,12 @@ class Ci::ProjectsController < Ci::BaseController
       @file = interactor.result
       render_result(1, "更新成功")
     else
-      render_error(interactor.error)
+      tip_exception(interactor.error)
     end
   end
 
   def activate
-    return render_error('你还未认证') unless current_user.ci_certification?
+    return tip_exception('你还未认证') unless current_user.ci_certification?
 
     begin
       ActiveRecord::Base.transaction do
@@ -60,7 +60,7 @@ class Ci::ProjectsController < Ci::BaseController
   end
 
   def deactivate
-    return render_error('该项目已经取消激活') if !@repo.repo_active?
+    return tip_exception('该项目已经取消激活') if !@repo.repo_active?
 
     @project.update_column(:open_devops, false)
     @repo.deactivate_repos!
diff --git a/app/controllers/ci/secrets_controller.rb b/app/controllers/ci/secrets_controller.rb
index 324f0bb5..3057824e 100644
--- a/app/controllers/ci/secrets_controller.rb
+++ b/app/controllers/ci/secrets_controller.rb
@@ -20,14 +20,14 @@ class Ci::SecretsController < Ci::BaseController
       if result["id"]
         render_ok
       else
-        render_error(result["message"])
+        tip_exception(result["message"])
       end
     else
       result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).create_secret
       if result["id"]
         render_ok
       else
-        render_error(result["message"])
+        tip_exception(result["message"])
       end
     end
   end
@@ -39,7 +39,7 @@ class Ci::SecretsController < Ci::BaseController
       Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], {name: name}).delete_secret
       render_ok
     else
-      render_error("参数名不能为空")
+      tip_exception("参数名不能为空")
     end
   rescue Exception => ex
     render_ok
diff --git a/app/controllers/ci/templates_controller.rb b/app/controllers/ci/templates_controller.rb
index cb49590d..22c20952 100644
--- a/app/controllers/ci/templates_controller.rb
+++ b/app/controllers/ci/templates_controller.rb
@@ -50,7 +50,7 @@ class Ci::TemplatesController < Ci::BaseController
     end
     render_ok
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def update
@@ -63,7 +63,7 @@ class Ci::TemplatesController < Ci::BaseController
     )
     render_ok
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   def destroy
@@ -73,7 +73,7 @@ class Ci::TemplatesController < Ci::BaseController
     end
     render_ok
   rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
   end
 
   #======流水线模板查询=====#

From d6fd85f536f2b328faae42572da3337a4aa4417f Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 30 May 2022 11:18:24 +0800
Subject: [PATCH 052/208] =?UTF-8?q?Repository.url=E9=87=8D=E5=86=99?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E9=A1=B9=E7=9B=AE=E6=97=B6=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ci/pipelines_controller.rb | 1 +
 app/models/repository.rb                   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/controllers/ci/pipelines_controller.rb b/app/controllers/ci/pipelines_controller.rb
index 28805965..d6eee138 100644
--- a/app/controllers/ci/pipelines_controller.rb
+++ b/app/controllers/ci/pipelines_controller.rb
@@ -81,6 +81,7 @@ class Ci::PipelinesController < Ci::BaseController
         repo_branch: pipeline.branch,
         repo_config: pipeline.file_name
       }
+      Rails.logger.info("########create_params===#{create_params.to_json}")
       repo = Ci::Repo.create_repo(create_params)
       repo
     end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index a012b449..12cc2fa3 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -48,6 +48,10 @@ class Repository < ApplicationRecord
     self.identifier.parameterize
   end
 
+  def url
+    self['url'].blank? ? "#{Rails.application.config_for(:configuration)['platform_url']}/#{self.owner&.login}/#{self.identifier}.git" : self['url']
+  end
+
   # with repository is mirror
   def set_mirror!
     self.build_mirror(status: Mirror.statuses[:waiting]).save

From 169dc84e22f933e9d0b5d1e40fecc4a0ac8dacd4 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 30 May 2022 14:50:12 +0800
Subject: [PATCH 053/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E4=B8=8B=E9=A1=B9=E7=9B=AE=E9=9C=80=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E5=85=AC=E6=9C=89=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/projects/index.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/organizations/projects/index.json.jbuilder b/app/views/organizations/projects/index.json.jbuilder
index a663b0c1..5a4615fc 100644
--- a/app/views/organizations/projects/index.json.jbuilder
+++ b/app/views/organizations/projects/index.json.jbuilder
@@ -1,6 +1,6 @@
 json.total_count @projects.total_count
 json.projects @projects.each do |project|
-  json.(project, :id, :name, :identifier, :description, :forked_count, :praises_count, :forked_from_project_id)
+  json.(project, :id, :name, :identifier, :description, :forked_count, :praises_count, :forked_from_project_id, :is_public)
   json.mirror_url project.repository&.mirror_url
   json.type project.numerical_for_project_type
   json.praised project.praised_by?(current_user)

From 9427db3e5a9c1856e8519506fada75c7dc68248b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 31 May 2022 16:34:08 +0800
Subject: [PATCH 054/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/notices_controller.rb     | 14 ++++++-
 app/jobs/send_template_message_job.rb     | 11 +++++
 app/models/message_template/custom_tip.rb | 51 +++++++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 app/models/message_template/custom_tip.rb

diff --git a/app/controllers/notices_controller.rb b/app/controllers/notices_controller.rb
index bf7eb21b..7b67412e 100644
--- a/app/controllers/notices_controller.rb
+++ b/app/controllers/notices_controller.rb
@@ -1,7 +1,7 @@
 class NoticesController < ApplicationController
 
   def create
-    tip_exception("参数有误") if params["source"].blank?
+    return tip_exception("参数有误") if params["source"].blank?
     user_id = params[:user_id]
 
     if params["source"] == "CompetitionBegin"
@@ -13,9 +13,21 @@ class NoticesController < ApplicationController
     elsif params["source"] == "CompetitionReview"
       competition_id = params[:competition_id]
       SendTemplateMessageJob.perform_later('CompetitionReview', user_id, competition_id)
+    elsif params["source"] == "CustomTip"
+      users_id = params[:users_id]
+      props = params[:props].to_unsafe_hash
+      return tip_exception("参数有误") unless props.is_a?(Hash) && users_id.is_a?(Array)
+      template_id = params[:template_id]
+      SendTemplateMessageJob.perform_later('CustomTip', users_id, template_id, props)
     else
       tip_exception("#{params["source"]}未配置")
     end
     render_ok
   end
+
+
+  private 
+  def params_props
+    params.require(:notice).permit(:props)
+  end
 end
diff --git a/app/jobs/send_template_message_job.rb b/app/jobs/send_template_message_job.rb
index 9cc819a1..bec3f7b0 100644
--- a/app/jobs/send_template_message_job.rb
+++ b/app/jobs/send_template_message_job.rb
@@ -4,6 +4,17 @@ class SendTemplateMessageJob < ApplicationJob
   def perform(source, *args)
     Rails.logger.info "SendTemplateMessageJob [args] #{args}"
     case source 
+    when 'CustomTip'
+      receivers_id, template_id, props = args[0], args[1], args[2]
+      template = MessageTemplate.find_by_id(template_id)
+      return unless template.present?
+      receivers = User.where(id: receivers_id)
+      receivers_string, content, notification_url = MessageTemplate::CustomTip.get_message_content(receivers, template, props)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {receivers_id: receivers_id, template_id: template_id, props: props})
+      receivers.find_each do |receiver|
+        receivers_email_string, email_title, email_content = MessageTemplate::CustomTip.get_email_message_content(receiver, template, props)
+        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
+      end
     when 'FollowTip'
       watcher_id = args[0]
       watcher = Watcher.find_by_id(watcher_id)
diff --git a/app/models/message_template/custom_tip.rb b/app/models/message_template/custom_tip.rb
new file mode 100644
index 00000000..6c5a3345
--- /dev/null
+++ b/app/models/message_template/custom_tip.rb
@@ -0,0 +1,51 @@
+# == Schema Information
+#
+# Table name: message_templates
+#
+#  id               :integer          not null, primary key
+#  type             :string(255)
+#  sys_notice       :text(65535)
+#  email            :text(65535)
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  notification_url :string(255)
+#  email_title      :string(255)
+#
+
+# 统一模板（
+
+class MessageTemplate::CustomTip < MessageTemplate 
+  
+  # MessageTemplate::CustomTip.get_message_content(User.where(login: 'yystopf'), "hahah")
+  def self.get_message_content(receivers, template, props={})
+   return '', '', '' if receivers.blank? || template.blank?
+   content = template.sys_notice
+   notification_url = template.notification_url
+   props.each do |k, v|
+    content.gsub!("{#{k}}", v)
+    notification_url.gsub!("{#{k}}", v)
+   end
+   return receivers_string(receivers), content, notification_url
+ rescue => e
+   Rails.logger.info("MessageTemplate::CustomTip.get_message_content [ERROR] #{e}")
+   return '', '', ''
+ end
+
+ def self.get_email_message_content(receiver, template, props={})
+    return '', '', '' if receiver.blank? || template.blank?
+    title = template.email_title
+    content = template.email
+    props.each do |k, v|
+      title.gsub!("{#{k}}", v)
+      content.gsub!("{#{k}}", v)
+    end
+    content.gsub!('{receiver}', receiver&.real_name)
+    title.gsub!('{platform}', PLATFORM)
+    content.gsub!('{platform}', PLATFORM)
+
+    return receiver&.mail, title, content
+ rescue => e
+   Rails.logger.info("MessageTemplate::CustomTip.get_email_message_content [ERROR] #{e}")
+   return '', '', ''
+ end
+end
\ No newline at end of file

From 9a17c4865f4188cd5d266caf3ea2d08d4e185532 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Wed, 1 Jun 2022 09:27:18 +0800
Subject: [PATCH 055/208] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=92=8C=E6=8F=8F=E8=BF=B0=E5=A2=9E=E5=8A=A0=E6=95=8F=E6=84=9F?=
 =?UTF-8?q?=E8=AF=8D=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/project.rb | 839 +++++++++++++++++++++---------------------
 1 file changed, 423 insertions(+), 416 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 2e47c000..9c77685f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,416 +1,423 @@
-
-# == Schema Information
-#
-# Table name: projects
-#
-#  id                     :integer          not null, primary key
-#  name                   :string(255)      default(""), not null
-#  description            :text(4294967295)
-#  homepage               :string(255)      default("")
-#  is_public              :boolean          default("1"), not null
-#  parent_id              :integer
-#  created_on             :datetime
-#  updated_on             :datetime
-#  identifier             :string(255)
-#  status                 :integer          default("1"), not null
-#  lft                    :integer
-#  rgt                    :integer
-#  inherit_members        :boolean          default("0"), not null
-#  project_type           :integer          default("0")
-#  hidden_repo            :boolean          default("0"), not null
-#  attachmenttype         :integer          default("1")
-#  user_id                :integer
-#  dts_test               :integer          default("0")
-#  enterprise_name        :string(255)
-#  organization_id        :integer
-#  project_new_type       :integer
-#  gpid                   :integer
-#  forked_from_project_id :integer
-#  forked_count           :integer          default("0")
-#  publish_resource       :integer          default("0")
-#  visits                 :integer          default("0")
-#  hot                    :integer          default("0")
-#  invite_code            :string(255)
-#  qrcode                 :string(255)
-#  qrcode_expiretime      :integer          default("0")
-#  script                 :text(65535)
-#  training_status        :integer          default("0")
-#  rep_identifier         :string(255)
-#  project_category_id    :integer
-#  project_language_id    :integer
-#  license_id             :integer
-#  ignore_id              :integer
-#  praises_count          :integer          default("0")
-#  watchers_count         :integer          default("0")
-#  issues_count           :integer          default("0")
-#  pull_requests_count    :integer          default("0")
-#  language               :string(255)
-#  versions_count         :integer          default("0")
-#  issue_tags_count       :integer          default("0")
-#  closed_issues_count    :integer          default("0")
-#  open_devops            :boolean          default("0")
-#  gitea_webhook_id       :integer
-#  open_devops_count      :integer          default("0")
-#  recommend              :boolean          default("0")
-#  platform               :integer          default("0")
-#  default_branch         :string(255)      default("master")
-#  website                :string(255)
-#  lesson_url             :string(255)
-#  is_pinned              :boolean          default("0")
-#  recommend_index        :integer          default("0")
-#
-# Indexes
-#
-#  index_projects_on_forked_from_project_id  (forked_from_project_id)
-#  index_projects_on_identifier              (identifier)
-#  index_projects_on_invite_code             (invite_code)
-#  index_projects_on_is_public               (is_public)
-#  index_projects_on_lft                     (lft)
-#  index_projects_on_license_id              (license_id)
-#  index_projects_on_name                    (name)
-#  index_projects_on_platform                (platform)
-#  index_projects_on_project_category_id     (project_category_id)
-#  index_projects_on_project_language_id     (project_language_id)
-#  index_projects_on_project_type            (project_type)
-#  index_projects_on_recommend               (recommend)
-#  index_projects_on_rgt                     (rgt)
-#  index_projects_on_status                  (status)
-#  index_projects_on_updated_on              (updated_on)
-#
-
-
-
-
-class Project < ApplicationRecord
-  include Matchable
-  include Publicable
-  include Watchable
-  include ProjectOperable
-  include Dcodes
-
-  # common:开源托管项目
-  # mirror:普通镜像项目，没有定时同步功能
-  # sync_mirror:同步镜像项目，有系统定时同步功能，且用户可手动同步操作
-  #
-  enum project_type: { sync_mirror: 2, mirror: 1, common: 0 }
-
-  # forge: trustie平台项目， educoder: educoder平台项目， 默认为forge平台
-  enum platform: { forge: 0, educoder: 1 }
-
-  belongs_to :ignore, optional: true
-  belongs_to :license, optional: true
-  belongs_to :owner, class_name: 'Owner', foreign_key: :user_id, optional: true
-  belongs_to :organization_extension, foreign_key: :user_id, primary_key: :organization_id, optional: true, counter_cache: :num_projects
-  belongs_to :project_category, optional: true , :counter_cache => true
-  belongs_to :project_language, optional: true , :counter_cache => true
-  belongs_to :forked_from_project, class_name: 'Project', optional: true, foreign_key: :forked_from_project_id
-  has_many :project_trends, dependent: :destroy
-  has_many :watchers, as: :watchable, dependent: :destroy
-  has_many :fork_users, dependent: :destroy
-  has_many :forked_users, class_name: 'ForkUser', foreign_key: :fork_project_id, dependent: :destroy
-  has_many :forked_projects, class_name: 'Project', foreign_key: :forked_from_project_id
-  has_one :project_educoder, dependent: :destroy
-
-  has_one :project_score, dependent: :destroy
-  has_one :repository, dependent: :destroy
-  has_many :pull_requests, dependent: :destroy
-  has_many :issue_tags, -> { order("issue_tags.created_at DESC") }, dependent: :destroy
-  has_many :issues, dependent: :destroy
-  # has_many :user_grades, dependent: :destroy
-  has_many :attachments, as: :container, dependent: :destroy
-  has_one :project_score, dependent: :destroy
-  has_many :versions, -> { order("versions.created_on DESC, versions.name DESC") }, dependent: :destroy
-  has_many :praise_treads, as: :praise_tread_object, dependent: :destroy
-  has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
-  has_one :project_detail, dependent: :destroy
-  has_many :project_units, dependent: :destroy
-  has_one :applied_transfer_project,-> { order created_at: :desc }, dependent: :destroy
-  has_many :pinned_projects, dependent: :destroy 
-  has_many :has_pinned_users, through: :pinned_projects, source: :user
-  has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
-  after_create :incre_user_statistic, :incre_platform_statistic
-  after_save :check_project_members
-  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data
-  before_destroy :decre_project_common, :decre_forked_from_project_count
-  after_destroy :decre_user_statistic, :decre_platform_statistic
-  scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :description, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
-  scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)}
-  scope :recommend,           -> { visible.project_statics_select.where(recommend: true) }
-  scope :pinned, -> {where(is_pinned: true)}
-
-  delegate :content, to: :project_detail, allow_nil: true
-  delegate :name, to: :license, prefix: true, allow_nil: true
-
-  def self.all_visible(user_id=nil)
-    user_projects_sql = Project.joins(:owner).where(users: {type: 'User'}).to_sql
-    org_public_projects_sql = Project.joins(:owner).merge(Organization.joins(:organization_extension).where(organization_extensions: {visibility: 'common'})).to_sql
-    if user_id.present?
-      org_limit_projects_sql = Project.joins(:owner).merge(Organization.joins(:organization_extension).where(organization_extensions: {visibility: 'limited'})).to_sql
-      org_privacy_projects_sql = Project.joins(:owner).merge(Organization.joins(:organization_extension, :organization_users).where(organization_extensions: {visibility: 'privacy'}, organization_users: {user_id: user_id})).to_sql
-      return Project.from("( #{ user_projects_sql } UNION #{ org_public_projects_sql } UNION #{ org_limit_projects_sql } UNION #{org_privacy_projects_sql} ) AS projects").visible
-    else
-      return Project.from("( #{ user_projects_sql } UNION #{ org_public_projects_sql } ) AS projects").visible
-    end
-  end
-
-  def reset_cache_data 
-    CacheAsyncResetJob.set(wait: 5.seconds).perform_later("project_common_service", self.id)
-    if changes[:user_id].present?
-      CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: -1}, changes[:user_id].first)
-      CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1}, changes[:user_id].last)
-    end
-    if changes[:project_language_id].present?
-      first_language = ProjectLanguage.find_by_id(changes[:project_language_id].first)
-      last_language = ProjectLanguage.find_by_id(changes[:project_language_id].last)
-      CacheAsyncSetJob.perform_later("user_statistic_service", {project_language_count_key: first_language&.name, project_language_count: -1}, self.user_id)
-      CacheAsyncSetJob.perform_later("user_statistic_service", {project_language_count_key: last_language&.name, project_language_count: 1}, self.user_id)
-      CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: first_language&.name, project_language_count: -1})
-      CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: last_language&.name, project_language_count: 1})
-    end
-    if changes[:is_public].present?
-      if changes[:is_public][0] && !changes[:is_public][1]
-        CacheAsyncClearJob.perform_later('project_rank_service', self.id)
-      end
-      if !changes[:is_public][0] && changes[:is_public][1]
-        $redis_cache.srem("v2-project-rank-deleted", self.id)
-      end
-    end
-  end
-
-  def decre_project_common
-    CacheAsyncClearJob.perform_later('project_common_service', self.id)
-  end
-
-  def decre_forked_from_project_count
-    forked_project = self.forked_from_project
-    if forked_project.present?
-      forked_project.decrement(:forked_count, 1)
-      forked_project.save
-    end
-  end
-
-  def incre_user_statistic 
-    CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1, project_language_count_key: self.project_language&.name, project_language_count: 1}, self.user_id)
-  end
-
-  def decre_user_statistic
-    CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: -1, project_language_count_key: self.project_language&.name, project_language_count: -1}, self.user_id)
-  end
-
-  def incre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_count: 1, project_language_count_key: self.project_language&.name, project_language_count: 1})
-  end
-
-  def decre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_count: -1, project_language_count_key: self.project_language&.name, project_language_count: -1})
-  end
-
-  def is_full_public
-    owner = self.owner
-    if owner.is_a?(Organization)
-      return self.is_public && owner&.visibility == "common"
-    else
-      return self.is_public
-    end
-  end
-
-  def reset_unmember_followed
-    if changes[:is_public].present? && changes[:is_public] == [true, false]
-      self.watchers.where.not(user_id: self.all_collaborators).destroy_all
-    end
-  end
-
-  def set_invite_code
-    if self.invite_code.nil?
-      self.invite_code= self.generate_dcode('invite_code', 6)
-    end
-  end
-
-  def set_recommend_and_is_pinned
-    self.recommend = self.recommend_index.zero? ? false : true
-    # 私有项目不允许设置精选和推荐
-    unless self.is_public
-      self.recommend = false
-      self.recommend_index = 0
-      self.is_pinned = false 
-    end
-  end
-
-  def self.search_project(search)
-    ransack(name_or_identifier_cont: search)
-  end
-  # 创建者
-  def creator
-    User.find(user_id).full_name
-  end
-
-  def members_user_infos
-    members.joins(:roles).where("roles.name in ('Manager', 'Developer', 'Reporter')").joins("left join users on members.user_id = users.id ").includes(:user).where("users.type = ?", "User")
-    # members.joins("left join users on members.user_id = users.id").select("users.id", "users.login","users.firstname","users.lastname")
-    #   .pluck("users.id", "users.login","users.lastname", "users.firstname")
-  end
-
-  def to_param
-    self.identifier.parameterize
-  end
-
-  def get_issues_count(status_id)
-    if status_id.present?
-      self&.issues.issue_issue.select(:id, :status_id).where(status_id: status_id)&.pluck(:id).size
-    else
-      self&.issues.issue_issue.select(:id)&.pluck(:id).size
-    end
-  end
-
-  def get_pull_requests_count(status_id)
-    if status_id.present?
-      self&.pull_requests.select(:id, :status).where(status: status_id)&.pluck(:id).size
-    else
-      self&.pull_requests.select(:id)&.pluck(:id).size
-    end
-  end
-
-  #创建项目管理员
-  def check_project_members
-    return if owner.is_a?(Organization)
-    unless members.present? && members.exists?(user_id: self.user_id)
-      member_params = {
-        user_id: self.user_id,
-        project_id: self.id
-      }
-      user_member = Member.new(member_params)
-      if user_member.save
-        role_id = Role.select(:id,:position).where(position: 3)&.first&.id
-        MemberRole.create!(member_id: user_member.id ,role_id: role_id)
-      end
-    end
-  end
-
-
-  def self.init_bluck_repository
-    Project.includes(:repository).find_each do |project|
-      puts project.id
-      next if project.owner.blank?
-      if project.repository.blank?
-        puts  "########### start create repositoy #############"
-        Repository.create!(project_id: project.id, identifier: Project.generate_identifier, user_id: project&.owner&.id)
-      end
-    end
-  end
-
-  def self.generate_identifier
-    str_arr = (("a".."z").to_a + ("A".."Z").to_a)
-
-    str = str_arr.shuffle[0..8].join
-    while Repository.exists?(identifier: str)
-      str = str_arr.shuffle[0..8].join
-    end
-    str
-  end
-
-  def self.list_user_projects(user_id)
-    projects = Project.is_private.select(:id,:user_id)
-    user_not_show_1 = projects.where("user_id != ?",user_id).pluck(:id).uniq
-
-    user_show_2 = projects.joins(:members).where("members.user_id = ?", user_id).pluck(:id).uniq
-    Project.where.not(id: (user_not_show_1 - user_show_2).uniq)
-  end
-
-  def members_count
-    members.select(:id).size
-  end
-
-
-  def can_visited?
-    is_public? || User.current.admin? || member?(User.current)
-  end
-
-  def releases_size(current_user_id, type)
-    if current_user_id == self.user_id && type.to_s == "all"
-      self.repository.version_releases_count
-    else
-      self.repository.version_releases.releases_size
-    end
-  end
-
-  def contributor_users
-    self.pull_requests.select(:user_id).pluck(:user_id).uniq.size
-  end
-
-  def open_issues_count
-    issues_count - closed_issues_count
-  end
-
-  def numerical_for_project_type
-    self.class.name.constantize.project_types["#{self.project_type}"]
-  end
-
-  def watched_by? user
-    watchers.pluck(:user_id).include? user&.id
-  end
-
-  def praised_by? user
-    praise_treads.pluck(:user_id).include? user&.id
-  end
-
-  def get_premission user
-    return "Owner" if owner?(user)
-    return "Manager" if manager?(user)
-    return "Developer" if develper?(user)
-    return "Reporter" if reporter?(user)
-
-    return ""
-  end
-
-  def fork_project
-    Project.find_by(id: self.forked_from_project_id)
-  end
-
-  def self.members_projects(member_user_id)
-    joins(:members).where(members: { user_id: member_user_id})
-  end
-
-  def self.find_with_namespace(namespace_path, identifier)
-    logger.info "########namespace_path: #{namespace_path} ########identifier: #{identifier} "
-
-    user = Owner.find_by_login namespace_path
-    user = Owner.new(login: namespace_path) if user.nil?
-    project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
-    return nil if project.blank?
-
-    [project, user]
-  end
-
-  def ci_reactivate?
-    open_devops_count > 0
-  end
-
-  def ci_reactivate!(ci_repo)
-    ci_repo.update_column(:repo_active, 1)
-    update_column(:open_devops, true)
-    increment!(:open_devops_count)
-  end
-
-  def self.sync_educoder_shixun(url, private_token, page, per_page)
-    SyncEducoderShixunJob.perform_later(url, private_token, page, per_page)
-  end
-
-  def self.update_common_projects_count!
-    ps = ProjectStatistic.first
-    ps.increment!(:common_projects_count) unless ps.blank?
-  end
-
-  def self.update_mirror_projects_count!
-    ps = ProjectStatistic.first
-    ps.increment!(:mirror_projects_count) unless ps.blank?
-  end
-
-  def set_updated_on(time)
-    return if time.blank?
-    update_column(:updated_on, time)
-  end
-
-  def is_transfering
-    applied_transfer_project&.common? ? true : false
-  end
-end
+
+# == Schema Information
+#
+# Table name: projects
+#
+#  id                     :integer          not null, primary key
+#  name                   :string(255)      default(""), not null
+#  description            :text(4294967295)
+#  homepage               :string(255)      default("")
+#  is_public              :boolean          default("1"), not null
+#  parent_id              :integer
+#  created_on             :datetime
+#  updated_on             :datetime
+#  identifier             :string(255)
+#  status                 :integer          default("1"), not null
+#  lft                    :integer
+#  rgt                    :integer
+#  inherit_members        :boolean          default("0"), not null
+#  project_type           :integer          default("0")
+#  hidden_repo            :boolean          default("0"), not null
+#  attachmenttype         :integer          default("1")
+#  user_id                :integer
+#  dts_test               :integer          default("0")
+#  enterprise_name        :string(255)
+#  organization_id        :integer
+#  project_new_type       :integer
+#  gpid                   :integer
+#  forked_from_project_id :integer
+#  forked_count           :integer          default("0")
+#  publish_resource       :integer          default("0")
+#  visits                 :integer          default("0")
+#  hot                    :integer          default("0")
+#  invite_code            :string(255)
+#  qrcode                 :string(255)
+#  qrcode_expiretime      :integer          default("0")
+#  script                 :text(65535)
+#  training_status        :integer          default("0")
+#  rep_identifier         :string(255)
+#  project_category_id    :integer
+#  project_language_id    :integer
+#  license_id             :integer
+#  ignore_id              :integer
+#  praises_count          :integer          default("0")
+#  watchers_count         :integer          default("0")
+#  issues_count           :integer          default("0")
+#  pull_requests_count    :integer          default("0")
+#  language               :string(255)
+#  versions_count         :integer          default("0")
+#  issue_tags_count       :integer          default("0")
+#  closed_issues_count    :integer          default("0")
+#  open_devops            :boolean          default("0")
+#  gitea_webhook_id       :integer
+#  open_devops_count      :integer          default("0")
+#  recommend              :boolean          default("0")
+#  platform               :integer          default("0")
+#  default_branch         :string(255)      default("master")
+#  website                :string(255)
+#  lesson_url             :string(255)
+#  is_pinned              :boolean          default("0")
+#  recommend_index        :integer          default("0")
+#
+# Indexes
+#
+#  index_projects_on_forked_from_project_id  (forked_from_project_id)
+#  index_projects_on_identifier              (identifier)
+#  index_projects_on_invite_code             (invite_code)
+#  index_projects_on_is_public               (is_public)
+#  index_projects_on_lft                     (lft)
+#  index_projects_on_license_id              (license_id)
+#  index_projects_on_name                    (name)
+#  index_projects_on_platform                (platform)
+#  index_projects_on_project_category_id     (project_category_id)
+#  index_projects_on_project_language_id     (project_language_id)
+#  index_projects_on_project_type            (project_type)
+#  index_projects_on_recommend               (recommend)
+#  index_projects_on_rgt                     (rgt)
+#  index_projects_on_status                  (status)
+#  index_projects_on_updated_on              (updated_on)
+#
+
+
+
+
+class Project < ApplicationRecord
+  include Matchable
+  include Publicable
+  include Watchable
+  include ProjectOperable
+  include Dcodes
+
+  # common:开源托管项目
+  # mirror:普通镜像项目，没有定时同步功能
+  # sync_mirror:同步镜像项目，有系统定时同步功能，且用户可手动同步操作
+  #
+  enum project_type: { sync_mirror: 2, mirror: 1, common: 0 }
+
+  # forge: trustie平台项目， educoder: educoder平台项目， 默认为forge平台
+  enum platform: { forge: 0, educoder: 1 }
+
+  belongs_to :ignore, optional: true
+  belongs_to :license, optional: true
+  belongs_to :owner, class_name: 'Owner', foreign_key: :user_id, optional: true
+  belongs_to :organization_extension, foreign_key: :user_id, primary_key: :organization_id, optional: true, counter_cache: :num_projects
+  belongs_to :project_category, optional: true , :counter_cache => true
+  belongs_to :project_language, optional: true , :counter_cache => true
+  belongs_to :forked_from_project, class_name: 'Project', optional: true, foreign_key: :forked_from_project_id
+  has_many :project_trends, dependent: :destroy
+  has_many :watchers, as: :watchable, dependent: :destroy
+  has_many :fork_users, dependent: :destroy
+  has_many :forked_users, class_name: 'ForkUser', foreign_key: :fork_project_id, dependent: :destroy
+  has_many :forked_projects, class_name: 'Project', foreign_key: :forked_from_project_id
+  has_one :project_educoder, dependent: :destroy
+
+  has_one :project_score, dependent: :destroy
+  has_one :repository, dependent: :destroy
+  has_many :pull_requests, dependent: :destroy
+  has_many :issue_tags, -> { order("issue_tags.created_at DESC") }, dependent: :destroy
+  has_many :issues, dependent: :destroy
+  # has_many :user_grades, dependent: :destroy
+  has_many :attachments, as: :container, dependent: :destroy
+  has_one :project_score, dependent: :destroy
+  has_many :versions, -> { order("versions.created_on DESC, versions.name DESC") }, dependent: :destroy
+  has_many :praise_treads, as: :praise_tread_object, dependent: :destroy
+  has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
+  has_one :project_detail, dependent: :destroy
+  has_many :project_units, dependent: :destroy
+  has_one :applied_transfer_project,-> { order created_at: :desc }, dependent: :destroy
+  has_many :pinned_projects, dependent: :destroy 
+  has_many :has_pinned_users, through: :pinned_projects, source: :user
+  has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
+  after_create :incre_user_statistic, :incre_platform_statistic
+  after_save :check_project_members
+  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data
+  before_destroy :decre_project_common, :decre_forked_from_project_count
+  after_destroy :decre_user_statistic, :decre_platform_statistic
+  scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :description, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
+  scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)}
+  scope :recommend,           -> { visible.project_statics_select.where(recommend: true) }
+  scope :pinned, -> {where(is_pinned: true)}
+
+  delegate :content, to: :project_detail, allow_nil: true
+  delegate :name, to: :license, prefix: true, allow_nil: true
+
+  validate :validate_sensitive_string
+
+  def self.all_visible(user_id=nil)
+    user_projects_sql = Project.joins(:owner).where(users: {type: 'User'}).to_sql
+    org_public_projects_sql = Project.joins(:owner).merge(Organization.joins(:organization_extension).where(organization_extensions: {visibility: 'common'})).to_sql
+    if user_id.present?
+      org_limit_projects_sql = Project.joins(:owner).merge(Organization.joins(:organization_extension).where(organization_extensions: {visibility: 'limited'})).to_sql
+      org_privacy_projects_sql = Project.joins(:owner).merge(Organization.joins(:organization_extension, :organization_users).where(organization_extensions: {visibility: 'privacy'}, organization_users: {user_id: user_id})).to_sql
+      return Project.from("( #{ user_projects_sql } UNION #{ org_public_projects_sql } UNION #{ org_limit_projects_sql } UNION #{org_privacy_projects_sql} ) AS projects").visible
+    else
+      return Project.from("( #{ user_projects_sql } UNION #{ org_public_projects_sql } ) AS projects").visible
+    end
+  end
+
+  def reset_cache_data 
+    CacheAsyncResetJob.set(wait: 5.seconds).perform_later("project_common_service", self.id)
+    if changes[:user_id].present?
+      CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: -1}, changes[:user_id].first)
+      CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1}, changes[:user_id].last)
+    end
+    if changes[:project_language_id].present?
+      first_language = ProjectLanguage.find_by_id(changes[:project_language_id].first)
+      last_language = ProjectLanguage.find_by_id(changes[:project_language_id].last)
+      CacheAsyncSetJob.perform_later("user_statistic_service", {project_language_count_key: first_language&.name, project_language_count: -1}, self.user_id)
+      CacheAsyncSetJob.perform_later("user_statistic_service", {project_language_count_key: last_language&.name, project_language_count: 1}, self.user_id)
+      CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: first_language&.name, project_language_count: -1})
+      CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: last_language&.name, project_language_count: 1})
+    end
+    if changes[:is_public].present?
+      if changes[:is_public][0] && !changes[:is_public][1]
+        CacheAsyncClearJob.perform_later('project_rank_service', self.id)
+      end
+      if !changes[:is_public][0] && changes[:is_public][1]
+        $redis_cache.srem("v2-project-rank-deleted", self.id)
+      end
+    end
+  end
+
+  def decre_project_common
+    CacheAsyncClearJob.perform_later('project_common_service', self.id)
+  end
+
+  def decre_forked_from_project_count
+    forked_project = self.forked_from_project
+    if forked_project.present?
+      forked_project.decrement(:forked_count, 1)
+      forked_project.save
+    end
+  end
+
+  def incre_user_statistic 
+    CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1, project_language_count_key: self.project_language&.name, project_language_count: 1}, self.user_id)
+  end
+
+  def decre_user_statistic
+    CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: -1, project_language_count_key: self.project_language&.name, project_language_count: -1}, self.user_id)
+  end
+
+  def incre_platform_statistic
+    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_count: 1, project_language_count_key: self.project_language&.name, project_language_count: 1})
+  end
+
+  def decre_platform_statistic
+    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_count: -1, project_language_count_key: self.project_language&.name, project_language_count: -1})
+  end
+
+  def is_full_public
+    owner = self.owner
+    if owner.is_a?(Organization)
+      return self.is_public && owner&.visibility == "common"
+    else
+      return self.is_public
+    end
+  end
+
+  def reset_unmember_followed
+    if changes[:is_public].present? && changes[:is_public] == [true, false]
+      self.watchers.where.not(user_id: self.all_collaborators).destroy_all
+    end
+  end
+
+  def set_invite_code
+    if self.invite_code.nil?
+      self.invite_code= self.generate_dcode('invite_code', 6)
+    end
+  end
+
+  def set_recommend_and_is_pinned
+    self.recommend = self.recommend_index.zero? ? false : true
+    # 私有项目不允许设置精选和推荐
+    unless self.is_public
+      self.recommend = false
+      self.recommend_index = 0
+      self.is_pinned = false 
+    end
+  end
+
+  def self.search_project(search)
+    ransack(name_or_identifier_cont: search)
+  end
+  # 创建者
+  def creator
+    User.find(user_id).full_name
+  end
+
+  def members_user_infos
+    members.joins(:roles).where("roles.name in ('Manager', 'Developer', 'Reporter')").joins("left join users on members.user_id = users.id ").includes(:user).where("users.type = ?", "User")
+    # members.joins("left join users on members.user_id = users.id").select("users.id", "users.login","users.firstname","users.lastname")
+    #   .pluck("users.id", "users.login","users.lastname", "users.firstname")
+  end
+
+  def to_param
+    self.identifier.parameterize
+  end
+
+  def get_issues_count(status_id)
+    if status_id.present?
+      self&.issues.issue_issue.select(:id, :status_id).where(status_id: status_id)&.pluck(:id).size
+    else
+      self&.issues.issue_issue.select(:id)&.pluck(:id).size
+    end
+  end
+
+  def get_pull_requests_count(status_id)
+    if status_id.present?
+      self&.pull_requests.select(:id, :status).where(status: status_id)&.pluck(:id).size
+    else
+      self&.pull_requests.select(:id)&.pluck(:id).size
+    end
+  end
+
+  #创建项目管理员
+  def check_project_members
+    return if owner.is_a?(Organization)
+    unless members.present? && members.exists?(user_id: self.user_id)
+      member_params = {
+        user_id: self.user_id,
+        project_id: self.id
+      }
+      user_member = Member.new(member_params)
+      if user_member.save
+        role_id = Role.select(:id,:position).where(position: 3)&.first&.id
+        MemberRole.create!(member_id: user_member.id ,role_id: role_id)
+      end
+    end
+  end
+
+
+  def self.init_bluck_repository
+    Project.includes(:repository).find_each do |project|
+      puts project.id
+      next if project.owner.blank?
+      if project.repository.blank?
+        puts  "########### start create repositoy #############"
+        Repository.create!(project_id: project.id, identifier: Project.generate_identifier, user_id: project&.owner&.id)
+      end
+    end
+  end
+
+  def self.generate_identifier
+    str_arr = (("a".."z").to_a + ("A".."Z").to_a)
+
+    str = str_arr.shuffle[0..8].join
+    while Repository.exists?(identifier: str)
+      str = str_arr.shuffle[0..8].join
+    end
+    str
+  end
+
+  def self.list_user_projects(user_id)
+    projects = Project.is_private.select(:id,:user_id)
+    user_not_show_1 = projects.where("user_id != ?",user_id).pluck(:id).uniq
+
+    user_show_2 = projects.joins(:members).where("members.user_id = ?", user_id).pluck(:id).uniq
+    Project.where.not(id: (user_not_show_1 - user_show_2).uniq)
+  end
+
+  def members_count
+    members.select(:id).size
+  end
+
+
+  def can_visited?
+    is_public? || User.current.admin? || member?(User.current)
+  end
+
+  def releases_size(current_user_id, type)
+    if current_user_id == self.user_id && type.to_s == "all"
+      self.repository.version_releases_count
+    else
+      self.repository.version_releases.releases_size
+    end
+  end
+
+  def contributor_users
+    self.pull_requests.select(:user_id).pluck(:user_id).uniq.size
+  end
+
+  def open_issues_count
+    issues_count - closed_issues_count
+  end
+
+  def numerical_for_project_type
+    self.class.name.constantize.project_types["#{self.project_type}"]
+  end
+
+  def watched_by? user
+    watchers.pluck(:user_id).include? user&.id
+  end
+
+  def praised_by? user
+    praise_treads.pluck(:user_id).include? user&.id
+  end
+
+  def get_premission user
+    return "Owner" if owner?(user)
+    return "Manager" if manager?(user)
+    return "Developer" if develper?(user)
+    return "Reporter" if reporter?(user)
+
+    return ""
+  end
+
+  def fork_project
+    Project.find_by(id: self.forked_from_project_id)
+  end
+
+  def self.members_projects(member_user_id)
+    joins(:members).where(members: { user_id: member_user_id})
+  end
+
+  def self.find_with_namespace(namespace_path, identifier)
+    logger.info "########namespace_path: #{namespace_path} ########identifier: #{identifier} "
+
+    user = Owner.find_by_login namespace_path
+    user = Owner.new(login: namespace_path) if user.nil?
+    project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
+    return nil if project.blank?
+
+    [project, user]
+  end
+
+  def ci_reactivate?
+    open_devops_count > 0
+  end
+
+  def ci_reactivate!(ci_repo)
+    ci_repo.update_column(:repo_active, 1)
+    update_column(:open_devops, true)
+    increment!(:open_devops_count)
+  end
+
+  def self.sync_educoder_shixun(url, private_token, page, per_page)
+    SyncEducoderShixunJob.perform_later(url, private_token, page, per_page)
+  end
+
+  def self.update_common_projects_count!
+    ps = ProjectStatistic.first
+    ps.increment!(:common_projects_count) unless ps.blank?
+  end
+
+  def self.update_mirror_projects_count!
+    ps = ProjectStatistic.first
+    ps.increment!(:mirror_projects_count) unless ps.blank?
+  end
+
+  def set_updated_on(time)
+    return if time.blank?
+    update_column(:updated_on, time)
+  end
+
+  def is_transfering
+    applied_transfer_project&.common? ? true : false
+  end
+
+  def validate_sensitive_string
+    raise("项目名称包含敏感词汇，请重新输入") if name && !HarmoniousDictionary.clean?(name)
+    raise("项目描述包含敏感词汇，请重新输入") if description && !HarmoniousDictionary.clean?(description)
+  end
+end

From 877948b0cd515eb414891801e63f8cd934e77368 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 1 Jun 2022 10:00:57 +0800
Subject: [PATCH 056/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/message_templates_controller.rb    | 20 +++++++++++++++++--
 app/models/message_template.rb                |  3 +--
 .../admins/message_templates/_list.html.erb   |  4 ++--
 .../admins/message_templates/index.html.erb   |  8 +++++++-
 app/views/admins/message_templates/new.js.erb |  2 ++
 config/routes.rb                              |  2 +-
 6 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 app/views/admins/message_templates/new.js.erb

diff --git a/app/controllers/admins/message_templates_controller.rb b/app/controllers/admins/message_templates_controller.rb
index 23c94e78..af77858e 100644
--- a/app/controllers/admins/message_templates_controller.rb
+++ b/app/controllers/admins/message_templates_controller.rb
@@ -2,8 +2,24 @@ class Admins::MessageTemplatesController < Admins::BaseController
   before_action :get_template, only: [:edit, :update, :destroy]
 
   def index 
-    message_templates = MessageTemplate.group(:type).count.keys
-    @message_templates = kaminari_array_paginate(message_templates)
+    message_templates = MessageTemplate.ransack(sys_notice_or_email_or_email_title_cont: params[:search]).result
+    @message_templates = kaminari_paginate(message_templates)
+  end
+
+  def new 
+    @message_template = MessageTemplate::CustomTip.new
+  end
+
+  def create 
+    @message_template = MessageTemplate::CustomTip.new(ignore_params)
+
+    if @message_template.save!
+      redirect_to admins_message_templates_path 
+      flash[:success] = "创建消息模板成功"
+    else
+      render :new
+      flash[:danger] = "创建消息模板失败"
+    end
   end
 
   def edit 
diff --git a/app/models/message_template.rb b/app/models/message_template.rb
index f3420013..50de7d8e 100644
--- a/app/models/message_template.rb
+++ b/app/models/message_template.rb
@@ -16,8 +16,7 @@ class MessageTemplate < ApplicationRecord
   PLATFORM = 'GitLink'
 
   def self.build_init_data
-    MessageTemplate::IssueAssignerExpire.destroy_all
-    MessageTemplate::IssueCreatorExpire.destroy_all
+    MessageTemplate.where.not(type: 'MessageTemplate::CustomTip').destroy_all
     self.create(type: 'MessageTemplate::FollowedTip', sys_notice: '<b>{nickname}</b> 关注了你', notification_url: '{baseurl}/{login}')
     email_html = File.read("#{email_template_html_dir}/issue_assigned.html")
     self.create(type: 'MessageTemplate::IssueAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个疑修：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 指派给你一个疑修")
diff --git a/app/views/admins/message_templates/_list.html.erb b/app/views/admins/message_templates/_list.html.erb
index 4082735f..dae87d57 100644
--- a/app/views/admins/message_templates/_list.html.erb
+++ b/app/views/admins/message_templates/_list.html.erb
@@ -11,8 +11,8 @@
   </thead>
   <tbody>
   <% if message_templates.present? %>
-    <% message_templates.each_with_index do |message_template_type, index| %>
-      <% message_template = message_template_type.constantize.last%>
+    <% message_templates.each_with_index do |message_template, index| %>
+      <%# message_template = message_template_type.constantize.last%>
       <tr class="project-language-item-<%= message_template.id %>">
         <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td><%= message_template.simple_type %></td>
diff --git a/app/views/admins/message_templates/index.html.erb b/app/views/admins/message_templates/index.html.erb
index 54d27333..e14de841 100644
--- a/app/views/admins/message_templates/index.html.erb
+++ b/app/views/admins/message_templates/index.html.erb
@@ -3,7 +3,13 @@
 <% end %>
 <div id="admins-message-templates-content">
   <div class="box search-form-container project-list-form">
-    <%= link_to "初始化数据", init_data_admins_message_templates_path, class: "btn btn-primary pull-right", "data-disabled-with":"...初始化数据" %> 
+    <%= form_tag(admins_message_templates_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+      <%= text_field_tag(:search, params[:search], class: 'form-control col-12 col-md-2 mr-3', placeholder: '名称检索') %>
+      <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+      <input type="reset" class="btn btn-secondary clear-btn" value="清空"/>
+    <% end %>
+    <%= link_to "初始化数据", init_data_admins_message_templates_path, class: "btn btn-primary mr-3 pull-right", "data-disabled-with":"...初始化数据" %>
+    <%= link_to "新增", new_admins_message_template_path, remote: true, class: "btn btn-primary pull-right", "data-disabled-with":"...新增" %>  
   </div>
   <div class="box admin-list-container message-templates-list-container">
     <%= render partial: 'admins/message_templates/list', locals: { message_templates: @message_templates } %>
diff --git a/app/views/admins/message_templates/new.js.erb b/app/views/admins/message_templates/new.js.erb
new file mode 100644
index 00000000..e75d923d
--- /dev/null
+++ b/app/views/admins/message_templates/new.js.erb
@@ -0,0 +1,2 @@
+$("#admins-message-templates-content").html("<%= j render partial: 'admins/message_templates/form', locals:{type: 'create'} %>")
+createMDEditor('message-template-email-editor', { height: 500, placeholder: '请输入邮件模版' });
diff --git a/config/routes.rb b/config/routes.rb
index 4d1e3ade..b585f077 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -694,7 +694,7 @@ Rails.application.routes.draw do
         get :history
       end
     end
-    resources :message_templates, only: [:index, :edit, :update] do 
+    resources :message_templates, only: [:index, :new, :create, :edit, :update] do 
       collection do 
         get :init_data
       end

From a07204111a83813d0dc73c48cd63168ebc63991b Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Wed, 1 Jun 2022 15:24:39 +0800
Subject: [PATCH 057/208] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=94=A8=E6=88=B7=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=97=B6=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/jobs/send_template_message_job.rb     |  9 ++++++++-
 app/models/message_template/custom_tip.rb | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/jobs/send_template_message_job.rb b/app/jobs/send_template_message_job.rb
index bec3f7b0..557d4d0f 100644
--- a/app/jobs/send_template_message_job.rb
+++ b/app/jobs/send_template_message_job.rb
@@ -8,13 +8,20 @@ class SendTemplateMessageJob < ApplicationJob
       receivers_id, template_id, props = args[0], args[1], args[2]
       template = MessageTemplate.find_by_id(template_id)
       return unless template.present?
-      receivers = User.where(id: receivers_id)
+      receivers = User.where(id: receivers_id).or(User.where(mail: receivers_id))
+      not_exists_receivers = receivers_id - receivers.pluck(:id) - receivers.pluck(:mail)
       receivers_string, content, notification_url = MessageTemplate::CustomTip.get_message_content(receivers, template, props)
       Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {receivers_id: receivers_id, template_id: template_id, props: props})
       receivers.find_each do |receiver|
         receivers_email_string, email_title, email_content = MessageTemplate::CustomTip.get_email_message_content(receiver, template, props)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
       end
+      not_exists_receivers.each do |mail|
+        valid_email_regex = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/i
+        next unless (mail =~ valid_email_regex)
+        email_title, email_content = MessageTemplate::CustomTip.get_email_content(template, props)
+        Notice::Write::EmailCreateService.call(mail, email_title, email_content)
+      end
     when 'FollowTip'
       watcher_id = args[0]
       watcher = Watcher.find_by_id(watcher_id)
diff --git a/app/models/message_template/custom_tip.rb b/app/models/message_template/custom_tip.rb
index 6c5a3345..f1e3096f 100644
--- a/app/models/message_template/custom_tip.rb
+++ b/app/models/message_template/custom_tip.rb
@@ -48,4 +48,21 @@ class MessageTemplate::CustomTip < MessageTemplate
    Rails.logger.info("MessageTemplate::CustomTip.get_email_message_content [ERROR] #{e}")
    return '', '', ''
  end
+
+  def self.get_email_content(template, props = {})
+    return '', '', '' if template.blank?
+    title = template.email_title
+    content = template.email
+    props.each do |k, v|
+      title.gsub!("{#{k}}", v)
+      content.gsub!("{#{k}}", v)
+    end
+    title.gsub!('{platform}', PLATFORM)
+    content.gsub!('{platform}', PLATFORM)
+
+    return title, content
+  rescue => e
+    Rails.logger.info("MessageTemplate::CustomTip.get_email_content [ERROR] #{e}")
+    return '', ''
+  end
 end
\ No newline at end of file

From 0b543f7ddab712fe6f0f77a64da5fe7aa627f439 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Wed, 1 Jun 2022 16:08:20 +0800
Subject: [PATCH 058/208] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=94=A8=E6=88=B7=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=97=B6=E5=8F=91=E9=80=81base=5Furl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/message_template/custom_tip.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/models/message_template/custom_tip.rb b/app/models/message_template/custom_tip.rb
index f1e3096f..b0f628d6 100644
--- a/app/models/message_template/custom_tip.rb
+++ b/app/models/message_template/custom_tip.rb
@@ -25,6 +25,7 @@ class MessageTemplate::CustomTip < MessageTemplate
     content.gsub!("{#{k}}", v)
     notification_url.gsub!("{#{k}}", v)
    end
+   notification_url.gsub!('{baseurl}', base_url)
    return receivers_string(receivers), content, notification_url
  rescue => e
    Rails.logger.info("MessageTemplate::CustomTip.get_message_content [ERROR] #{e}")
@@ -42,6 +43,7 @@ class MessageTemplate::CustomTip < MessageTemplate
     content.gsub!('{receiver}', receiver&.real_name)
     title.gsub!('{platform}', PLATFORM)
     content.gsub!('{platform}', PLATFORM)
+    content.gsub!('{baseurl}', base_url)
 
     return receiver&.mail, title, content
  rescue => e
@@ -59,6 +61,7 @@ class MessageTemplate::CustomTip < MessageTemplate
     end
     title.gsub!('{platform}', PLATFORM)
     content.gsub!('{platform}', PLATFORM)
+    content.gsub!('{baseurl}', base_url)
 
     return title, content
   rescue => e

From 8ae55875165708bec23d081f74a927f99f559626 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 8 Jun 2022 10:37:31 +0800
Subject: [PATCH 059/208] fix: search name use strip

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index fa940c29..bc9808c6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -179,7 +179,7 @@ class User < Owner
   scope :active, lambda { where(status: STATUS_ACTIVE) }
   scope :like, lambda { |keywords|
     sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search"
-    where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
+    where(sql, :search => "%#{keywords.strip}%") unless keywords.blank?
   }
 
   scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname, :gitea_uid, :type)}

From 3e4dd90e1737ebc908a650f3bb44ec3e59d6d6fd Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 8 Jun 2022 10:46:55 +0800
Subject: [PATCH 060/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E7=A7=B0=E5=B1=95=E7=A4=BA=E6=97=B6=E5=8F=AA?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A6=96=E6=9C=AB=E7=9A=84=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index bc9808c6..d3803a9f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -553,7 +553,8 @@ class User < Owner
     return '游客' unless logged?
     name = lastname + firstname
     name = name.blank? ? (nickname.blank? ? login : nickname) : name
-    name.gsub(/\s+/, '').strip    #6.11 -hs
+    # name.gsub(/\s+/, '').strip    #6.11 -hs
+    name.strip
   end
 
   def only_real_name

From ce467736a71d087e898440faa83841342f9ead87 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 13 Jun 2022 12:53:40 +0800
Subject: [PATCH 061/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20readme=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E8=B7=B3=E8=BD=AC=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/repositories_helper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 73ce9823..c31b9c59 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -104,8 +104,7 @@ module RepositoriesHelper
         # 链接直接跳过不做替换
         next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:') || s_content.blank?
         ext = File.extname(s_content)[1..-1]
-
-        if image_type?(ext) || download_type(ext) 
+        if (image_type?(ext) || download_type(ext)) && !s_content.to_s.end_with?('/')
           s_content = File.expand_path(s_content, file_path)
           s_content = s_content.split("#{Rails.root}/")[1]
           # content = content.gsub(s[0], "/#{s_content}")

From 66c40d479163f528f65a7b14e72230c98c4d262b Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Wed, 15 Jun 2022 11:16:08 +0800
Subject: [PATCH 062/208] =?UTF-8?q?fixed=20gitea=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/interactors/gitea/register_interactor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/interactors/gitea/register_interactor.rb b/app/interactors/gitea/register_interactor.rb
index d8dbc6ca..e188809a 100644
--- a/app/interactors/gitea/register_interactor.rb
+++ b/app/interactors/gitea/register_interactor.rb
@@ -13,7 +13,7 @@ module Gitea
     end
 
     def success?
-      @error.nil?
+      @error.nil? && @result[:status].to_s == "success"
     end
 
     def result

From 42d2b51f7f2df6788119d2c3489dcdd8c5ab4947 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 16 Jun 2022 13:42:17 +0800
Subject: [PATCH 063/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=95=8F=E6=84=9F=E8=AF=8D=E5=88=A4=E5=AE=9A=E5=8F=AA?=
 =?UTF-8?q?=E5=9C=A8=E5=88=9B=E5=BB=BA=E6=88=96=E8=80=85=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/project.rb      | 2 +-
 app/models/project_unit.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 9c77685f..edaa00eb 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -141,7 +141,7 @@ class Project < ApplicationRecord
   delegate :content, to: :project_detail, allow_nil: true
   delegate :name, to: :license, prefix: true, allow_nil: true
 
-  validate :validate_sensitive_string
+  validate :validate_sensitive_string, on: [:create, :update]
 
   def self.all_visible(user_id=nil)
     user_projects_sql = Project.joins(:owner).where(users: {type: 'User'}).to_sql
diff --git a/app/models/project_unit.rb b/app/models/project_unit.rb
index cc35a6b2..01f6c667 100644
--- a/app/models/project_unit.rb
+++ b/app/models/project_unit.rb
@@ -14,6 +14,8 @@
 #
 
 class ProjectUnit < ApplicationRecord
+
+  default_scope {where(unit_type: ProjectUnit.unit_types.keys)}
   belongs_to :project
 
   enum unit_type: {code: 1, issues: 2, pulls: 3, wiki:4, devops: 5, versions: 6, resources: 7}

From c42f3d59281ba65edc85873e6ff3a9d551968410 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 15 Jun 2022 18:07:23 +0800
Subject: [PATCH 064/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E7=94=A8=E6=88=B7=E9=93=BE=E6=8E=A5=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project_invite_links_controller.rb        | 36 +++++++++
 .../project_invite_links/create_form.rb       |  8 ++
 app/models/applied_project.rb                 | 21 ++---
 app/models/project.rb                         |  1 +
 app/models/project_invite_link.rb             | 57 ++++++++++++++
 app/services/projects/link_join_service.rb    | 76 +++++++++++++++++++
 app/views/projects/_detail.json.jbuilder      |  8 ++
 .../_detail.json.jbuilder                     | 12 +++
 .../current_link.json.jbuilder                |  1 +
 config/routes.rb                              |  7 ++
 ...20614070028_create_project_invite_links.rb | 16 ++++
 ...project_invite_link_to_applied_projects.rb |  6 ++
 spec/models/project_invite_link_spec.rb       |  5 ++
 13 files changed, 245 insertions(+), 9 deletions(-)
 create mode 100644 app/controllers/projects/project_invite_links_controller.rb
 create mode 100644 app/forms/projects/project_invite_links/create_form.rb
 create mode 100644 app/models/project_invite_link.rb
 create mode 100644 app/services/projects/link_join_service.rb
 create mode 100644 app/views/projects/_detail.json.jbuilder
 create mode 100644 app/views/projects/project_invite_links/_detail.json.jbuilder
 create mode 100644 app/views/projects/project_invite_links/current_link.json.jbuilder
 create mode 100644 db/migrate/20220614070028_create_project_invite_links.rb
 create mode 100644 db/migrate/20220614081950_add_project_invite_link_to_applied_projects.rb
 create mode 100644 spec/models/project_invite_link_spec.rb

diff --git a/app/controllers/projects/project_invite_links_controller.rb b/app/controllers/projects/project_invite_links_controller.rb
new file mode 100644
index 00000000..59f618fc
--- /dev/null
+++ b/app/controllers/projects/project_invite_links_controller.rb
@@ -0,0 +1,36 @@
+class Projects::ProjectInviteLinksController < Projects::BaseController
+  before_action :require_manager!, except: [:redirect_link]
+  before_action :require_login
+
+  def current_link
+    @project_invite_link = ProjectInviteLink.find_by(user_id: current_user.id, project_id: @project.id)
+    @project_invite_link = ProjectInviteLink.build!(@project, current_user) unless @project_invite_link.present?
+  end
+
+  def generate_link
+    ActiveRecord::Base.transaction do
+      params_data = link_params.merge({user_id: current_user.id, project_id: @project.id})
+      puts params_data
+      Projects::ProjectInviteLinks::CreateForm.new(params_data).validate!
+      @project_invite_link = ProjectInviteLink.create!(params_data.merge(sign: ProjectInviteLink.random_hex_sign))
+      render_ok
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def redirect_link 
+    Projects::LinkJoinService.call(current_user, @project, params[:invite_sign])
+    render_ok
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+
+  private 
+  def link_params 
+    params.require(:project_invite_link).permit(:role, :is_apply)
+  end
+end
diff --git a/app/forms/projects/project_invite_links/create_form.rb b/app/forms/projects/project_invite_links/create_form.rb
new file mode 100644
index 00000000..701625c0
--- /dev/null
+++ b/app/forms/projects/project_invite_links/create_form.rb
@@ -0,0 +1,8 @@
+class Projects::ProjectInviteLinks::CreateForm < BaseForm
+  attr_accessor :user_id, :project_id, :role, :is_apply
+  
+  validates :user_id, :project_id, :role, presence: true 
+  validates :role, inclusion: { in: %w(manager developer reporter), message: "请输入正确的权限." }
+  validates :is_apply, inclusion: {in: [true, false], message: "请输入是否需要管理员审核."}
+end
+  
\ No newline at end of file
diff --git a/app/models/applied_project.rb b/app/models/applied_project.rb
index ea7ca6ee..2b18d4d8 100644
--- a/app/models/applied_project.rb
+++ b/app/models/applied_project.rb
@@ -2,24 +2,27 @@
 #
 # Table name: forge_applied_projects
 #
-#  id         :integer          not null, primary key
-#  project_id :integer
-#  user_id    :integer
-#  role       :integer          default("0")
-#  status     :integer          default("0")
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id                     :integer          not null, primary key
+#  project_id             :integer
+#  user_id                :integer
+#  role                   :integer          default("0")
+#  status                 :integer          default("0")
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  project_invite_link_id :integer
 #
 # Indexes
 #
-#  index_forge_applied_projects_on_project_id  (project_id)
-#  index_forge_applied_projects_on_user_id     (user_id)
+#  index_forge_applied_projects_on_project_id              (project_id)
+#  index_forge_applied_projects_on_project_invite_link_id  (project_invite_link_id)
+#  index_forge_applied_projects_on_user_id                 (user_id)
 #
 
 class AppliedProject < ApplicationRecord
   self.table_name = "forge_applied_projects"
   belongs_to :user
   belongs_to :project
+  belongs_to :project_invite_link, optional: true
 
   has_many :applied_messages, as: :applied, dependent: :destroy
   # has_many :forge_activities, as: :forge_act, dependent: :destroy
diff --git a/app/models/project.rb b/app/models/project.rb
index edaa00eb..92e1bac7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -128,6 +128,7 @@ class Project < ApplicationRecord
   has_many :pinned_projects, dependent: :destroy 
   has_many :has_pinned_users, through: :pinned_projects, source: :user
   has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
+  has_many :project_invite_links, dependent: :destroy
   after_create :incre_user_statistic, :incre_platform_statistic
   after_save :check_project_members
   before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data
diff --git a/app/models/project_invite_link.rb b/app/models/project_invite_link.rb
new file mode 100644
index 00000000..fa5c0c44
--- /dev/null
+++ b/app/models/project_invite_link.rb
@@ -0,0 +1,57 @@
+# == Schema Information
+#
+# Table name: project_invite_links
+#
+#  id         :integer          not null, primary key
+#  project_id :integer
+#  user_id    :integer
+#  role       :integer          default("4")
+#  is_apply   :boolean          default("1")
+#  sign       :string(255)
+#  expired_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_project_invite_links_on_project_id  (project_id)
+#  index_project_invite_links_on_sign        (sign)
+#  index_project_invite_links_on_user_id     (user_id)
+#
+
+class ProjectInviteLink < ApplicationRecord
+
+  default_scope { where("expired_at > ?", Time.now).or(where(expired_at: nil)) }
+
+  belongs_to :project
+  belongs_to :user
+  has_many :applied_projects
+
+  scope :with_project_id, -> (project_id) {where(project_id: project_id)}
+  scope :with_user_id, -> (user_id) {where(user_id: user_id)}
+
+  enum role: {manager: 3, developer: 4, reporter: 5}
+
+  before_create :set_old_data_expired_at
+
+  def self.random_hex_sign
+    SecureRandom.hex
+  end
+
+  def self.build!(project, user, role="developer", is_apply=true)
+    self.create!(
+      project_id: project&.id, 
+      user_id: user&.id, 
+      role: role, 
+      is_apply: is_apply, 
+      sign: random_hex_sign
+    )
+  end
+
+  private 
+  def set_old_data_expired_at
+    ProjectInviteLink.where(user_id: self.user_id, project_id: self.project).update_all(expired_at: Time.now)
+  end
+
+
+end
diff --git a/app/services/projects/link_join_service.rb b/app/services/projects/link_join_service.rb
new file mode 100644
index 00000000..c42376ef
--- /dev/null
+++ b/app/services/projects/link_join_service.rb
@@ -0,0 +1,76 @@
+class Projects::LinkJoinService < ApplicationService
+  Error = Class.new(StandardError)
+
+  attr_reader :user, :project, :invite_sign, :params
+
+  def initialize(user, project, invite_sign, params={})
+    @user        = user
+    @project     = project
+    @invite_sign = invite_sign
+    @params      = params
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      validate! 
+      if invite_link.is_apply 
+        # 如果需要申请才能加入，创建一条申请记录
+        create_applied_project!
+      else
+        # 如果不需要申请，直接为项目添加该成员
+        create_member!
+      end
+    end
+  end
+
+  private
+  def validate! 
+    raise Error, 'invite_sign必须存在!' if invite_sign.blank?
+    raise Error, '邀请链接不存在!' unless invite_link.present?
+    raise Error, '邀请链接已失效!' unless invite_user_in_project
+    raise Error, '用户已加入该项目!' if project.member?(user.id)
+  end
+
+  def create_applied_project!
+    user.applied_projects.create!(project: project, role: role_value)
+  end
+
+  def create_member!
+    Projects::AddMemberInteractor.call(project.owner, project, user, permission)
+  end
+
+  def invite_link 
+    ProjectInviteLink.find_by(project_id: project.id, sign: invite_sign)
+  end
+
+  def invite_user_in_project 
+    in_project = project.member?(invite_link.user)
+    invite_link.update_column(:expired_at, Time.now) unless in_project
+    in_project
+  end
+
+  def role_value
+    @_role ||=
+      case invite_link&.role
+      when 'manager'   then 3
+      when 'developer' then 4
+      when 'reporter'  then 5
+      else 
+        5
+      end
+  end
+
+  def permission 
+    case invite_link&.role 
+    when 'manager'
+      'admin'
+    when 'developer'
+      'write'
+    when 'reporter'
+      'read'
+    else 
+      'read'
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/projects/_detail.json.jbuilder b/app/views/projects/_detail.json.jbuilder
new file mode 100644
index 00000000..ed23fdef
--- /dev/null
+++ b/app/views/projects/_detail.json.jbuilder
@@ -0,0 +1,8 @@
+json.id project.id
+json.identifier project.identifier
+json.name project.name
+json.description project.description
+json.is_public project.is_public
+json.owner do 
+  json.partial! "/users/user_simple", locals: {user: project.owner}
+end
\ No newline at end of file
diff --git a/app/views/projects/project_invite_links/_detail.json.jbuilder b/app/views/projects/project_invite_links/_detail.json.jbuilder
new file mode 100644
index 00000000..7c9f78dd
--- /dev/null
+++ b/app/views/projects/project_invite_links/_detail.json.jbuilder
@@ -0,0 +1,12 @@
+json.(project_invite_link, :id, :role, :is_apply, :sign)
+
+json.user do 
+  json.partial! "/users/user_simple", locals: {user: project_invite_link.user}
+end
+if project_invite_link&.project.present?
+  json.project do 
+    json.partial! "/projects/detail", locals: {project: project_invite_link.project}
+  end
+else
+  json.project nil 
+end
diff --git a/app/views/projects/project_invite_links/current_link.json.jbuilder b/app/views/projects/project_invite_links/current_link.json.jbuilder
new file mode 100644
index 00000000..1903e10a
--- /dev/null
+++ b/app/views/projects/project_invite_links/current_link.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'detail', locals: { project_invite_link: @project_invite_link }
diff --git a/config/routes.rb b/config/routes.rb
index b585f077..ed28b5ba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -603,6 +603,13 @@ Rails.application.routes.draw do
             post :cancel
           end
         end
+        resources :project_invite_links, only: [:index] do 
+          collection do 
+            get :current_link
+            post :generate_link
+            post :redirect_link
+          end
+        end
         resources :webhooks, except: [:show, :new] do 
           member do 
             get :tasks 
diff --git a/db/migrate/20220614070028_create_project_invite_links.rb b/db/migrate/20220614070028_create_project_invite_links.rb
new file mode 100644
index 00000000..5b482967
--- /dev/null
+++ b/db/migrate/20220614070028_create_project_invite_links.rb
@@ -0,0 +1,16 @@
+class CreateProjectInviteLinks < ActiveRecord::Migration[5.2]
+  def change
+    create_table :project_invite_links do |t|
+      t.references :project 
+      t.references :user 
+      t.integer :role, default: 4
+      t.boolean :is_apply, default: true 
+      t.string :sign
+      t.datetime :expired_at
+
+      t.timestamps
+    end
+
+    add_index :project_invite_links, :sign
+  end
+end
diff --git a/db/migrate/20220614081950_add_project_invite_link_to_applied_projects.rb b/db/migrate/20220614081950_add_project_invite_link_to_applied_projects.rb
new file mode 100644
index 00000000..31cbd951
--- /dev/null
+++ b/db/migrate/20220614081950_add_project_invite_link_to_applied_projects.rb
@@ -0,0 +1,6 @@
+class AddProjectInviteLinkToAppliedProjects < ActiveRecord::Migration[5.2]
+  def change
+    add_column :forge_applied_projects, :project_invite_link_id, :integer 
+    add_index :forge_applied_projects, :project_invite_link_id
+  end
+end
diff --git a/spec/models/project_invite_link_spec.rb b/spec/models/project_invite_link_spec.rb
new file mode 100644
index 00000000..d7c46fa5
--- /dev/null
+++ b/spec/models/project_invite_link_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ProjectInviteLink, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From f6fb50529c9a8db640ade92c66d3ca6b5542e281 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 16 Jun 2022 11:56:09 +0800
Subject: [PATCH 065/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E9=A1=B9=E7=9B=AE=E9=93=BE=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project_invite_links_controller.rb        |   1 -
 app/docs/slate/source/includes/_projects.md   | 186 ++++++++
 app/services/projects/link_join_service.rb    |   2 +-
 .../generate_link.json.jbuilder               |   1 +
 public/docs/api.html                          | 450 ++++++++++++++++--
 5 files changed, 597 insertions(+), 43 deletions(-)
 create mode 100644 app/views/projects/project_invite_links/generate_link.json.jbuilder

diff --git a/app/controllers/projects/project_invite_links_controller.rb b/app/controllers/projects/project_invite_links_controller.rb
index 59f618fc..c177367c 100644
--- a/app/controllers/projects/project_invite_links_controller.rb
+++ b/app/controllers/projects/project_invite_links_controller.rb
@@ -13,7 +13,6 @@ class Projects::ProjectInviteLinksController < Projects::BaseController
       puts params_data
       Projects::ProjectInviteLinks::CreateForm.new(params_data).validate!
       @project_invite_link = ProjectInviteLink.create!(params_data.merge(sign: ProjectInviteLink.random_hex_sign))
-      render_ok
     end
   rescue Exception => e
     uid_logger_error(e.message)
diff --git a/app/docs/slate/source/includes/_projects.md b/app/docs/slate/source/includes/_projects.md
index e133bcdd..7e700457 100644
--- a/app/docs/slate/source/includes/_projects.md
+++ b/app/docs/slate/source/includes/_projects.md
@@ -1,4 +1,190 @@
 # Projects
+## 获取项目邀请链接
+当前登录（管理员）用户获取项目邀请链接的接口（第一次请求会默认生成role类型为developer和is_apply为true的链接）
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/yystopf/kellect/project_invite_links/current_link.json
+```
+
+```javascript
+await octokit.request('GET /api/yystopf/kellect/project_invite_links/current_link.json')
+```
+
+### HTTP 请求
+`GET /api/:owner/:repo/project_invite_links/current_link.json`
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |链接id |
+|role           |string   |邀请角色|
+|is_apply       |boolean  |是否需要审核 |
+|sign           |string   |邀请标识(放在链接后面即可)|
+|user.id        |int      |链接创建者的id |
+|user.type      |string   |链接创建者的类型 |
+|user.name      |string   |链接创建者的名称 |
+|user.login     |string   |链接创建者的标识 |
+|user.image_url |string   |链接创建者头像 |
+|project.id             |int      |链接关联项目的id |
+|project.identifier     |string   |链接关联项目的标识 |
+|project.name           |string   |链接关联项目的名称 |
+|project.description    |string   |链接关联项目的描述 |
+|project.is_public      |bool     |链接关联项目是否公开 |
+|project.owner.id       |bool     |链接关联项目拥有者id |
+|project.owner.type     |string   |链接关联项目拥有者类型 |
+|project.owner.name     |string   |链接关联项目拥有者昵称 |
+|project.owner.login    |string   |链接关联项目拥有者标识 |
+|project.owner.image_url|string   |链接关联项目拥有者头像 |
+
+> 返回的JSON示例:
+
+```json
+{
+    "id": 7,
+    "role": "developer",
+    "is_apply": false,
+    "sign": "6b6b454843c291d4e52e60853cb8ad9f",
+    "user": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "project": {
+        "id": 474,
+        "identifier": "kellect",
+        "name": "kellect",
+        "description": null,
+        "is_public": true,
+        "owner": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        }
+    }
+}
+```
+## 生成项目邀请链接
+当前登录（管理员）用户生成的项目邀请链接，可选role和is_apply参数
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/yystopf/kellect/project_invite_links/generate_link.json
+```
+
+```javascript
+await octokit.request('POST /api/yystopf/kellect/project_invite_links/generate_link.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/project_invite_links/generate_link.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|role     |是| |string |项目权限，reporter: 报告者, developer: 开发者，manager：管理员  |
+|is_apply |是| |boolean |是否需要审核  |
+
+
+> 请求的JSON示例
+
+```json
+{
+    "role": "developer",
+    "is_apply": false
+}
+```
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |链接id |
+|role           |string   |邀请角色|
+|is_apply       |boolean  |是否需要审核 |
+|sign           |string   |邀请标识(放在链接后面即可)|
+|user.id        |int      |链接创建者的id |
+|user.type      |string   |链接创建者的类型 |
+|user.name      |string   |链接创建者的名称 |
+|user.login     |string   |链接创建者的标识 |
+|user.image_url |string   |链接创建者头像 |
+|project.id             |int      |链接关联项目的id |
+|project.identifier     |string   |链接关联项目的标识 |
+|project.name           |string   |链接关联项目的名称 |
+|project.description    |string   |链接关联项目的描述 |
+|project.is_public      |bool     |链接关联项目是否公开 |
+|project.owner.id       |bool     |链接关联项目拥有者id |
+|project.owner.type     |string   |链接关联项目拥有者类型 |
+|project.owner.name     |string   |链接关联项目拥有者昵称 |
+|project.owner.login    |string   |链接关联项目拥有者标识 |
+|project.owner.image_url|string   |链接关联项目拥有者头像 |
+
+> 返回的JSON示例:
+
+```json
+{
+    "id": 7,
+    "role": "developer",
+    "is_apply": false,
+    "sign": "6b6b454843c291d4e52e60853cb8ad9f",
+    "user": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "project": {
+        "id": 474,
+        "identifier": "kellect",
+        "name": "kellect",
+        "description": null,
+        "is_public": true,
+        "owner": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        }
+    }
+}
+```
+
+## 请求项目邀请链接
+当前登录（非项目）用户加入项目的接口，如果项目链接不需要审核，请求成功后即加入项目，如果需要审核，那么会提交一个申请，需要项目管理员审核
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/yystopf/kellect/project_invite_links/redirect_link.json?invite_sign=d612df03aad63760445c187bcf83f2e6
+```
+
+```javascript
+await octokit.request('POST /api/yystopf/kellect/project_invite_links/redirect_link.json?invite_sign=d612df03aad63760445c187bcf83f2e6')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/project_invite_links/generate_link.json?invite_sign=xxx`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|invite_sign |是| |string |项目邀请链接的标识  |
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
 
 ## 申请加入项目
 申请加入项目
diff --git a/app/services/projects/link_join_service.rb b/app/services/projects/link_join_service.rb
index c42376ef..e586933f 100644
--- a/app/services/projects/link_join_service.rb
+++ b/app/services/projects/link_join_service.rb
@@ -32,7 +32,7 @@ class Projects::LinkJoinService < ApplicationService
   end
 
   def create_applied_project!
-    user.applied_projects.create!(project: project, role: role_value)
+    user.applied_projects.create!(project: project, role: role_value, project_invite_link_id: invite_link&.id)
   end
 
   def create_member!
diff --git a/app/views/projects/project_invite_links/generate_link.json.jbuilder b/app/views/projects/project_invite_links/generate_link.json.jbuilder
new file mode 100644
index 00000000..1903e10a
--- /dev/null
+++ b/app/views/projects/project_invite_links/generate_link.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'detail', locals: { project_invite_link: @project_invite_link }
diff --git a/public/docs/api.html b/public/docs/api.html
index 8ef6924b..bd3f49eb 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -425,6 +425,15 @@
           <li>
             <a href="#projects" class="toc-h1 toc-link" data-title="Projects">Projects</a>
               <ul class="toc-list-h2">
+                  <li>
+                    <a href="#086d81b60d" class="toc-h2 toc-link" data-title="获取项目邀请链接">获取项目邀请链接</a>
+                  </li>
+                  <li>
+                    <a href="#65f471580f" class="toc-h2 toc-link" data-title="生成项目邀请链接">生成项目邀请链接</a>
+                  </li>
+                  <li>
+                    <a href="#316c752f05" class="toc-h2 toc-link" data-title="请求项目邀请链接">请求项目邀请链接</a>
+                  </li>
                   <li>
                     <a href="#ac55469b06" class="toc-h2 toc-link" data-title="申请加入项目">申请加入项目</a>
                   </li>
@@ -4390,7 +4399,366 @@ Success — a happy kitten is an authenticated kitten!
     </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-06-09 16:41"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"7分钟前"</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h1 id='projects'>Projects</h1><h2 id='ac55469b06'>申请加入项目</h2>
+</span></code></pre></div><h1 id='projects'>Projects</h1><h2 id='086d81b60d'>获取项目邀请链接</h2>
+<p>当前登录（管理员）用户获取项目邀请链接的接口（第一次请求会默认生成role类型为developer和is_apply为true的链接）</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/yystopf/kellect/project_invite_links/current_link.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/kellect/project_invite_links/current_link.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http'>HTTP 请求</h3>
+<p><code>GET /api/:owner/:repo/project_invite_links/current_link.json</code></p>
+<h3 id='b302a98fa6'>返回字段说明</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>链接id</td>
+</tr>
+<tr>
+<td>role</td>
+<td>string</td>
+<td>邀请角色</td>
+</tr>
+<tr>
+<td>is_apply</td>
+<td>boolean</td>
+<td>是否需要审核</td>
+</tr>
+<tr>
+<td>sign</td>
+<td>string</td>
+<td>邀请标识(放在链接后面即可)</td>
+</tr>
+<tr>
+<td>user.id</td>
+<td>int</td>
+<td>链接创建者的id</td>
+</tr>
+<tr>
+<td>user.type</td>
+<td>string</td>
+<td>链接创建者的类型</td>
+</tr>
+<tr>
+<td>user.name</td>
+<td>string</td>
+<td>链接创建者的名称</td>
+</tr>
+<tr>
+<td>user.login</td>
+<td>string</td>
+<td>链接创建者的标识</td>
+</tr>
+<tr>
+<td>user.image_url</td>
+<td>string</td>
+<td>链接创建者头像</td>
+</tr>
+<tr>
+<td>project.id</td>
+<td>int</td>
+<td>链接关联项目的id</td>
+</tr>
+<tr>
+<td>project.identifier</td>
+<td>string</td>
+<td>链接关联项目的标识</td>
+</tr>
+<tr>
+<td>project.name</td>
+<td>string</td>
+<td>链接关联项目的名称</td>
+</tr>
+<tr>
+<td>project.description</td>
+<td>string</td>
+<td>链接关联项目的描述</td>
+</tr>
+<tr>
+<td>project.is_public</td>
+<td>bool</td>
+<td>链接关联项目是否公开</td>
+</tr>
+<tr>
+<td>project.owner.id</td>
+<td>bool</td>
+<td>链接关联项目拥有者id</td>
+</tr>
+<tr>
+<td>project.owner.type</td>
+<td>string</td>
+<td>链接关联项目拥有者类型</td>
+</tr>
+<tr>
+<td>project.owner.name</td>
+<td>string</td>
+<td>链接关联项目拥有者昵称</td>
+</tr>
+<tr>
+<td>project.owner.login</td>
+<td>string</td>
+<td>链接关联项目拥有者标识</td>
+</tr>
+<tr>
+<td>project.owner.image_url</td>
+<td>string</td>
+<td>链接关联项目拥有者头像</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">7</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"role"</span><span class="p">:</span><span class="w"> </span><span class="s2">"developer"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_apply"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"sign"</span><span class="p">:</span><span class="w"> </span><span class="s2">"6b6b454843c291d4e52e60853cb8ad9f"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"project"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">474</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"kellect"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"kellect"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_public"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"owner"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='65f471580f'>生成项目邀请链接</h2>
+<p>当前登录（管理员）用户生成的项目邀请链接，可选role和is_apply参数</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/yystopf/kellect/project_invite_links/generate_link.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/kellect/project_invite_links/generate_link.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-2'>HTTP 请求</h3>
+<p><code>POST /api/:owner/:repo/project_invite_links/generate_link.json</code></p>
+<h3 id='1f9ac54b15'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>role</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目权限，reporter: 报告者, developer: 开发者，manager：管理员</td>
+</tr>
+<tr>
+<td>is_apply</td>
+<td>是</td>
+<td></td>
+<td>boolean</td>
+<td>是否需要审核</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"role"</span><span class="p">:</span><span class="w"> </span><span class="s2">"developer"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_apply"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h3 id='b302a98fa6-2'>返回字段说明</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>链接id</td>
+</tr>
+<tr>
+<td>role</td>
+<td>string</td>
+<td>邀请角色</td>
+</tr>
+<tr>
+<td>is_apply</td>
+<td>boolean</td>
+<td>是否需要审核</td>
+</tr>
+<tr>
+<td>sign</td>
+<td>string</td>
+<td>邀请标识(放在链接后面即可)</td>
+</tr>
+<tr>
+<td>user.id</td>
+<td>int</td>
+<td>链接创建者的id</td>
+</tr>
+<tr>
+<td>user.type</td>
+<td>string</td>
+<td>链接创建者的类型</td>
+</tr>
+<tr>
+<td>user.name</td>
+<td>string</td>
+<td>链接创建者的名称</td>
+</tr>
+<tr>
+<td>user.login</td>
+<td>string</td>
+<td>链接创建者的标识</td>
+</tr>
+<tr>
+<td>user.image_url</td>
+<td>string</td>
+<td>链接创建者头像</td>
+</tr>
+<tr>
+<td>project.id</td>
+<td>int</td>
+<td>链接关联项目的id</td>
+</tr>
+<tr>
+<td>project.identifier</td>
+<td>string</td>
+<td>链接关联项目的标识</td>
+</tr>
+<tr>
+<td>project.name</td>
+<td>string</td>
+<td>链接关联项目的名称</td>
+</tr>
+<tr>
+<td>project.description</td>
+<td>string</td>
+<td>链接关联项目的描述</td>
+</tr>
+<tr>
+<td>project.is_public</td>
+<td>bool</td>
+<td>链接关联项目是否公开</td>
+</tr>
+<tr>
+<td>project.owner.id</td>
+<td>bool</td>
+<td>链接关联项目拥有者id</td>
+</tr>
+<tr>
+<td>project.owner.type</td>
+<td>string</td>
+<td>链接关联项目拥有者类型</td>
+</tr>
+<tr>
+<td>project.owner.name</td>
+<td>string</td>
+<td>链接关联项目拥有者昵称</td>
+</tr>
+<tr>
+<td>project.owner.login</td>
+<td>string</td>
+<td>链接关联项目拥有者标识</td>
+</tr>
+<tr>
+<td>project.owner.image_url</td>
+<td>string</td>
+<td>链接关联项目拥有者头像</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">7</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"role"</span><span class="p">:</span><span class="w"> </span><span class="s2">"developer"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_apply"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"sign"</span><span class="p">:</span><span class="w"> </span><span class="s2">"6b6b454843c291d4e52e60853cb8ad9f"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"project"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">474</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"kellect"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"kellect"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_public"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"owner"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='316c752f05'>请求项目邀请链接</h2>
+<p>当前登录（非项目）用户加入项目的接口，如果项目链接不需要审核，请求成功后即加入项目，如果需要审核，那么会提交一个申请，需要项目管理员审核</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/yystopf/kellect/project_invite_links/redirect_link.json?invite_sign<span class="o">=</span>d612df03aad63760445c187bcf83f2e6
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/kellect/project_invite_links/redirect_link.json?invite_sign=d612df03aad63760445c187bcf83f2e6</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-3'>HTTP 请求</h3>
+<p><code>POST /api/:owner/:repo/project_invite_links/generate_link.json?invite_sign=xxx</code></p>
+<h3 id='1f9ac54b15-2'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>invite_sign</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目邀请链接的标识</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='ac55469b06'>申请加入项目</h2>
 <p>申请加入项目</p>
 
 <blockquote>
@@ -4398,9 +4766,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/applied_projects.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/appliedr_projects.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-4'>HTTP 请求</h3>
 <p><code>POST /api/applied_projects.json</code></p>
-<h3 id='1f9ac54b15'>请求参数</h3>
+<h3 id='1f9ac54b15-3'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4435,7 +4803,7 @@ Success — a happy kitten is an authenticated kitten!
     </span><span class="nl">"role"</span><span class="p">:</span><span class="w"> </span><span class="s2">"developer"</span><span class="w">
   </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='b302a98fa6'>返回字段说明</h3>
+</span></code></pre></div><h3 id='b302a98fa6-3'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4576,9 +4944,9 @@ Success — a happy kitten is an authenticated kitten!
 <span class="nt">-d</span> <span class="s2">"limit=5"</span> <span class="se">\</span>
 http://localhost:3000/api/projects  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/projects</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-2'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-5'>HTTP 请求</h3>
 <p><code>GET api/projects</code></p>
-<h3 id='1f9ac54b15-2'>请求参数</h3>
+<h3 id='1f9ac54b15-4'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4645,7 +5013,7 @@ http://localhost:3000/api/projects  | jq
 <td>项目类型， 取值为：common、mirror; common:开源托管项目, mirror:开源镜像项目</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-2'>返回字段说明</h3>
+<h3 id='b302a98fa6-4'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4797,9 +5165,9 @@ Remember — a happy kitten is an authenticated kitten!
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/projects/recommend  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/projects/recommend.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-3'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
 <p><code>GET api/projects/recommend</code></p>
-<h3 id='b302a98fa6-3'>返回字段说明</h3>
+<h3 id='b302a98fa6-5'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4933,9 +5301,9 @@ Remember — a happy kitten is an authenticated kitten!
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/ceshi/menu_list</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-4'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
 <p><code>GET api/:owner/:repo/menu_list</code></p>
-<h3 id='1f9ac54b15-3'>请求参数</h3>
+<h3 id='1f9ac54b15-5'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4960,7 +5328,7 @@ http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-4'>返回字段说明</h3>
+<h3 id='b302a98fa6-6'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5001,9 +5369,9 @@ http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/jasder/forgeplus/about  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/forgeplus/about</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-5'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
 <p><code>GET api/:owner/:repo/about</code></p>
-<h3 id='1f9ac54b15-4'>请求参数</h3>
+<h3 id='1f9ac54b15-6'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5028,7 +5396,7 @@ http://localhost:3000/api/jasder/forgeplus/about  | jq
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-5'>返回字段说明</h3>
+<h3 id='b302a98fa6-7'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5074,7 +5442,7 @@ Remember — a happy kitten is an authenticated kitten!
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/yystopf/ceshi/project_units.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/ceshi/project_units</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
 <p><code>GET /api/yystopf/ceshi/project_units</code></p>
 <h3 id='7447e4874e'>返回字段说明:</h3>
 <table><thead>
@@ -5117,9 +5485,9 @@ http://localhost:3000/api/yystopf/ceshi/project_units.json
 <span class="nt">-d</span> <span class="s2">"{ </span><span class="se">\"</span><span class="s2">unit_typs</span><span class="se">\"</span><span class="s2">: [</span><span class="se">\"</span><span class="s2">code</span><span class="se">\"</span><span class="s2">, </span><span class="se">\"</span><span class="s2">pulls</span><span class="se">\"</span><span class="s2">]}"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/ceshi/project_units.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/ceshi/project_units</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
 <p><code>POST /api/yystopf/ceshi/project_units</code></p>
-<h3 id='1f9ac54b15-5'>请求参数</h3>
+<h3 id='1f9ac54b15-7'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5181,9 +5549,9 @@ http://localhost:3000/api/yystopf/ceshi/project_units.json
 <span class="nt">-d</span> <span class="s2">"license_id=1"</span> <span class="se">\</span>
 http://localhost:3000/api/projects.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/projects.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
 <p><code>POST api/projects</code></p>
-<h3 id='1f9ac54b15-6'>请求参数</h3>
+<h3 id='1f9ac54b15-8'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5257,7 +5625,7 @@ http://localhost:3000/api/projects.json
 <td>项目是否私有, true：为私有，false: 公开，默认为公开</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-6'>返回字段说明</h3>
+<h3 id='b302a98fa6-8'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5299,9 +5667,9 @@ http://localhost:3000/api/projects.json
 <span class="nt">-d</span> <span class="s2">"project_language_id=2"</span> <span class="se">\</span>
 http://localhost:3000/api/projects/migrate.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/projects/migrate.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-12'>HTTP 请求</h3>
 <p><code>POST api/projects/migrate.json</code></p>
-<h3 id='1f9ac54b15-7'>请求参数</h3>
+<h3 id='1f9ac54b15-9'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5389,7 +5757,7 @@ http://localhost:3000/api/projects/migrate.json
 <td>项目是否私有, true：为私有，false: 非私有，默认为公开</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-7'>返回字段说明</h3>
+<h3 id='b302a98fa6-9'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5424,9 +5792,9 @@ http://localhost:3000/api/projects/migrate.json
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/repositories/1244/sync_mirror.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/repositories/1244/sync_mirror.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
 <p><code>POST api/repositories/:id/sync_mirror.json</code></p>
-<h3 id='1f9ac54b15-8'>请求参数</h3>
+<h3 id='1f9ac54b15-10'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5444,7 +5812,7 @@ http://localhost:3000/api/projects/migrate.json
 <td>仓库id</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-8'>返回字段说明</h3>
+<h3 id='b302a98fa6-10'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5479,9 +5847,9 @@ http://localhost:3000/api/projects/migrate.json
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/jasder/forgeplus/forks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/jaser/jasder_test/forks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
 <p><code>POST api/:owner/:repo/forks.json</code></p>
-<h3 id='1f9ac54b15-9'>请求参数</h3>
+<h3 id='1f9ac54b15-11'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5506,7 +5874,7 @@ http://localhost:3000/api/projects/migrate.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-9'>返回字段说明</h3>
+<h3 id='b302a98fa6-11'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5542,9 +5910,9 @@ http://localhost:3000/api/projects/migrate.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizations.json  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/:owner/:repo/applied_transfer_projects/organizations</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-12'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
 <p><code>GET api/:owner/:repo/applied_transfer_projects/organizations</code></p>
-<h3 id='1f9ac54b15-10'>请求参数</h3>
+<h3 id='1f9ac54b15-12'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5569,7 +5937,7 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-10'>返回字段说明</h3>
+<h3 id='b302a98fa6-12'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5636,9 +6004,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/:owner/:repo/applied_transfer_projects.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-16'>HTTP 请求</h3>
 <p><code>POST /api/:owner/:repo/applied_transfer_projects.json</code></p>
-<h3 id='1f9ac54b15-11'>请求参数</h3>
+<h3 id='1f9ac54b15-13'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5670,7 +6038,7 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>迁移对象标识</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-11'>返回字段说明</h3>
+<h3 id='b302a98fa6-13'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5840,9 +6208,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/cancel.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/:owner/:repo/applied_transfer_projects/cancel.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
 <p><code>POST /api/:owner/:repo/applied_transfer_projects/cancel.json</code></p>
-<h3 id='1f9ac54b15-12'>请求参数</h3>
+<h3 id='1f9ac54b15-14'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5867,7 +6235,7 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-12'>返回字段说明</h3>
+<h3 id='b302a98fa6-14'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -6037,9 +6405,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/ceshi1/ceshi_repo1/quit.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/:owner/:repo/quit.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
 <p><code>POST /api/:owner/:repo/quit.json</code></p>
-<h3 id='1f9ac54b15-13'>请求参数</h3>
+<h3 id='1f9ac54b15-15'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>

From 3d0e32380145aac8574ee1773e0762978369f8fb Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 17 Jun 2022 14:07:33 +0800
Subject: [PATCH 066/208] fix

---
 app/models/project_unit.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/project_unit.rb b/app/models/project_unit.rb
index 01f6c667..c3810ff8 100644
--- a/app/models/project_unit.rb
+++ b/app/models/project_unit.rb
@@ -15,7 +15,6 @@
 
 class ProjectUnit < ApplicationRecord
 
-  default_scope {where(unit_type: ProjectUnit.unit_types.keys)}
   belongs_to :project
 
   enum unit_type: {code: 1, issues: 2, pulls: 3, wiki:4, devops: 5, versions: 6, resources: 7}

From 5b4e6f490279752352740e5fd4503a7bc06f75ac Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 17 Jun 2022 14:19:41 +0800
Subject: [PATCH 067/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=AD=98=E5=9C=A8=E6=95=8F=E6=84=9F=E8=AF=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0forked=E6=95=B0=E9=87=8F=E4=BD=BF=E7=94=A8update=5Fcol?=
 =?UTF-8?q?umn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/project.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index edaa00eb..444a0ec8 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -187,7 +187,7 @@ class Project < ApplicationRecord
     forked_project = self.forked_from_project
     if forked_project.present?
       forked_project.decrement(:forked_count, 1)
-      forked_project.save
+      forked_project.update_column(:forked_count, forked_project.forked_count)
     end
   end
 

From 1f9caeece5f74e5b69b2a2be68ea5f710ccbe9b9 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Fri, 17 Jun 2022 17:02:24 +0800
Subject: [PATCH 068/208] =?UTF-8?q?auth2=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       | 266 +++++----
 app/controllers/application_controller.rb     |   8 +-
 app/models/user.rb                            |  15 +
 config/initializers/doorkeeper.rb             | 553 ++++++++++++++++++
 config/locales/doorkeeper.en.yml              | 151 +++++
 config/locales/doorkeeper.zh-CN.yml           | 126 ++++
 config/routes.rb                              |   1 +
 ...20220616040105_create_doorkeeper_tables.rb |  88 +++
 8 files changed, 1075 insertions(+), 133 deletions(-)
 create mode 100644 config/initializers/doorkeeper.rb
 create mode 100644 config/locales/doorkeeper.en.yml
 create mode 100644 config/locales/doorkeeper.zh-CN.yml
 create mode 100644 db/migrate/20220616040105_create_doorkeeper_tables.rb

diff --git a/Gemfile b/Gemfile
index 713eb860..effb2be6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,130 +1,136 @@
-source 'https://gems.ruby-china.com'
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-gem 'rails', '~> 5.2.0'
-gem 'mysql2', '>= 0.4.4', '< 0.6.0'
-gem 'puma', '~> 3.11'
-gem 'sass-rails', '~> 5.0'
-gem 'uglifier', '>= 1.3.0'
-
-# gem 'coffee-rails', '~> 4.2'
-gem 'turbolinks', '~> 5'
-gem 'jbuilder', '~> 2.5'
-gem 'groupdate', '~> 4.1.0'
-gem 'chartkick'
-gem 'grape-entity', '~> 0.7.1'
-gem 'kaminari', '~> 1.1', '>= 1.1.1'
-
-gem 'bootsnap', '>= 1.1.0', require: false
-
-gem 'chinese_pinyin'
-
-gem 'rack-cors'
-gem 'redis-rails'
-gem 'roo-xls'
-gem 'simple_xlsx_reader'
-
-gem 'rubyzip'
-
-gem 'spreadsheet'
-gem 'ruby-ole'
-# 导出为xlsx
-gem 'axlsx', '~> 3.0.0.pre'
-gem 'axlsx_rails', '~> 0.5.2'
-
-gem 'oauth2'
-#导出为pdf
-gem 'pdfkit'
-gem 'wkhtmltopdf-binary'
-# gem 'request_store'
-#gem 'iconv'
-# markdown 转html
-gem 'redcarpet', '~> 3.4'
-
-gem 'rqrcode', '~> 0.10.1'
-gem 'rqrcode_png'
-
-gem 'acts-as-taggable-on', '~> 6.0'
-
-# a tree structure
-gem 'ancestry'
-gem 'acts_as_list'
-gem 'omniauth-cas'
-
-# profiler Middleware
-gem 'rack-mini-profiler'
-
-# object-based searching
-gem 'ransack'
-
-group :development, :test do
-  gem 'rspec-rails', '~> 3.8'
-end
-
-group :development do
-  gem 'prettier'
-  gem 'rubocop', '~> 0.52.0'
-  gem 'solargraph', '~> 0.38.0'
-  gem 'awesome_print'
-  gem 'web-console', '>= 3.3.0'
-  gem 'listen', '>= 3.0.5', '< 3.2'
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
-  gem "annotate", "~> 2.6.0"
-end
-
-group :test do
-  gem 'capybara', '>= 2.15', '< 4.0'
-  gem 'selenium-webdriver'
-  gem 'chromedriver-helper'
-end
-
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-#编码检测
-gem 'rchardet', '~> 1.8'
-
-# http client
-gem 'faraday', '~> 0.15.4'
-
-# view
-gem 'active_decorator'
-gem 'bootstrap', '~> 4.3.1'
-gem 'jquery-rails'
-gem 'simple_form'
-gem 'font-awesome-sass', '4.7.0'
-
-# i18n
-gem 'rails-i18n', '~> 5.1'
-
-# job
-gem 'sidekiq'
-gem 'sinatra'
-gem "sidekiq-cron", "~> 1.1"
-
-# batch insert
-gem 'bulk_insert'
-
-# elasticsearch
-gem 'searchkick'
-
-gem 'aasm'
-gem 'enumerize'
-
-gem 'diffy'
-
-gem 'deep_cloneable', '~> 3.0.0'
-
-# oauth2
-gem 'omniauth', '~> 1.9.0'
-gem 'omniauth-oauth2', '~> 1.6.0'
-
-# global var
-gem 'request_store'
-
-# 敏感词汇
-gem 'harmonious_dictionary', '~> 0.0.1'
-
-gem 'parallel', '~> 1.19', '>= 1.19.1'
-
-gem 'letter_avatar'
+source 'https://gems.ruby-china.com'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gem 'rails', '~> 5.2.0'
+gem 'mysql2', '>= 0.4.4', '< 0.6.0'
+gem 'puma', '~> 3.11'
+gem 'sass-rails', '~> 5.0'
+gem 'uglifier', '>= 1.3.0'
+
+# gem 'coffee-rails', '~> 4.2'
+gem 'turbolinks', '~> 5'
+gem 'jbuilder', '~> 2.5'
+gem 'groupdate', '~> 4.1.0'
+gem 'chartkick'
+gem 'grape-entity', '~> 0.7.1'
+gem 'kaminari', '~> 1.1', '>= 1.1.1'
+
+gem 'bootsnap', '>= 1.1.0', require: false
+
+gem 'chinese_pinyin'
+
+gem 'rack-cors'
+gem 'redis-rails'
+gem 'roo-xls'
+gem 'simple_xlsx_reader'
+
+gem 'rubyzip'
+
+gem 'spreadsheet'
+gem 'ruby-ole'
+# 导出为xlsx
+gem 'axlsx', '~> 3.0.0.pre'
+gem 'axlsx_rails', '~> 0.5.2'
+
+gem 'oauth2'
+#导出为pdf
+gem 'pdfkit'
+gem 'wkhtmltopdf-binary'
+# gem 'request_store'
+#gem 'iconv'
+# markdown 转html
+gem 'redcarpet', '~> 3.4'
+
+gem 'rqrcode', '~> 0.10.1'
+gem 'rqrcode_png'
+
+gem 'acts-as-taggable-on', '~> 6.0'
+
+# a tree structure
+gem 'ancestry'
+gem 'acts_as_list'
+gem 'omniauth-cas'
+
+# profiler Middleware
+gem 'rack-mini-profiler'
+
+# object-based searching
+gem 'ransack'
+
+group :development, :test do
+  gem 'rspec-rails', '~> 3.8'
+end
+
+group :development do
+  gem 'prettier'
+  gem 'rubocop', '~> 0.52.0'
+  gem 'solargraph', '~> 0.38.0'
+  gem 'awesome_print'
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem "annotate", "~> 2.6.0"
+end
+
+group :test do
+  gem 'capybara', '>= 2.15', '< 4.0'
+  gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+end
+
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+#编码检测
+gem 'rchardet', '~> 1.8'
+
+# http client
+gem 'faraday', '~> 0.15.4'
+
+# view
+gem 'active_decorator'
+gem 'bootstrap', '~> 4.3.1'
+gem 'jquery-rails'
+gem 'simple_form'
+gem 'font-awesome-sass', '4.7.0'
+
+# i18n
+gem 'rails-i18n', '~> 5.1'
+
+# job
+gem 'sidekiq'
+gem 'sinatra'
+gem "sidekiq-cron", "~> 1.1"
+
+# batch insert
+gem 'bulk_insert'
+
+# elasticsearch
+gem 'searchkick'
+
+gem 'aasm'
+gem 'enumerize'
+
+gem 'diffy'
+
+gem 'deep_cloneable', '~> 3.0.0'
+
+# oauth2
+gem 'omniauth', '~> 1.9.0'
+gem 'omniauth-oauth2', '~> 1.6.0'
+
+# global var
+gem 'request_store'
+
+# 敏感词汇
+gem 'harmonious_dictionary', '~> 0.0.1'
+
+gem 'parallel', '~> 1.19', '>= 1.19.1'
+
+gem 'letter_avatar'
+
+gem 'jwt'
+
+gem 'doorkeeper'
+
+gem 'doorkeeper-jwt'
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4e59a7e0..2ccd10ff 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -265,9 +265,11 @@ class ApplicationController < ActionController::Base
 			end
 		end
 
-		# if !User.current.logged? && Rails.env.development?
-		# 	User.current = User.find 1
-		# end
+		if !User.current.logged? && Rails.env.development?
+			user = User.find 1
+			User.current = user
+			start_user_session(user)
+		end
 
 
 		# 测试版前端需求
diff --git a/app/models/user.rb b/app/models/user.rb
index d3803a9f..2d2d15c5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -671,6 +671,21 @@ class User < Owner
     raise text
   end
 
+  def self.authenticate!(login, password)
+    user = self.where("login = ?  or mail = ? or phone = ? ", login.to_s.gsub(" ",''),login.to_s.gsub(" ",''),login.downcase.to_s.gsub(" ",'')).limit(1).first
+    return (user.check_password?(password) ? user : nil) unless user.nil?
+    nil
+  end
+
+  # Generate public/private keys
+  def generate_keys
+    key_size = (Rails.env == 'test' ? 512 : 2048)
+
+    serialized_private_key = OpenSSL::PKey::RSA::generate(key_size).to_s
+    serialized_public_key = OpenSSL::PKey::RSA.new(serialized_private_key)
+    [serialized_private_key, serialized_public_key]
+  end
+
   def show_real_name
     name = lastname + firstname
     if name.blank?
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
new file mode 100644
index 00000000..196e2503
--- /dev/null
+++ b/config/initializers/doorkeeper.rb
@@ -0,0 +1,553 @@
+# frozen_string_literal: true
+
+Doorkeeper.configure do
+  # Change the ORM that doorkeeper will use (requires ORM extensions installed).
+  # Check the list of supported ORMs here: https://github.com/doorkeeper-gem/doorkeeper#orms
+  orm :active_record
+
+  # This block will be called to check whether the resource owner is authenticated or not.
+  resource_owner_authenticator do
+    raise "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"
+    # Put your resource owner authentication logic here.
+    # Example implementation:
+      User.find_by(id: session[:www_user_id]) || redirect_to(new_user_session_url)
+  end
+
+  resource_owner_from_credentials do |routes|
+    User.authenticate!(params[:username], params[:password])
+  end
+
+  access_token_generator '::Doorkeeper::JWT'
+
+  admin_authenticator do
+    user = User.find_by_id(session[:www_user_id])
+    unless user #&& user.admin_or_business?
+      redirect_to root_url
+    end
+  end
+
+  # If you didn't skip applications controller from Doorkeeper routes in your application routes.rb
+  # file then you need to declare this block in order to restrict access to the web interface for
+  # adding oauth authorized applications. In other case it will return 403 Forbidden response
+  # every time somebody will try to access the admin web interface.
+  #
+  # admin_authenticator do
+  #   # Put your admin authentication logic here.
+  #   # Example implementation:
+  #
+  #   if current_user
+  #     head :forbidden unless current_user.admin?
+  #   else
+  #     redirect_to sign_in_url
+  #   end
+  # end
+
+  # You can use your own model classes if you need to extend (or even override) default
+  # Doorkeeper models such as `Application`, `AccessToken` and `AccessGrant.
+  #
+  # Be default Doorkeeper ActiveRecord ORM uses it's own classes:
+  #
+  # access_token_class "Doorkeeper::AccessToken"
+  # access_grant_class "Doorkeeper::AccessGrant"
+  # application_class "Doorkeeper::Application"
+  #
+  # Don't forget to include Doorkeeper ORM mixins into your custom models:
+  #
+  #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken - for access token
+  #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessGrant - for access grant
+  #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::Application - for application (OAuth2 clients)
+  #
+  # For example:
+  #
+  # access_token_class "MyAccessToken"
+  #
+  # class MyAccessToken < ApplicationRecord
+  #   include ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken
+  #
+  #   self.table_name = "hey_i_wanna_my_name"
+  #
+  #   def destroy_me!
+  #     destroy
+  #   end
+  # end
+
+  # Enables polymorphic Resource Owner association for Access Tokens and Access Grants.
+  # By default this option is disabled.
+  #
+  # Make sure you properly setup you database and have all the required columns (run
+  # `bundle exec rails generate doorkeeper:enable_polymorphic_resource_owner` and execute Rails
+  # migrations).
+  #
+  # If this option enabled, Doorkeeper will store not only Resource Owner primary key
+  # value, but also it's type (class name). See "Polymorphic Associations" section of
+  # Rails guides: https://guides.rubyonrails.org/association_basics.html#polymorphic-associations
+  #
+  # [NOTE] If you apply this option on already existing project don't forget to manually
+  # update `resource_owner_type` column in the database and fix migration template as it will
+  # set NOT NULL constraint for Access Grants table.
+  #
+  # use_polymorphic_resource_owner
+
+  # If you are planning to use Doorkeeper in Rails 5 API-only application, then you might
+  # want to use API mode that will skip all the views management and change the way how
+  # Doorkeeper responds to a requests.
+  #
+  # api_only
+
+  # Enforce token request content type to application/x-www-form-urlencoded.
+  # It is not enabled by default to not break prior versions of the gem.
+  #
+  # enforce_content_type
+
+  # Authorization Code expiration time (default: 10 minutes).
+  #
+  # authorization_code_expires_in 10.minutes
+
+  # Access token expiration time (default: 2 hours).
+  # If you want to disable expiration, set this to `nil`.
+  #
+  # access_token_expires_in 2.hours
+
+  # Assign custom TTL for access tokens. Will be used instead of access_token_expires_in
+  # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to
+  # +access_token_expires_in+ configuration option value. If you really need to issue a
+  # non-expiring access token (which is not recommended) then you need to return
+  # Float::INFINITY from this block.
+  #
+  # `context` has the following properties available:
+  #
+  #   * `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
+  #   * `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
+  #   * `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
+  #   * `resource_owner` - authorized resource owner instance (if present)
+  #
+  # custom_access_token_expires_in do |context|
+  #   context.client.additional_settings.implicit_oauth_expiration
+  # end
+
+  # Use a custom class for generating the access token.
+  # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-access-token-generator
+  #
+  # access_token_generator '::Doorkeeper::JWT'
+
+  # The controller +Doorkeeper::ApplicationController+ inherits from.
+  # Defaults to +ActionController::Base+ unless +api_only+ is set, which changes the default to
+  # +ActionController::API+. The return value of this option must be a stringified class name.
+  # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-controllers
+  #
+  # base_controller 'ApplicationController'
+
+  # Reuse access token for the same resource owner within an application (disabled by default).
+  #
+  # This option protects your application from creating new tokens before old valid one becomes
+  # expired so your database doesn't bloat. Keep in mind that when this option is `on` Doorkeeper
+  # doesn't updates existing token expiration time, it will create a new token instead.
+  # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
+  #
+  # You can not enable this option together with +hash_token_secrets+.
+  #
+  # reuse_access_token
+
+  # In case you enabled `reuse_access_token` option Doorkeeper will try to find matching
+  # token using `matching_token_for` Access Token API that searches for valid records
+  # in batches in order not to pollute the memory with all the database records. By default
+  # Doorkeeper uses batch size of 10 000 records. You can increase or decrease this value
+  # depending on your needs and server capabilities.
+  #
+  # token_lookup_batch_size 10_000
+
+  # Set a limit for token_reuse if using reuse_access_token option
+  #
+  # This option limits token_reusability to some extent.
+  # If not set then access_token will be reused unless it expires.
+  # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/1189
+  #
+  # This option should be a percentage(i.e. (0,100])
+  #
+  # token_reuse_limit 100
+
+  # Only allow one valid access token obtained via client credentials
+  # per client. If a new access token is obtained before the old one
+  # expired, the old one gets revoked (disabled by default)
+  #
+  # When enabling this option, make sure that you do not expect multiple processes
+  # using the same credentials at the same time (e.g. web servers spanning
+  # multiple machines and/or processes).
+  #
+  # revoke_previous_client_credentials_token
+
+  # Hash access and refresh tokens before persisting them.
+  # This will disable the possibility to use +reuse_access_token+
+  # since plain values can no longer be retrieved.
+  #
+  # Note: If you are already a user of doorkeeper and have existing tokens
+  # in your installation, they will be invalid without adding 'fallback: :plain'.
+  #
+  # hash_token_secrets
+  # By default, token secrets will be hashed using the
+  # +Doorkeeper::Hashing::SHA256+ strategy.
+  #
+  # If you wish to use another hashing implementation, you can override
+  # this strategy as follows:
+  #
+  # hash_token_secrets using: '::Doorkeeper::Hashing::MyCustomHashImpl'
+  #
+  # Keep in mind that changing the hashing function will invalidate all existing
+  # secrets, if there are any.
+
+  # Hash application secrets before persisting them.
+  #
+  # hash_application_secrets
+  #
+  # By default, applications will be hashed
+  # with the +Doorkeeper::SecretStoring::SHA256+ strategy.
+  #
+  # If you wish to use bcrypt for application secret hashing, uncomment
+  # this line instead:
+  #
+  # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt'
+
+  # When the above option is enabled, and a hashed token or secret is not found,
+  # you can allow to fall back to another strategy. For users upgrading
+  # doorkeeper and wishing to enable hashing, you will probably want to enable
+  # the fallback to plain tokens.
+  #
+  # This will ensure that old access tokens and secrets
+  # will remain valid even if the hashing above is enabled.
+  #
+  # This can be done by adding 'fallback: plain', e.g. :
+  #
+  # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt', fallback: :plain
+
+  # Issue access tokens with refresh token (disabled by default), you may also
+  # pass a block which accepts `context` to customize when to give a refresh
+  # token or not. Similar to +custom_access_token_expires_in+, `context` has
+  # the following properties:
+  #
+  # `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
+  # `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
+  # `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
+  #
+  # use_refresh_token
+
+  # Provide support for an owner to be assigned to each registered application (disabled by default)
+  # Optional parameter confirmation: true (default: false) if you want to enforce ownership of
+  # a registered application
+  # NOTE: you must also run the rails g doorkeeper:application_owner generator
+  # to provide the necessary support
+  #
+  # enable_application_owner confirmation: false
+
+  # Define access token scopes for your provider
+  # For more information go to
+  # https://doorkeeper.gitbook.io/guides/ruby-on-rails/scopes
+  #
+  # default_scopes  :public
+  # optional_scopes :write, :update
+
+  # Allows to restrict only certain scopes for grant_type.
+  # By default, all the scopes will be available for all the grant types.
+  #
+  # Keys to this hash should be the name of grant_type and
+  # values should be the array of scopes for that grant type.
+  # Note: scopes should be from configured_scopes (i.e. default or optional)
+  #
+  # scopes_by_grant_type password: [:write], client_credentials: [:update]
+
+  # Forbids creating/updating applications with arbitrary scopes that are
+  # not in configuration, i.e. +default_scopes+ or +optional_scopes+.
+  # (disabled by default)
+  #
+  # enforce_configured_scopes
+
+  # Change the way client credentials are retrieved from the request object.
+  # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
+  # falls back to the `:client_id` and `:client_secret` params from the `params` object.
+  # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
+  # for more information on customization
+  #
+  # client_credentials :from_basic, :from_params
+
+  # Change the way access token is authenticated from the request object.
+  # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
+  # falls back to the `:access_token` or `:bearer_token` params from the `params` object.
+  # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
+  # for more information on customization
+  #
+  # access_token_methods :from_bearer_authorization, :from_access_token_param, :from_bearer_param
+
+  # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled
+  # by default in non-development environments). OAuth2 delegates security in
+  # communication to the HTTPS protocol so it is wise to keep this enabled.
+  #
+  # Callable objects such as proc, lambda, block or any object that responds to
+  # #call can be used in order to allow conditional checks (to allow non-SSL
+  # redirects to localhost for example).
+  #
+  # force_ssl_in_redirect_uri !Rails.env.development?
+  #
+  # force_ssl_in_redirect_uri { |uri| uri.host != 'localhost' }
+
+  # Specify what redirect URI's you want to block during Application creation.
+  # Any redirect URI is allowed by default.
+  #
+  # You can use this option in order to forbid URI's with 'javascript' scheme
+  # for example.
+  #
+  # forbid_redirect_uri { |uri| uri.scheme.to_s.downcase == 'javascript' }
+
+  # Allows to set blank redirect URIs for Applications in case Doorkeeper configured
+  # to use URI-less OAuth grant flows like Client Credentials or Resource Owner
+  # Password Credentials. The option is on by default and checks configured grant
+  # types, but you **need** to manually drop `NOT NULL` constraint from `redirect_uri`
+  # column for `oauth_applications` database table.
+  #
+  # You can completely disable this feature with:
+  #
+  # allow_blank_redirect_uri false
+  #
+  # Or you can define your custom check:
+  #
+  # allow_blank_redirect_uri do |grant_flows, client|
+  #   client.superapp?
+  # end
+
+  # Specify how authorization errors should be handled.
+  # By default, doorkeeper renders json errors when access token
+  # is invalid, expired, revoked or has invalid scopes.
+  #
+  # If you want to render error response yourself (i.e. rescue exceptions),
+  # set +handle_auth_errors+ to `:raise` and rescue Doorkeeper::Errors::InvalidToken
+  # or following specific errors:
+  #
+  #   Doorkeeper::Errors::TokenForbidden, Doorkeeper::Errors::TokenExpired,
+  #   Doorkeeper::Errors::TokenRevoked, Doorkeeper::Errors::TokenUnknown
+  #
+  # handle_auth_errors :raise
+
+  # Customize token introspection response.
+  # Allows to add your own fields to default one that are required by the OAuth spec
+  # for the introspection response. It could be `sub`, `aud` and so on.
+  # This configuration option can be a proc, lambda or any Ruby object responds
+  # to `.call` method and result of it's invocation must be a Hash.
+  #
+  # custom_introspection_response do |token, context|
+  #   {
+  #     "sub": "Z5O3upPC88QrAjx00dis",
+  #     "aud": "https://protected.example.net/resource",
+  #     "username": User.find(token.resource_owner_id).username
+  #   }
+  # end
+  #
+  # or
+  #
+  # custom_introspection_response CustomIntrospectionResponder
+
+  # Specify what grant flows are enabled in array of Strings. The valid
+  # strings and the flows they enable are:
+  #
+  # "authorization_code" => Authorization Code Grant Flow
+  # "implicit"           => Implicit Grant Flow
+  # "password"           => Resource Owner Password Credentials Grant Flow
+  # "client_credentials" => Client Credentials Grant Flow
+  #
+  # If not specified, Doorkeeper enables authorization_code and
+  # client_credentials.
+  #
+  # implicit and password grant flows have risks that you should understand
+  # before enabling:
+  #   https://datatracker.ietf.org/doc/html/rfc6819#section-4.4.2
+  #   https://datatracker.ietf.org/doc/html/rfc6819#section-4.4.3
+  #
+  #
+  grant_flows %w[authorization_code client_credentials password]
+
+  # Allows to customize OAuth grant flows that +each+ application support.
+  # You can configure a custom block (or use a class respond to `#call`) that must
+  # return `true` in case Application instance supports requested OAuth grant flow
+  # during the authorization request to the server. This configuration +doesn't+
+  # set flows per application, it only allows to check if application supports
+  # specific grant flow.
+  #
+  # For example you can add an additional database column to `oauth_applications` table,
+  # say `t.array :grant_flows, default: []`, and store allowed grant flows that can
+  # be used with this application there. Then when authorization requested Doorkeeper
+  # will call this block to check if specific Application (passed with client_id and/or
+  # client_secret) is allowed to perform the request for the specific grant type
+  # (authorization, password, client_credentials, etc).
+  #
+  # Example of the block:
+  #
+  #   ->(flow, client) { client.grant_flows.include?(flow) }
+  #
+  # In case this option invocation result is `false`, Doorkeeper server returns
+  # :unauthorized_client error and stops the request.
+  #
+  # @param allow_grant_flow_for_client [Proc] Block or any object respond to #call
+  # @return [Boolean] `true` if allow or `false` if forbid the request
+  #
+  # allow_grant_flow_for_client do |grant_flow, client|
+  #   # `grant_flows` is an Array column with grant
+  #   # flows that application supports
+  #
+  #   client.grant_flows.include?(grant_flow)
+  # end
+
+  # If you need arbitrary Resource Owner-Client authorization you can enable this option
+  # and implement the check your need. Config option must respond to #call and return
+  # true in case resource owner authorized for the specific application or false in other
+  # cases.
+  #
+  # Be default all Resource Owners are authorized to any Client (application).
+  #
+  # authorize_resource_owner_for_client do |client, resource_owner|
+  #   resource_owner.admin? || client.owners_allowlist.include?(resource_owner)
+  # end
+
+  # Hook into the strategies' request & response life-cycle in case your
+  # application needs advanced customization or logging:
+  #
+  # before_successful_strategy_response do |request|
+  #   puts "BEFORE HOOK FIRED! #{request}"
+  # end
+  #
+  # after_successful_strategy_response do |request, response|
+  #   puts "AFTER HOOK FIRED! #{request}, #{response}"
+  # end
+
+  # Hook into Authorization flow in order to implement Single Sign Out
+  # or add any other functionality. Inside the block you have an access
+  # to `controller` (authorizations controller instance) and `context`
+  # (Doorkeeper::OAuth::Hooks::Context instance) which provides pre auth
+  # or auth objects with issued token based on hook type (before or after).
+  #
+  # before_successful_authorization do |controller, context|
+  #   Rails.logger.info(controller.request.params.inspect)
+  #
+  #   Rails.logger.info(context.pre_auth.inspect)
+  # end
+  #
+  # after_successful_authorization do |controller, context|
+  #   controller.session[:logout_urls] <<
+  #     Doorkeeper::Application
+  #       .find_by(controller.request.params.slice(:redirect_uri))
+  #       .logout_uri
+  #
+  #   Rails.logger.info(context.auth.inspect)
+  #   Rails.logger.info(context.issued_token)
+  # end
+
+  # Under some circumstances you might want to have applications auto-approved,
+  # so that the user skips the authorization step.
+  # For example if dealing with a trusted application.
+  #
+  # skip_authorization do |resource_owner, client|
+  #   client.superapp? or resource_owner.admin?
+  # end
+
+  # Configure custom constraints for the Token Introspection request.
+  # By default this configuration option allows to introspect a token by another
+  # token of the same application, OR to introspect the token that belongs to
+  # authorized client (from authenticated client) OR when token doesn't
+  # belong to any client (public token). Otherwise requester has no access to the
+  # introspection and it will return response as stated in the RFC.
+  #
+  # Block arguments:
+  #
+  # @param token [Doorkeeper::AccessToken]
+  #   token to be introspected
+  #
+  # @param authorized_client [Doorkeeper::Application]
+  #   authorized client (if request is authorized using Basic auth with
+  #   Client Credentials for example)
+  #
+  # @param authorized_token [Doorkeeper::AccessToken]
+  #   Bearer token used to authorize the request
+  #
+  # In case the block returns `nil` or `false` introspection responses with 401 status code
+  # when using authorized token to introspect, or you'll get 200 with { "active": false } body
+  # when using authorized client to introspect as stated in the
+  # RFC 7662 section 2.2. Introspection Response.
+  #
+  # Using with caution:
+  # Keep in mind that these three parameters pass to block can be nil as following case:
+  #  `authorized_client` is nil if and only if `authorized_token` is present, and vice versa.
+  #  `token` will be nil if and only if `authorized_token` is present.
+  # So remember to use `&` or check if it is present before calling method on
+  # them to make sure you doesn't get NoMethodError exception.
+  #
+  # You can define your custom check:
+  #
+  # allow_token_introspection do |token, authorized_client, authorized_token|
+  #   if authorized_token
+  #     # customize: require `introspection` scope
+  #     authorized_token.application == token&.application ||
+  #       authorized_token.scopes.include?("introspection")
+  #   elsif token.application
+  #     # `protected_resource` is a new database boolean column, for example
+  #     authorized_client == token.application || authorized_client.protected_resource?
+  #   else
+  #     # public token (when token.application is nil, token doesn't belong to any application)
+  #     true
+  #   end
+  # end
+  #
+  # Or you can completely disable any token introspection:
+  #
+  # allow_token_introspection false
+  #
+  # If you need to block the request at all, then configure your routes.rb or web-server
+  # like nginx to forbid the request.
+
+  # WWW-Authenticate Realm (default: "Doorkeeper").
+  #
+  # realm "Doorkeeper"
+end
+
+
+Doorkeeper::JWT.configure do
+  # Set the payload for the JWT token. This should contain unique information
+  # about the user. Defaults to a randomly generated token in a hash:
+  #     { token: "RANDOM-TOKEN" }
+  token_payload do |opts|
+    user = User.find(opts[:resource_owner_id])
+
+    {
+      iss: 'My App',
+      iat: Time.current.utc.to_i,
+
+      # @see JWT reserved claims - https://tools.ietf.org/html/draft-jones-json-web-token-07#page-7
+      jti: SecureRandom.uuid,
+
+      user: {
+        id: user.id,
+        login: user.login,
+        mail: user.mail
+      }
+    }
+  end
+
+  # Optionally set additional headers for the JWT. See
+  # https://tools.ietf.org/html/rfc7515#section-4.1
+  token_headers do |opts|
+    { kid: opts[:application][:uid] }
+  end
+
+  # Use the application secret specified in the access grant token. Defaults to
+  # `false`. If you specify `use_application_secret true`, both `secret_key` and
+  # `secret_key_path` will be ignored.
+  use_application_secret false
+
+  # Set the encryption secret. This would be shared with any other applications
+  # that should be able to read the payload of the token. Defaults to "secret".
+  secret_key ENV['JWT_SECRET']
+
+  # If you want to use RS* encoding specify the path to the RSA key to use for
+  # signing. If you specify a `secret_key_path` it will be used instead of
+  # `secret_key`.
+  secret_key_path File.join('path', 'to', 'file.pem')
+
+  # Specify encryption type (https://github.com/progrium/ruby-jwt). Defaults to
+  # `nil`.
+  encryption_method :hs512
+end
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
new file mode 100644
index 00000000..99fa3d4d
--- /dev/null
+++ b/config/locales/doorkeeper.en.yml
@@ -0,0 +1,151 @@
+en:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: 'Name'
+        redirect_uri: 'Redirect URI'
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: 'cannot contain a fragment.'
+              invalid_uri: 'must be a valid URI.'
+              unspecified_scheme: 'must specify a scheme.'
+              relative_uri: 'must be an absolute URI.'
+              secured_uri: 'must be an HTTPS/SSL URI.'
+              forbidden_uri: 'is forbidden by the server.'
+            scopes:
+              not_match_configured: "doesn't match configured on the server."
+
+  doorkeeper:
+    applications:
+      confirmations:
+        destroy: 'Are you sure?'
+      buttons:
+        edit: 'Edit'
+        destroy: 'Destroy'
+        submit: 'Submit'
+        cancel: 'Cancel'
+        authorize: 'Authorize'
+      form:
+        error: 'Whoops! Check your form for possible errors'
+      help:
+        confidential: 'Application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.'
+        redirect_uri: 'Use one line per URI'
+        blank_redirect_uri: "Leave it blank if you configured your provider to use Client Credentials, Resource Owner Password Credentials or any other grant type that doesn't require redirect URI."
+        scopes: 'Separate scopes with spaces. Leave blank to use the default scopes.'
+      edit:
+        title: 'Edit application'
+      index:
+        title: 'Your applications'
+        new: 'New Application'
+        name: 'Name'
+        callback_url: 'Callback URL'
+        confidential: 'Confidential?'
+        actions: 'Actions'
+        confidentiality:
+          'yes': 'Yes'
+          'no': 'No'
+      new:
+        title: 'New Application'
+      show:
+        title: 'Application: %{name}'
+        application_id: 'UID'
+        secret: 'Secret'
+        secret_hashed: 'Secret hashed'
+        scopes: 'Scopes'
+        confidential: 'Confidential'
+        callback_urls: 'Callback urls'
+        actions: 'Actions'
+        not_defined: 'Not defined'
+
+    authorizations:
+      buttons:
+        authorize: 'Authorize'
+        deny: 'Deny'
+      error:
+        title: 'An error has occurred'
+      new:
+        title: 'Authorization required'
+        prompt: 'Authorize %{client_name} to use your account?'
+        able_to: 'This application will be able to'
+      show:
+        title: 'Authorization code'
+      form_post:
+        title: 'Submit this form'
+
+    authorized_applications:
+      confirmations:
+        revoke: 'Are you sure?'
+      buttons:
+        revoke: 'Revoke'
+      index:
+        title: 'Your authorized applications'
+        application: 'Application'
+        created_at: 'Created At'
+        date_format: '%Y-%m-%d %H:%M:%S'
+
+    pre_authorization:
+      status: 'Pre-authorization'
+
+    errors:
+      messages:
+        # Common error messages
+        invalid_request:
+          unknown: 'The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.'
+          missing_param: 'Missing required parameter: %{value}.'
+          request_not_authorized: 'Request need to be authorized. Required parameter for authorizing request is missing or invalid.'
+        invalid_redirect_uri: "The requested redirect uri is malformed or doesn't match client redirect URI."
+        unauthorized_client: 'The client is not authorized to perform this request using this method.'
+        access_denied: 'The resource owner or authorization server denied the request.'
+        invalid_scope: 'The requested scope is invalid, unknown, or malformed.'
+        invalid_code_challenge_method: 'The code challenge method must be plain or S256.'
+        server_error: 'The authorization server encountered an unexpected condition which prevented it from fulfilling the request.'
+        temporarily_unavailable: 'The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.'
+
+        # Configuration error messages
+        credential_flow_not_configured: 'Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.'
+        resource_owner_authenticator_not_configured: 'Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfigured.'
+        admin_authenticator_not_configured: 'Access to admin panel is forbidden due to Doorkeeper.configure.admin_authenticator being unconfigured.'
+
+        # Access grant errors
+        unsupported_response_type: 'The authorization server does not support this response type.'
+        unsupported_response_mode: 'The authorization server does not support this response mode.'
+
+        # Access token errors
+        invalid_client: 'Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.'
+        invalid_grant: 'The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.'
+        unsupported_grant_type: 'The authorization grant type is not supported by the authorization server.'
+
+        invalid_token:
+          revoked: "The access token was revoked"
+          expired: "The access token expired"
+          unknown: "The access token is invalid"
+        revoke:
+          unauthorized: "You are not authorized to revoke this token"
+
+        forbidden_token:
+          missing_scope: 'Access to this resource requires scope "%{oauth_scopes}".'
+
+    flash:
+      applications:
+        create:
+          notice: 'Application created.'
+        destroy:
+          notice: 'Application deleted.'
+        update:
+          notice: 'Application updated.'
+      authorized_applications:
+        destroy:
+          notice: 'Application revoked.'
+
+    layouts:
+      admin:
+        title: 'Doorkeeper'
+        nav:
+          oauth2_provider: 'OAuth2 Provider'
+          applications: 'Applications'
+          home: 'Home'
+      application:
+        title: 'OAuth authorization required'
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
new file mode 100644
index 00000000..3a00820a
--- /dev/null
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -0,0 +1,126 @@
+zh-CN:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: '名称'
+        redirect_uri: '登录回调地址'
+        scopes: '权限范围'
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: '不能包含片段（#）'
+              invalid_uri: '必须是有效的 URL 格式'
+              relative_uri: '必须是绝对的 URL 地址'
+              secured_uri: '必须是 HTTPS/SSL 的 URL 地址'
+
+  doorkeeper:
+    applications:
+      confirmations:
+        destroy: '确定要删除应用吗？'
+      buttons:
+        edit: '编辑'
+        destroy: '删除'
+        submit: '提交'
+        cancel: '取消'
+        authorize: '授权'
+      form:
+        error: '抱歉! 提交信息的时候遇到了下面的错误'
+      help:
+        redirect_uri: '每行只能有一个 URL'
+        native_redirect_uri: '使用 %{native_redirect_uri} 作为本地测试'
+        scopes: '用空格隔开权限范围，留空则使用默认设置'
+      edit:
+        title: '修改应用'
+      index:
+        title: '你的应用'
+        new: '创建新应用'
+        name: '名称'
+        callback_url: '登录回调地址'
+      new:
+        title: '创建新应用'
+      show:
+        title: '应用：%{name}'
+        application_id: '应用 ID'
+        secret: '私钥'
+        scopes: '权限范围'
+        callback_urls: '登录回调地址'
+        confidential: 'Confidential'
+        actions: '操作'
+
+    authorizations:
+      buttons:
+        authorize: '授权'
+        deny: '拒绝'
+      error:
+        title: '存在错误'
+      new:
+        title: '需要你授权'
+        prompt: '授权 %{client_name} 使用你的帐号?'
+        able_to: '此应用将会'
+      show:
+        title: '授权码'
+
+    authorized_applications:
+      confirmations:
+        revoke: '确定要注销此应用的认证信息吗?'
+      buttons:
+        revoke: '注销'
+      index:
+        title: '你授权的应用列表'
+        application: '应用'
+        created_at: '授权时间'
+        date_format: '%Y-%m-%d %H:%M:%S'
+
+    errors:
+      messages:
+        # Common error messages
+        invalid_request: '这个请求缺少必要的参数，或者参数值、格式不正确'
+        invalid_redirect_uri: '无效的登录回调地址'
+        unauthorized_client: '未授权的应用，请求无法执行'
+        access_denied: '用户或服务器拒绝了请求'
+        invalid_scope: '请求范围无效、未知或格式不正确'
+        server_error: '服务器异常，无法处理请求'
+        temporarily_unavailable: '服务器维护中或负载过高，暂时无法处理请求'
+
+        #configuration error messages
+        credential_flow_not_configured: 'Resource Owner Password Credentials flow failed，原因是 Doorkeeper.configure.resource_owner_from_credentials 尚未设置。'
+        resource_owner_authenticator_not_configured: 'Resource Owner find failed，原因是 Doorkeeper.configure.resource_owner_authenticator 尚未设置。'
+
+        # Access grant errors
+        unsupported_response_type: '服务器不支持这种响应类型'
+
+        # Access token errors
+        invalid_client: '由于未知、不支持或没有客户端，认证失败'
+        invalid_grant: '授权方式无效，或者登录回调地址无效、过期或已被撤销'
+        unsupported_grant_type: '服务器不支持此类型的授权方式'
+
+        # Password Access token errors
+        invalid_resource_owner: '资源所有者认证无效或没有所有者'
+
+        invalid_token:
+          revoked: "访问令牌已被吊销"
+          expired: "访问令牌已过期"
+          unknown: "访问令牌无效"
+
+    flash:
+      applications:
+        create:
+          notice: '应用创建成功'
+        destroy:
+          notice: '应用删除成功'
+        update:
+          notice: '应用修改成功'
+      authorized_applications:
+        destroy:
+          notice: '已成功注销了应用的认证信息'
+
+    layouts:
+      admin:
+        nav:
+          oauth2_provider: 'OAuth2 提供商'
+          applications: '应用'
+          home: '首页'
+      application:
+        title: 'OAuth 认证'
diff --git a/config/routes.rb b/config/routes.rb
index b585f077..4b434f77 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
 
+  use_doorkeeper
   require 'sidekiq/web'
   require 'sidekiq/cron/web'
   require 'admin_constraint'
diff --git a/db/migrate/20220616040105_create_doorkeeper_tables.rb b/db/migrate/20220616040105_create_doorkeeper_tables.rb
new file mode 100644
index 00000000..b4ec636e
--- /dev/null
+++ b/db/migrate/20220616040105_create_doorkeeper_tables.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+class CreateDoorkeeperTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :oauth_applications do |t|
+      t.string  :name,    null: false
+      t.string  :uid,     null: false
+      t.string  :secret,  null: false
+
+      # Remove `null: false` if you are planning to use grant flows
+      # that doesn't require redirect URI to be used during authorization
+      # like Client Credentials flow or Resource Owner Password.
+      t.text    :redirect_uri, null: false
+      t.string  :scopes,       null: false, default: ''
+      t.boolean :confidential, null: false, default: true
+      t.timestamps             null: false
+    end
+
+    add_index :oauth_applications, :uid, unique: true
+
+    create_table :oauth_access_grants do |t|
+      t.references :resource_owner,  null: false
+      t.references :application,     null: false
+      t.string   :token,             null: false
+      t.integer  :expires_in,        null: false
+      t.text     :redirect_uri,      null: false
+      t.datetime :created_at,        null: false
+      t.datetime :revoked_at
+      t.string   :scopes,            null: false, default: ''
+    end
+
+    add_index :oauth_access_grants, :token, unique: true
+    add_foreign_key(
+      :oauth_access_grants,
+      :oauth_applications,
+      column: :application_id
+    )
+
+    create_table :oauth_access_tokens do |t|
+      t.references :resource_owner, index: true
+
+      # Remove `null: false` if you are planning to use Password
+      # Credentials Grant flow that doesn't require an application.
+      t.references :application,    null: false
+
+      # If you use a custom token generator you may need to change this column
+      # from string to text, so that it accepts tokens larger than 255
+      # characters. More info on custom token generators in:
+      # https://github.com/doorkeeper-gem/doorkeeper/tree/v3.0.0.rc1#custom-access-token-generator
+      #
+      # t.text :token, null: false
+      t.string :token, null: false
+
+      t.string   :refresh_token
+      t.integer  :expires_in
+      t.datetime :revoked_at
+      t.datetime :created_at, null: false
+      t.string   :scopes
+
+      # The authorization server MAY issue a new refresh token, in which case
+      # *the client MUST discard the old refresh token* and replace it with the
+      # new refresh token. The authorization server MAY revoke the old
+      # refresh token after issuing a new refresh token to the client.
+      # @see https://datatracker.ietf.org/doc/html/rfc6749#section-6
+      #
+      # Doorkeeper implementation: if there is a `previous_refresh_token` column,
+      # refresh tokens will be revoked after a related access token is used.
+      # If there is no `previous_refresh_token` column, previous tokens are
+      # revoked as soon as a new access token is created.
+      #
+      # Comment out this line if you want refresh tokens to be instantly
+      # revoked after use.
+      t.string   :previous_refresh_token, null: false, default: ""
+    end
+
+    add_index :oauth_access_tokens, :token, unique: true
+    add_index :oauth_access_tokens, :refresh_token, unique: true
+    add_foreign_key(
+      :oauth_access_tokens,
+      :oauth_applications,
+      column: :application_id
+    )
+
+    # Uncomment below to ensure a valid reference to the resource owner's table
+    # add_foreign_key :oauth_access_grants, <model>, column: :resource_owner_id
+    # add_foreign_key :oauth_access_tokens, <model>, column: :resource_owner_id
+  end
+end

From 21ccedab9c4fe6195a24b5ec07f052567f5f6df5 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 17 Jun 2022 18:33:37 +0800
Subject: [PATCH 069/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20doorkeeper=20?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=94=9F=E6=88=90jwt=20token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile.lock                                  |   7 +
 config/initializers/doorkeeper.rb             |  11 +-
 config/locales/doorkeeper.zh-CN.yml           | 177 +++++++++---------
 ...oauth_access_tokens_token_column_length.rb |   5 +
 4 files changed, 112 insertions(+), 88 deletions(-)
 create mode 100644 db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index b1dc2cca..99f40ad9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,6 +106,10 @@ GEM
       activerecord (>= 3.1.0, < 7)
     diff-lcs (1.3)
     diffy (3.3.0)
+    doorkeeper (5.5.4)
+      railties (>= 5)
+    doorkeeper-jwt (0.4.1)
+      jwt (>= 2.1)
     e2mmap (0.1.0)
     elasticsearch (7.5.0)
       elasticsearch-api (= 7.5.0)
@@ -450,6 +454,8 @@ DEPENDENCIES
   chromedriver-helper
   deep_cloneable (~> 3.0.0)
   diffy
+  doorkeeper
+  doorkeeper-jwt
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
@@ -458,6 +464,7 @@ DEPENDENCIES
   harmonious_dictionary (~> 0.0.1)
   jbuilder (~> 2.5)
   jquery-rails
+  jwt
   kaminari (~> 1.1, >= 1.1.1)
   letter_avatar
   listen (>= 3.0.5, < 3.2)
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 196e2503..4f9db8cd 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -7,7 +7,7 @@ Doorkeeper.configure do
 
   # This block will be called to check whether the resource owner is authenticated or not.
   resource_owner_authenticator do
-    raise "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"
+    # raise "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"
     # Put your resource owner authentication logic here.
     # Example implementation:
       User.find_by(id: session[:www_user_id]) || redirect_to(new_user_session_url)
@@ -228,7 +228,7 @@ Doorkeeper.configure do
   # `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
   # `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
   #
-  # use_refresh_token
+  use_refresh_token
 
   # Provide support for an owner to be assigned to each registered application (disabled by default)
   # Optional parameter confirmation: true (default: false) if you want to enforce ownership of
@@ -304,7 +304,7 @@ Doorkeeper.configure do
   #
   # You can completely disable this feature with:
   #
-  # allow_blank_redirect_uri false
+  allow_blank_redirect_uri true
   #
   # Or you can define your custom check:
   #
@@ -444,6 +444,9 @@ Doorkeeper.configure do
   # skip_authorization do |resource_owner, client|
   #   client.superapp? or resource_owner.admin?
   # end
+  skip_authorization do 
+    true 
+  end
 
   # Configure custom constraints for the Token Introspection request.
   # By default this configuration option allows to introspect a token by another
@@ -540,7 +543,7 @@ Doorkeeper::JWT.configure do
 
   # Set the encryption secret. This would be shared with any other applications
   # that should be able to read the payload of the token. Defaults to "secret".
-  secret_key ENV['JWT_SECRET']
+  secret_key ENV['JWT_SECRET'] || "forgeplus"
 
   # If you want to use RS* encoding specify the path to the RSA key to use for
   # signing. If you specify a `secret_key_path` it will be used instead of
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 3a00820a..f05f65a5 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -2,125 +2,134 @@ zh-CN:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: '名称'
-        redirect_uri: '登录回调地址'
-        scopes: '权限范围'
+        name: 应用名称
+        redirect_uri: 重定向 URI
     errors:
       models:
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: '不能包含片段（#）'
-              invalid_uri: '必须是有效的 URL 格式'
-              relative_uri: '必须是绝对的 URL 地址'
-              secured_uri: '必须是 HTTPS/SSL 的 URL 地址'
-
+              fragment_present: 不能包含网址片段（#）
+              invalid_uri: 必须是有效的 URI 格式
+              unspecified_scheme: must specify a scheme.
+              relative_uri: 必须是绝对的 URI 地址
+              secured_uri: 必须是 HTTPS/SSL 的 URI 地址
+              forbidden_uri: 被服务器禁止。
+            scopes:
+              not_match_configured: 不匹配服务器上的配置。
   doorkeeper:
     applications:
       confirmations:
-        destroy: '确定要删除应用吗？'
+        destroy: 确定要删除应用吗？
       buttons:
-        edit: '编辑'
-        destroy: '删除'
-        submit: '提交'
-        cancel: '取消'
-        authorize: '授权'
+        edit: 编辑
+        destroy: 删除
+        submit: 提交
+        cancel: 取消
+        authorize: 授权
       form:
-        error: '抱歉! 提交信息的时候遇到了下面的错误'
+        error: 抱歉! 提交信息的时候遇到了下面的错误
       help:
-        redirect_uri: '每行只能有一个 URL'
-        native_redirect_uri: '使用 %{native_redirect_uri} 作为本地测试'
-        scopes: '用空格隔开权限范围，留空则使用默认设置'
+        confidential: 应用程序的client secret可以保密，但原生移动应用和单页应用将无法保护client secret。
+        redirect_uri: 每行只能有一个 URI
+        blank_redirect_uri: Leave it blank if you configured your provider to use Client Credentials, Resource Owner Password Credentials or any other grant type that doesn't require redirect URI.
+        scopes: 用空格分割权限范围，留空则使用默认设置
       edit:
-        title: '修改应用'
+        title: 修改应用
       index:
-        title: '你的应用'
-        new: '创建新应用'
-        name: '名称'
-        callback_url: '登录回调地址'
+        title: 你的应用
+        new: 创建新应用
+        name: 名称
+        callback_url: 回调 URL
+        confidential: Confidential?
+        actions: 动作
+        confidentiality:
+          'yes': 是
+          'no': 沒有
       new:
-        title: '创建新应用'
+        title: 创建新应用
       show:
-        title: '应用：%{name}'
-        application_id: '应用 ID'
-        secret: '私钥'
-        scopes: '权限范围'
-        callback_urls: '登录回调地址'
-        confidential: 'Confidential'
-        actions: '操作'
-
+        title: 应用：%{name}
+        application_id: 应用 UID
+        secret: 应用密钥
+        secret_hashed: Secret hashed
+        scopes: 权限范围
+        confidential: Confidential
+        callback_urls: 回调 URL
+        actions: 操作
+        not_defined: Not defined
     authorizations:
       buttons:
-        authorize: '授权'
-        deny: '拒绝'
+        authorize: 同意授权
+        deny: 拒绝授权
       error:
-        title: '存在错误'
+        title: 发生错误
       new:
-        title: '需要你授权'
-        prompt: '授权 %{client_name} 使用你的帐号?'
-        able_to: '此应用将会'
+        title: 需要授权
+        prompt: 授权 %{client_name} 使用你的帐户？
+        able_to: 此应用将能够
       show:
-        title: '授权码'
-
+        title: 授权代码
+      form_post:
+        title: Submit this form
     authorized_applications:
       confirmations:
-        revoke: '确定要注销此应用的认证信息吗?'
+        revoke: 确定要撤销对此应用的授权吗？
       buttons:
-        revoke: '注销'
+        revoke: 撤销授权
       index:
-        title: '你授权的应用列表'
-        application: '应用'
-        created_at: '授权时间'
-        date_format: '%Y-%m-%d %H:%M:%S'
-
+        title: 已授权的应用
+        application: 应用
+        created_at: 授权时间
+        date_format: "%Y-%m-%d %H:%M:%S"
+    pre_authorization:
+      status: 预授权
     errors:
       messages:
-        # Common error messages
-        invalid_request: '这个请求缺少必要的参数，或者参数值、格式不正确'
-        invalid_redirect_uri: '无效的登录回调地址'
-        unauthorized_client: '未授权的应用，请求无法执行'
-        access_denied: '用户或服务器拒绝了请求'
-        invalid_scope: '请求范围无效、未知或格式不正确'
-        server_error: '服务器异常，无法处理请求'
-        temporarily_unavailable: '服务器维护中或负载过高，暂时无法处理请求'
-
-        #configuration error messages
-        credential_flow_not_configured: 'Resource Owner Password Credentials flow failed，原因是 Doorkeeper.configure.resource_owner_from_credentials 尚未设置。'
-        resource_owner_authenticator_not_configured: 'Resource Owner find failed，原因是 Doorkeeper.configure.resource_owner_authenticator 尚未设置。'
-
-        # Access grant errors
-        unsupported_response_type: '服务器不支持这种响应类型'
-
-        # Access token errors
-        invalid_client: '由于未知、不支持或没有客户端，认证失败'
-        invalid_grant: '授权方式无效，或者登录回调地址无效、过期或已被撤销'
-        unsupported_grant_type: '服务器不支持此类型的授权方式'
-
-        # Password Access token errors
-        invalid_resource_owner: '资源所有者认证无效或没有所有者'
-
+        invalid_request:
+          unknown: 请求缺少必要的参数，或者参数值、格式不正确。
+          missing_param: 'Missing required parameter: %{value}.'
+          request_not_authorized: Request need to be authorized. Required parameter for authorizing request is missing or invalid.
+        invalid_redirect_uri: 无效的登录回调地址。
+        unauthorized_client: 未授权的应用，请求无法执行。
+        access_denied: 资源所有者或服务器拒绝了请求。
+        invalid_scope: 请求的权限范围无效、未知或格式不正确。
+        invalid_code_challenge_method: The code challenge method must be plain or S256.
+        server_error: 服务器异常，无法处理请求。
+        temporarily_unavailable: 服务器维护中或负载过高，暂时无法处理请求。
+        credential_flow_not_configured: 由于 Doorkeeper.configure.resource_owner_from_credentials 尚未配置，应用验证授权流程失败。
+        resource_owner_authenticator_not_configured: 由于 Doorkeeper.configure.resource_owner_authenticator 尚未配置，查找资源所有者失败。
+        admin_authenticator_not_configured: 由于 Doorkeeper.configure.admin_authenticator 尚未配置，禁止访问管理员面板。
+        unsupported_response_type: 服务器不支持这种响应类型。
+        unsupported_response_mode: The authorization server does not support this response mode.
+        invalid_client: 由于应用信息未知、未提交认证信息或使用了不支持的认证方式，认证失败。
+        invalid_grant: 授权方式无效、过期或已被撤销、与授权请求中的回调地址不一致，或使用了其他应用的回调地址。
+        unsupported_grant_type: 服务器不支持此类型的授权方式。
         invalid_token:
-          revoked: "访问令牌已被吊销"
-          expired: "访问令牌已过期"
-          unknown: "访问令牌无效"
-
+          revoked: 访问令牌已被吊销
+          expired: 访问令牌已过期
+          unknown: 访问令牌无效
+        revoke:
+          unauthorized: You are not authorized to revoke this token
+        forbidden_token:
+          missing_scope: Access to this resource requires scope "%{oauth_scopes}".
     flash:
       applications:
         create:
-          notice: '应用创建成功'
+          notice: 应用创建成功。
         destroy:
-          notice: '应用删除成功'
+          notice: 应用删除成功。
         update:
-          notice: '应用修改成功'
+          notice: 应用修改成功。
       authorized_applications:
         destroy:
-          notice: '已成功注销了应用的认证信息'
-
+          notice: 已成功撤销对此应用的授权。
     layouts:
       admin:
+        title: Doorkeeper
         nav:
-          oauth2_provider: 'OAuth2 提供商'
-          applications: '应用'
-          home: '首页'
+          oauth2_provider: OAuth2 提供商
+          applications: 应用
+          home: 首页
       application:
-        title: 'OAuth 认证'
+        title: 需要 OAuth 认证
\ No newline at end of file
diff --git a/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb b/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb
new file mode 100644
index 00000000..9c78ac28
--- /dev/null
+++ b/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb
@@ -0,0 +1,5 @@
+class ChangeOauthAccessTokensTokenColumnLength < ActiveRecord::Migration[5.2]
+  def change
+    change_column :oauth_access_tokens, :token, :string, limit: 500
+  end
+end

From 45b7f70d9f391a9b77ed4734ffc9d6f710fbcdce Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 20 Jun 2022 10:16:39 +0800
Subject: [PATCH 070/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=82=80=E8=AF=B7=E9=93=BE=E6=8E=A5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?show=5Flink=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project_invite_links_controller.rb        |  17 +-
 app/docs/slate/source/includes/_projects.md   |  96 +++++-
 app/models/project_invite_link.rb             |   8 +-
 .../_detail.json.jbuilder                     |   2 +-
 .../show_link.json.jbuilder                   |   1 +
 config/routes.rb                              |   1 +
 public/docs/api.html                          | 309 +++++++++++++++---
 7 files changed, 371 insertions(+), 63 deletions(-)
 create mode 100644 app/views/projects/project_invite_links/show_link.json.jbuilder

diff --git a/app/controllers/projects/project_invite_links_controller.rb b/app/controllers/projects/project_invite_links_controller.rb
index c177367c..14bdc959 100644
--- a/app/controllers/projects/project_invite_links_controller.rb
+++ b/app/controllers/projects/project_invite_links_controller.rb
@@ -1,24 +1,31 @@
 class Projects::ProjectInviteLinksController < Projects::BaseController
-  before_action :require_manager!, except: [:redirect_link]
+  before_action :require_manager!, except: [:show_link, :redirect_link]
   before_action :require_login
 
   def current_link
-    @project_invite_link = ProjectInviteLink.find_by(user_id: current_user.id, project_id: @project.id)
-    @project_invite_link = ProjectInviteLink.build!(@project, current_user) unless @project_invite_link.present?
+    role = params[:role]
+    is_apply = params[:is_apply]
+    return render_error('请输入正确的参数！') unless role.present? && is_apply.present?
+    @project_invite_link = ProjectInviteLink.find_by(user_id: current_user.id, project_id: @project.id, role: role, is_apply: is_apply)
+    @project_invite_link = ProjectInviteLink.build!(@project, current_user, role, is_apply) unless @project_invite_link.present?
   end
 
   def generate_link
     ActiveRecord::Base.transaction do
       params_data = link_params.merge({user_id: current_user.id, project_id: @project.id})
-      puts params_data
       Projects::ProjectInviteLinks::CreateForm.new(params_data).validate!
-      @project_invite_link = ProjectInviteLink.create!(params_data.merge(sign: ProjectInviteLink.random_hex_sign))
+      @project_invite_link = ProjectInviteLink.build!(project, user, params_data[:role], params_data[:is_apply])
     end
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
   end
 
+  def show_link 
+    @project_invite_link = ProjectInviteLink.find_by(sign: params[:invite_sign])
+    return render_not_found unless @project_invite_link.present?
+  end
+
   def redirect_link 
     Projects::LinkJoinService.call(current_user, @project, params[:invite_sign])
     render_ok
diff --git a/app/docs/slate/source/includes/_projects.md b/app/docs/slate/source/includes/_projects.md
index 7e700457..906982b3 100644
--- a/app/docs/slate/source/includes/_projects.md
+++ b/app/docs/slate/source/includes/_projects.md
@@ -1,5 +1,5 @@
 # Projects
-## 获取项目邀请链接
+## 获取项目邀请链接（项目管理员）
 当前登录（管理员）用户获取项目邀请链接的接口（第一次请求会默认生成role类型为developer和is_apply为true的链接）
 
 > 示例:
@@ -15,6 +15,12 @@ await octokit.request('GET /api/yystopf/kellect/project_invite_links/current_lin
 ### HTTP 请求
 `GET /api/:owner/:repo/project_invite_links/current_link.json`
 
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|role     |是| |string |项目权限，reporter: 报告者, developer: 开发者，manager：管理员  |
+|is_apply |是| |boolean |是否需要审核  |
+
 ### 返回字段说明
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
@@ -22,6 +28,7 @@ await octokit.request('GET /api/yystopf/kellect/project_invite_links/current_lin
 |role           |string   |邀请角色|
 |is_apply       |boolean  |是否需要审核 |
 |sign           |string   |邀请标识(放在链接后面即可)|
+|expired_at     |string   |链接过期时间|
 |user.id        |int      |链接创建者的id |
 |user.type      |string   |链接创建者的类型 |
 |user.name      |string   |链接创建者的名称 |
@@ -46,6 +53,7 @@ await octokit.request('GET /api/yystopf/kellect/project_invite_links/current_lin
     "role": "developer",
     "is_apply": false,
     "sign": "6b6b454843c291d4e52e60853cb8ad9f",
+    "expired_at": "2022-06-23 10:08",
     "user": {
         "id": 2,
         "type": "User",
@@ -69,7 +77,7 @@ await octokit.request('GET /api/yystopf/kellect/project_invite_links/current_lin
     }
 }
 ```
-## 生成项目邀请链接
+## 生成项目邀请链接（项目管理员）
 当前登录（管理员）用户生成的项目邀请链接，可选role和is_apply参数
 
 > 示例:
@@ -108,6 +116,7 @@ await octokit.request('POST /api/yystopf/kellect/project_invite_links/generate_l
 |role           |string   |邀请角色|
 |is_apply       |boolean  |是否需要审核 |
 |sign           |string   |邀请标识(放在链接后面即可)|
+|expired_at     |string   |链接过期时间|
 |user.id        |int      |链接创建者的id |
 |user.type      |string   |链接创建者的类型 |
 |user.name      |string   |链接创建者的名称 |
@@ -132,6 +141,7 @@ await octokit.request('POST /api/yystopf/kellect/project_invite_links/generate_l
     "role": "developer",
     "is_apply": false,
     "sign": "6b6b454843c291d4e52e60853cb8ad9f",
+    "expired_at": "2022-06-23 10:08",
     "user": {
         "id": 2,
         "type": "User",
@@ -156,7 +166,85 @@ await octokit.request('POST /api/yystopf/kellect/project_invite_links/generate_l
 }
 ```
 
-## 请求项目邀请链接
+## 获取邀请链接信息（被邀请用户）
+用户请求邀请链接时，通过该接口来获取链接的信息
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/yystopf/kellect/project_invite_links/show_link.json?invite_sign=d612df03aad63760445c187bcf83f2e6
+```
+
+```javascript
+await octokit.request('POST /api/yystopf/kellect/project_invite_links/show_link.json?invite_sign=d612df03aad63760445c187bcf83f2e6')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/project_invite_links/show_link.json?invite_sign=xxx`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|invite_sign |是| |string |项目邀请链接的标识  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |链接id |
+|role           |string   |邀请角色|
+|is_apply       |boolean  |是否需要审核 |
+|sign           |string   |邀请标识(放在链接后面即可)|
+|expired_at     |string   |链接过期时间|
+|user.id        |int      |链接创建者的id |
+|user.type      |string   |链接创建者的类型 |
+|user.name      |string   |链接创建者的名称 |
+|user.login     |string   |链接创建者的标识 |
+|user.image_url |string   |链接创建者头像 |
+|project.id             |int      |链接关联项目的id |
+|project.identifier     |string   |链接关联项目的标识 |
+|project.name           |string   |链接关联项目的名称 |
+|project.description    |string   |链接关联项目的描述 |
+|project.is_public      |bool     |链接关联项目是否公开 |
+|project.owner.id       |bool     |链接关联项目拥有者id |
+|project.owner.type     |string   |链接关联项目拥有者类型 |
+|project.owner.name     |string   |链接关联项目拥有者昵称 |
+|project.owner.login    |string   |链接关联项目拥有者标识 |
+|project.owner.image_url|string   |链接关联项目拥有者头像 |
+
+> 返回的JSON示例:
+
+```json
+{
+    "id": 7,
+    "role": "developer",
+    "is_apply": false,
+    "sign": "6b6b454843c291d4e52e60853cb8ad9f",
+    "expired_at": "2022-06-23 10:08",
+    "user": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "project": {
+        "id": 474,
+        "identifier": "kellect",
+        "name": "kellect",
+        "description": null,
+        "is_public": true,
+        "owner": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        }
+    }
+}
+```
+
+## 接受项目邀请链接（被邀请用户）
 当前登录（非项目）用户加入项目的接口，如果项目链接不需要审核，请求成功后即加入项目，如果需要审核，那么会提交一个申请，需要项目管理员审核
 
 > 示例:
@@ -170,7 +258,7 @@ await octokit.request('POST /api/yystopf/kellect/project_invite_links/redirect_l
 ```
 
 ### HTTP 请求
-`POST /api/:owner/:repo/project_invite_links/generate_link.json?invite_sign=xxx`
+`POST /api/:owner/:repo/project_invite_links/redirect_link.json?invite_sign=xxx`
 
 ### 请求参数
 参数    | 必选 | 默认 | 类型 | 字段说明
diff --git a/app/models/project_invite_link.rb b/app/models/project_invite_link.rb
index fa5c0c44..ea77b951 100644
--- a/app/models/project_invite_link.rb
+++ b/app/models/project_invite_link.rb
@@ -35,7 +35,8 @@ class ProjectInviteLink < ApplicationRecord
   before_create :set_old_data_expired_at
 
   def self.random_hex_sign
-    SecureRandom.hex
+    hex = (SecureRandom.hex(32))
+    return hex unless ProjectInviteLink.where(sign: hex).exists?
   end
 
   def self.build!(project, user, role="developer", is_apply=true)
@@ -44,13 +45,14 @@ class ProjectInviteLink < ApplicationRecord
       user_id: user&.id, 
       role: role, 
       is_apply: is_apply, 
-      sign: random_hex_sign
+      sign: random_hex_sign,
+      expired_at: Time.now + 3.days
     )
   end
 
   private 
   def set_old_data_expired_at
-    ProjectInviteLink.where(user_id: self.user_id, project_id: self.project).update_all(expired_at: Time.now)
+    ProjectInviteLink.where(user_id: self.user_id, project_id: self.project, role: self.role, is_apply: self.is_apply).update_all(expired_at: Time.now)
   end
 
 
diff --git a/app/views/projects/project_invite_links/_detail.json.jbuilder b/app/views/projects/project_invite_links/_detail.json.jbuilder
index 7c9f78dd..c8e840d0 100644
--- a/app/views/projects/project_invite_links/_detail.json.jbuilder
+++ b/app/views/projects/project_invite_links/_detail.json.jbuilder
@@ -1,5 +1,5 @@
 json.(project_invite_link, :id, :role, :is_apply, :sign)
-
+json.expired_at format_time(project_invite_link&.expired_at)
 json.user do 
   json.partial! "/users/user_simple", locals: {user: project_invite_link.user}
 end
diff --git a/app/views/projects/project_invite_links/show_link.json.jbuilder b/app/views/projects/project_invite_links/show_link.json.jbuilder
new file mode 100644
index 00000000..1903e10a
--- /dev/null
+++ b/app/views/projects/project_invite_links/show_link.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'detail', locals: { project_invite_link: @project_invite_link }
diff --git a/config/routes.rb b/config/routes.rb
index fd89ee08..d3b2e7f3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -608,6 +608,7 @@ Rails.application.routes.draw do
           collection do 
             get :current_link
             post :generate_link
+            get :show_link
             post :redirect_link
           end
         end
diff --git a/public/docs/api.html b/public/docs/api.html
index bd3f49eb..82b751e9 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -426,13 +426,16 @@
             <a href="#projects" class="toc-h1 toc-link" data-title="Projects">Projects</a>
               <ul class="toc-list-h2">
                   <li>
-                    <a href="#086d81b60d" class="toc-h2 toc-link" data-title="获取项目邀请链接">获取项目邀请链接</a>
+                    <a href="#b57112e753" class="toc-h2 toc-link" data-title="获取项目邀请链接（项目管理员）">获取项目邀请链接（项目管理员）</a>
                   </li>
                   <li>
-                    <a href="#65f471580f" class="toc-h2 toc-link" data-title="生成项目邀请链接">生成项目邀请链接</a>
+                    <a href="#099c15c88b" class="toc-h2 toc-link" data-title="生成项目邀请链接（项目管理员）">生成项目邀请链接（项目管理员）</a>
                   </li>
                   <li>
-                    <a href="#316c752f05" class="toc-h2 toc-link" data-title="请求项目邀请链接">请求项目邀请链接</a>
+                    <a href="#93da71d862" class="toc-h2 toc-link" data-title="获取邀请链接信息（被邀请用户）">获取邀请链接信息（被邀请用户）</a>
+                  </li>
+                  <li>
+                    <a href="#1ba67175b6" class="toc-h2 toc-link" data-title="接受项目邀请链接（被邀请用户）">接受项目邀请链接（被邀请用户）</a>
                   </li>
                   <li>
                     <a href="#ac55469b06" class="toc-h2 toc-link" data-title="申请加入项目">申请加入项目</a>
@@ -4399,7 +4402,7 @@ Success — a happy kitten is an authenticated kitten!
     </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-06-09 16:41"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"7分钟前"</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h1 id='projects'>Projects</h1><h2 id='086d81b60d'>获取项目邀请链接</h2>
+</span></code></pre></div><h1 id='projects'>Projects</h1><h2 id='b57112e753'>获取项目邀请链接（项目管理员）</h2>
 <p>当前登录（管理员）用户获取项目邀请链接的接口（第一次请求会默认生成role类型为developer和is_apply为true的链接）</p>
 
 <blockquote>
@@ -4409,6 +4412,31 @@ Success — a happy kitten is an authenticated kitten!
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/kellect/project_invite_links/current_link.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/project_invite_links/current_link.json</code></p>
+<h3 id='1f9ac54b15'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>role</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目权限，reporter: 报告者, developer: 开发者，manager：管理员</td>
+</tr>
+<tr>
+<td>is_apply</td>
+<td>是</td>
+<td></td>
+<td>boolean</td>
+<td>是否需要审核</td>
+</tr>
+</tbody></table>
 <h3 id='b302a98fa6'>返回字段说明</h3>
 <table><thead>
 <tr>
@@ -4438,6 +4466,11 @@ Success — a happy kitten is an authenticated kitten!
 <td>邀请标识(放在链接后面即可)</td>
 </tr>
 <tr>
+<td>expired_at</td>
+<td>string</td>
+<td>链接过期时间</td>
+</tr>
+<tr>
 <td>user.id</td>
 <td>int</td>
 <td>链接创建者的id</td>
@@ -4522,6 +4555,7 @@ Success — a happy kitten is an authenticated kitten!
     </span><span class="nl">"role"</span><span class="p">:</span><span class="w"> </span><span class="s2">"developer"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"is_apply"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
     </span><span class="nl">"sign"</span><span class="p">:</span><span class="w"> </span><span class="s2">"6b6b454843c291d4e52e60853cb8ad9f"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"expired_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 10:08"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
         </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
         </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
@@ -4544,7 +4578,7 @@ Success — a happy kitten is an authenticated kitten!
         </span><span class="p">}</span><span class="w">
     </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h2 id='65f471580f'>生成项目邀请链接</h2>
+</span></code></pre></div><h2 id='099c15c88b'>生成项目邀请链接（项目管理员）</h2>
 <p>当前登录（管理员）用户生成的项目邀请链接，可选role和is_apply参数</p>
 
 <blockquote>
@@ -4554,7 +4588,7 @@ Success — a happy kitten is an authenticated kitten!
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/kellect/project_invite_links/generate_link.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-2'>HTTP 请求</h3>
 <p><code>POST /api/:owner/:repo/project_invite_links/generate_link.json</code></p>
-<h3 id='1f9ac54b15'>请求参数</h3>
+<h3 id='1f9ac54b15-2'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4616,6 +4650,11 @@ Success — a happy kitten is an authenticated kitten!
 <td>邀请标识(放在链接后面即可)</td>
 </tr>
 <tr>
+<td>expired_at</td>
+<td>string</td>
+<td>链接过期时间</td>
+</tr>
+<tr>
 <td>user.id</td>
 <td>int</td>
 <td>链接创建者的id</td>
@@ -4700,6 +4739,7 @@ Success — a happy kitten is an authenticated kitten!
     </span><span class="nl">"role"</span><span class="p">:</span><span class="w"> </span><span class="s2">"developer"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"is_apply"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
     </span><span class="nl">"sign"</span><span class="p">:</span><span class="w"> </span><span class="s2">"6b6b454843c291d4e52e60853cb8ad9f"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"expired_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 10:08"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
         </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
         </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
@@ -4722,7 +4762,176 @@ Success — a happy kitten is an authenticated kitten!
         </span><span class="p">}</span><span class="w">
     </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h2 id='316c752f05'>请求项目邀请链接</h2>
+</span></code></pre></div><h2 id='93da71d862'>获取邀请链接信息（被邀请用户）</h2>
+<p>用户请求邀请链接时，通过该接口来获取链接的信息</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/yystopf/kellect/project_invite_links/show_link.json?invite_sign<span class="o">=</span>d612df03aad63760445c187bcf83f2e6
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/kellect/project_invite_links/show_link.json?invite_sign=d612df03aad63760445c187bcf83f2e6</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-3'>HTTP 请求</h3>
+<p><code>POST /api/:owner/:repo/project_invite_links/show_link.json?invite_sign=xxx</code></p>
+<h3 id='1f9ac54b15-3'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>invite_sign</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目邀请链接的标识</td>
+</tr>
+</tbody></table>
+<h3 id='b302a98fa6-3'>返回字段说明</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>链接id</td>
+</tr>
+<tr>
+<td>role</td>
+<td>string</td>
+<td>邀请角色</td>
+</tr>
+<tr>
+<td>is_apply</td>
+<td>boolean</td>
+<td>是否需要审核</td>
+</tr>
+<tr>
+<td>sign</td>
+<td>string</td>
+<td>邀请标识(放在链接后面即可)</td>
+</tr>
+<tr>
+<td>expired_at</td>
+<td>string</td>
+<td>链接过期时间</td>
+</tr>
+<tr>
+<td>user.id</td>
+<td>int</td>
+<td>链接创建者的id</td>
+</tr>
+<tr>
+<td>user.type</td>
+<td>string</td>
+<td>链接创建者的类型</td>
+</tr>
+<tr>
+<td>user.name</td>
+<td>string</td>
+<td>链接创建者的名称</td>
+</tr>
+<tr>
+<td>user.login</td>
+<td>string</td>
+<td>链接创建者的标识</td>
+</tr>
+<tr>
+<td>user.image_url</td>
+<td>string</td>
+<td>链接创建者头像</td>
+</tr>
+<tr>
+<td>project.id</td>
+<td>int</td>
+<td>链接关联项目的id</td>
+</tr>
+<tr>
+<td>project.identifier</td>
+<td>string</td>
+<td>链接关联项目的标识</td>
+</tr>
+<tr>
+<td>project.name</td>
+<td>string</td>
+<td>链接关联项目的名称</td>
+</tr>
+<tr>
+<td>project.description</td>
+<td>string</td>
+<td>链接关联项目的描述</td>
+</tr>
+<tr>
+<td>project.is_public</td>
+<td>bool</td>
+<td>链接关联项目是否公开</td>
+</tr>
+<tr>
+<td>project.owner.id</td>
+<td>bool</td>
+<td>链接关联项目拥有者id</td>
+</tr>
+<tr>
+<td>project.owner.type</td>
+<td>string</td>
+<td>链接关联项目拥有者类型</td>
+</tr>
+<tr>
+<td>project.owner.name</td>
+<td>string</td>
+<td>链接关联项目拥有者昵称</td>
+</tr>
+<tr>
+<td>project.owner.login</td>
+<td>string</td>
+<td>链接关联项目拥有者标识</td>
+</tr>
+<tr>
+<td>project.owner.image_url</td>
+<td>string</td>
+<td>链接关联项目拥有者头像</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">7</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"role"</span><span class="p">:</span><span class="w"> </span><span class="s2">"developer"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_apply"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"sign"</span><span class="p">:</span><span class="w"> </span><span class="s2">"6b6b454843c291d4e52e60853cb8ad9f"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"expired_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 10:08"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"project"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">474</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"kellect"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"kellect"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_public"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"owner"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='1ba67175b6'>接受项目邀请链接（被邀请用户）</h2>
 <p>当前登录（非项目）用户加入项目的接口，如果项目链接不需要审核，请求成功后即加入项目，如果需要审核，那么会提交一个申请，需要项目管理员审核</p>
 
 <blockquote>
@@ -4730,9 +4939,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/yystopf/kellect/project_invite_links/redirect_link.json?invite_sign<span class="o">=</span>d612df03aad63760445c187bcf83f2e6
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/kellect/project_invite_links/redirect_link.json?invite_sign=d612df03aad63760445c187bcf83f2e6</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-3'>HTTP 请求</h3>
-<p><code>POST /api/:owner/:repo/project_invite_links/generate_link.json?invite_sign=xxx</code></p>
-<h3 id='1f9ac54b15-2'>请求参数</h3>
+</code></pre></div><h3 id='http-4'>HTTP 请求</h3>
+<p><code>POST /api/:owner/:repo/project_invite_links/redirect_link.json?invite_sign=xxx</code></p>
+<h3 id='1f9ac54b15-4'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4766,9 +4975,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/applied_projects.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/appliedr_projects.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-4'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-5'>HTTP 请求</h3>
 <p><code>POST /api/applied_projects.json</code></p>
-<h3 id='1f9ac54b15-3'>请求参数</h3>
+<h3 id='1f9ac54b15-5'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4803,7 +5012,7 @@ Success — a happy kitten is an authenticated kitten!
     </span><span class="nl">"role"</span><span class="p">:</span><span class="w"> </span><span class="s2">"developer"</span><span class="w">
   </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='b302a98fa6-3'>返回字段说明</h3>
+</span></code></pre></div><h3 id='b302a98fa6-4'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4944,9 +5153,9 @@ Success — a happy kitten is an authenticated kitten!
 <span class="nt">-d</span> <span class="s2">"limit=5"</span> <span class="se">\</span>
 http://localhost:3000/api/projects  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/projects</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-5'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
 <p><code>GET api/projects</code></p>
-<h3 id='1f9ac54b15-4'>请求参数</h3>
+<h3 id='1f9ac54b15-6'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5013,7 +5222,7 @@ http://localhost:3000/api/projects  | jq
 <td>项目类型， 取值为：common、mirror; common:开源托管项目, mirror:开源镜像项目</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-4'>返回字段说明</h3>
+<h3 id='b302a98fa6-5'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5165,9 +5374,9 @@ Remember — a happy kitten is an authenticated kitten!
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/projects/recommend  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/projects/recommend.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
 <p><code>GET api/projects/recommend</code></p>
-<h3 id='b302a98fa6-5'>返回字段说明</h3>
+<h3 id='b302a98fa6-6'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5301,9 +5510,9 @@ Remember — a happy kitten is an authenticated kitten!
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/ceshi/menu_list</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
 <p><code>GET api/:owner/:repo/menu_list</code></p>
-<h3 id='1f9ac54b15-5'>请求参数</h3>
+<h3 id='1f9ac54b15-7'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5328,7 +5537,7 @@ http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-6'>返回字段说明</h3>
+<h3 id='b302a98fa6-7'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5369,9 +5578,9 @@ http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/jasder/forgeplus/about  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/forgeplus/about</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
 <p><code>GET api/:owner/:repo/about</code></p>
-<h3 id='1f9ac54b15-6'>请求参数</h3>
+<h3 id='1f9ac54b15-8'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5396,7 +5605,7 @@ http://localhost:3000/api/jasder/forgeplus/about  | jq
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-7'>返回字段说明</h3>
+<h3 id='b302a98fa6-8'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5442,7 +5651,7 @@ Remember — a happy kitten is an authenticated kitten!
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/yystopf/ceshi/project_units.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/ceshi/project_units</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
 <p><code>GET /api/yystopf/ceshi/project_units</code></p>
 <h3 id='7447e4874e'>返回字段说明:</h3>
 <table><thead>
@@ -5485,9 +5694,9 @@ http://localhost:3000/api/yystopf/ceshi/project_units.json
 <span class="nt">-d</span> <span class="s2">"{ </span><span class="se">\"</span><span class="s2">unit_typs</span><span class="se">\"</span><span class="s2">: [</span><span class="se">\"</span><span class="s2">code</span><span class="se">\"</span><span class="s2">, </span><span class="se">\"</span><span class="s2">pulls</span><span class="se">\"</span><span class="s2">]}"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/ceshi/project_units.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/ceshi/project_units</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
 <p><code>POST /api/yystopf/ceshi/project_units</code></p>
-<h3 id='1f9ac54b15-7'>请求参数</h3>
+<h3 id='1f9ac54b15-9'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5549,9 +5758,9 @@ http://localhost:3000/api/yystopf/ceshi/project_units.json
 <span class="nt">-d</span> <span class="s2">"license_id=1"</span> <span class="se">\</span>
 http://localhost:3000/api/projects.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/projects.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-12'>HTTP 请求</h3>
 <p><code>POST api/projects</code></p>
-<h3 id='1f9ac54b15-8'>请求参数</h3>
+<h3 id='1f9ac54b15-10'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5625,7 +5834,7 @@ http://localhost:3000/api/projects.json
 <td>项目是否私有, true：为私有，false: 公开，默认为公开</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-8'>返回字段说明</h3>
+<h3 id='b302a98fa6-9'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5667,9 +5876,9 @@ http://localhost:3000/api/projects.json
 <span class="nt">-d</span> <span class="s2">"project_language_id=2"</span> <span class="se">\</span>
 http://localhost:3000/api/projects/migrate.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/projects/migrate.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-12'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
 <p><code>POST api/projects/migrate.json</code></p>
-<h3 id='1f9ac54b15-9'>请求参数</h3>
+<h3 id='1f9ac54b15-11'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5757,7 +5966,7 @@ http://localhost:3000/api/projects/migrate.json
 <td>项目是否私有, true：为私有，false: 非私有，默认为公开</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-9'>返回字段说明</h3>
+<h3 id='b302a98fa6-10'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5792,9 +6001,9 @@ http://localhost:3000/api/projects/migrate.json
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/repositories/1244/sync_mirror.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/repositories/1244/sync_mirror.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
 <p><code>POST api/repositories/:id/sync_mirror.json</code></p>
-<h3 id='1f9ac54b15-10'>请求参数</h3>
+<h3 id='1f9ac54b15-12'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5812,7 +6021,7 @@ http://localhost:3000/api/projects/migrate.json
 <td>仓库id</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-10'>返回字段说明</h3>
+<h3 id='b302a98fa6-11'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5847,9 +6056,9 @@ http://localhost:3000/api/projects/migrate.json
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/jasder/forgeplus/forks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/jaser/jasder_test/forks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
 <p><code>POST api/:owner/:repo/forks.json</code></p>
-<h3 id='1f9ac54b15-11'>请求参数</h3>
+<h3 id='1f9ac54b15-13'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5874,7 +6083,7 @@ http://localhost:3000/api/projects/migrate.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-11'>返回字段说明</h3>
+<h3 id='b302a98fa6-12'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5910,9 +6119,9 @@ http://localhost:3000/api/projects/migrate.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizations.json  | jq
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/:owner/:repo/applied_transfer_projects/organizations</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-16'>HTTP 请求</h3>
 <p><code>GET api/:owner/:repo/applied_transfer_projects/organizations</code></p>
-<h3 id='1f9ac54b15-12'>请求参数</h3>
+<h3 id='1f9ac54b15-14'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -5937,7 +6146,7 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-12'>返回字段说明</h3>
+<h3 id='b302a98fa6-13'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -6004,9 +6213,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/:owner/:repo/applied_transfer_projects.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-16'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
 <p><code>POST /api/:owner/:repo/applied_transfer_projects.json</code></p>
-<h3 id='1f9ac54b15-13'>请求参数</h3>
+<h3 id='1f9ac54b15-15'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -6038,7 +6247,7 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>迁移对象标识</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-13'>返回字段说明</h3>
+<h3 id='b302a98fa6-14'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -6208,9 +6417,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/cancel.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/:owner/:repo/applied_transfer_projects/cancel.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
 <p><code>POST /api/:owner/:repo/applied_transfer_projects/cancel.json</code></p>
-<h3 id='1f9ac54b15-14'>请求参数</h3>
+<h3 id='1f9ac54b15-16'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -6235,7 +6444,7 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='b302a98fa6-14'>返回字段说明</h3>
+<h3 id='b302a98fa6-15'>返回字段说明</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -6405,9 +6614,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/ceshi1/ceshi_repo1/quit.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/:owner/:repo/quit.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-19'>HTTP 请求</h3>
 <p><code>POST /api/:owner/:repo/quit.json</code></p>
-<h3 id='1f9ac54b15-15'>请求参数</h3>
+<h3 id='1f9ac54b15-17'>请求参数</h3>
 <table><thead>
 <tr>
 <th>参数</th>

From bed24690145120790e0ce7aeadd7db01a36be36a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 20 Jun 2022 10:34:25 +0800
Subject: [PATCH 071/208] fix: change error

---
 Gemfile.lock                                                    | 2 +-
 ...0617103002_change_oauth_access_tokens_token_column_length.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 99f40ad9..e27c504a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,7 +106,7 @@ GEM
       activerecord (>= 3.1.0, < 7)
     diff-lcs (1.3)
     diffy (3.3.0)
-    doorkeeper (5.5.4)
+    doorkeeper (5.5.1)
       railties (>= 5)
     doorkeeper-jwt (0.4.1)
       jwt (>= 2.1)
diff --git a/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb b/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb
index 9c78ac28..f387e6ea 100644
--- a/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb
+++ b/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb
@@ -1,5 +1,5 @@
 class ChangeOauthAccessTokensTokenColumnLength < ActiveRecord::Migration[5.2]
   def change
-    change_column :oauth_access_tokens, :token, :string, limit: 500
+    change_column :oauth_access_tokens, :token, :text
   end
 end

From 531495429ce7ad95b91d6f758de1c133dd7aa269 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 20 Jun 2022 13:05:25 +0800
Subject: [PATCH 072/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=9B=B4=E6=94=B9token=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20220616040105_create_doorkeeper_tables.rb       | 6 +++---
 ...103002_change_oauth_access_tokens_token_column_length.rb | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb

diff --git a/db/migrate/20220616040105_create_doorkeeper_tables.rb b/db/migrate/20220616040105_create_doorkeeper_tables.rb
index b4ec636e..890b31d8 100644
--- a/db/migrate/20220616040105_create_doorkeeper_tables.rb
+++ b/db/migrate/20220616040105_create_doorkeeper_tables.rb
@@ -48,8 +48,8 @@ class CreateDoorkeeperTables < ActiveRecord::Migration[5.2]
       # characters. More info on custom token generators in:
       # https://github.com/doorkeeper-gem/doorkeeper/tree/v3.0.0.rc1#custom-access-token-generator
       #
-      # t.text :token, null: false
-      t.string :token, null: false
+      t.text :token, null: false
+      # t.string :token, null: false
 
       t.string   :refresh_token
       t.integer  :expires_in
@@ -73,7 +73,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration[5.2]
       t.string   :previous_refresh_token, null: false, default: ""
     end
 
-    add_index :oauth_access_tokens, :token, unique: true
+    # add_index :oauth_access_tokens, :token, unique: true
     add_index :oauth_access_tokens, :refresh_token, unique: true
     add_foreign_key(
       :oauth_access_tokens,
diff --git a/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb b/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb
deleted file mode 100644
index f387e6ea..00000000
--- a/db/migrate/20220617103002_change_oauth_access_tokens_token_column_length.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeOauthAccessTokensTokenColumnLength < ActiveRecord::Migration[5.2]
-  def change
-    change_column :oauth_access_tokens, :token, :text
-  end
-end

From 9fe8df3c1ba90a20351dd0ffd70319e5352a879d Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 20 Jun 2022 15:38:42 +0800
Subject: [PATCH 073/208] =?UTF-8?q?auth=20token=E8=BF=87=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B47=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/initializers/doorkeeper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 4f9db8cd..d80dcac6 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -101,12 +101,12 @@ Doorkeeper.configure do
 
   # Authorization Code expiration time (default: 10 minutes).
   #
-  # authorization_code_expires_in 10.minutes
+  authorization_code_expires_in 7.days
 
   # Access token expiration time (default: 2 hours).
   # If you want to disable expiration, set this to `nil`.
   #
-  # access_token_expires_in 2.hours
+  access_token_expires_in 7.days
 
   # Assign custom TTL for access tokens. Will be used instead of access_token_expires_in
   # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to

From 29e3a55a0ca2fe613cb3cf3154cbffc266a66378 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 20 Jun 2022 16:36:01 +0800
Subject: [PATCH 074/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=82=80=E8=AF=B7=E9=93=BE=E6=8E=A5=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AE=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2ccd10ff..952fa448 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -688,7 +688,7 @@ class ApplicationController < ActionController::Base
 
     @project, @owner = Project.find_with_namespace(namespace, id)
 
-    if @project and current_user.can_read_project?(@project)
+    if @project and current_user.can_read_project?(@project) and controller_path == "projects/project_invite_links"
 			logger.info "###########： has project and can read project"
 			@project
     # elsif @project && current_user.is_a?(AnonymousUser)

From ba1fa8b685e29300d0b91e7a2756709231570498 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 20 Jun 2022 16:37:59 +0800
Subject: [PATCH 075/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=82=80=E8=AF=B7=E9=93=BE=E6=8E=A5=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AE=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 952fa448..f71a7501 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -688,7 +688,7 @@ class ApplicationController < ActionController::Base
 
     @project, @owner = Project.find_with_namespace(namespace, id)
 
-    if @project and current_user.can_read_project?(@project) and controller_path == "projects/project_invite_links"
+    if @project and (current_user.can_read_project?(@project) || controller_path == "projects/project_invite_links")
 			logger.info "###########： has project and can read project"
 			@project
     # elsif @project && current_user.is_a?(AnonymousUser)

From 9221e55752d02321cc6ee3b90b760cb44bc8d090 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 21 Jun 2022 11:18:14 +0800
Subject: [PATCH 076/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=A0=E5=85=A5=E4=BB=93=E5=BA=93=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BB=A5=E5=8F=8A=E9=A1=B9=E7=9B=AE=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8F=AA=E5=88=9B=E5=BB=BA=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects/project_invite_links_controller.rb | 2 +-
 app/services/projects/link_join_service.rb                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects/project_invite_links_controller.rb b/app/controllers/projects/project_invite_links_controller.rb
index 14bdc959..ddf88e6b 100644
--- a/app/controllers/projects/project_invite_links_controller.rb
+++ b/app/controllers/projects/project_invite_links_controller.rb
@@ -31,7 +31,7 @@ class Projects::ProjectInviteLinksController < Projects::BaseController
     render_ok
   rescue Exception => e
     uid_logger_error(e.message)
-    tip_exception(e.message)
+    normal_status(-1, e.message)
   end
 
 
diff --git a/app/services/projects/link_join_service.rb b/app/services/projects/link_join_service.rb
index e586933f..682fd141 100644
--- a/app/services/projects/link_join_service.rb
+++ b/app/services/projects/link_join_service.rb
@@ -28,11 +28,11 @@ class Projects::LinkJoinService < ApplicationService
     raise Error, 'invite_sign必须存在!' if invite_sign.blank?
     raise Error, '邀请链接不存在!' unless invite_link.present?
     raise Error, '邀请链接已失效!' unless invite_user_in_project
-    raise Error, '用户已加入该项目!' if project.member?(user.id)
+    raise Error, '您已是仓库成员' if project.member?(user.id)
   end
 
   def create_applied_project!
-    user.applied_projects.create!(project: project, role: role_value, project_invite_link_id: invite_link&.id)
+    user.applied_projects.find_or_create_by!(status: 'common', project: project, role: role_value, project_invite_link_id: invite_link&.id)
   end
 
   def create_member!

From 3c2c742121af00587d39dc77732e1e1fcd19efb1 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 21 Jun 2022 11:37:41 +0800
Subject: [PATCH 077/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=82=80=E8=AF=B7=E9=93=BE=E6=8E=A5=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/projects/link_join_service.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/services/projects/link_join_service.rb b/app/services/projects/link_join_service.rb
index 682fd141..70e23d14 100644
--- a/app/services/projects/link_join_service.rb
+++ b/app/services/projects/link_join_service.rb
@@ -29,6 +29,16 @@ class Projects::LinkJoinService < ApplicationService
     raise Error, '邀请链接不存在!' unless invite_link.present?
     raise Error, '邀请链接已失效!' unless invite_user_in_project
     raise Error, '您已是仓库成员' if project.member?(user.id)
+    raise Error, '您的申请管理员正在审核中，请勿重复申请！' if user.applied_projects.exists?(applied_project_params)
+  end
+
+  def applied_project_params 
+    {
+      status: 'common',
+      project: project,
+      role: role_value,
+      project_invite_link_id: invite_link&.id
+    }
   end
 
   def create_applied_project!

From aefd6c08dc76d9214709205544af2fc25facb93c Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 21 Jun 2022 17:39:11 +0800
Subject: [PATCH 078/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20gitea-client?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E4=BB=A5=E5=8F=8A=E8=B7=AF=E7=94=B1=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                    |  2 ++
 Gemfile.lock                               | 20 ++++++++++++++++++++
 app/controllers/api/v1/base_controller.rb  |  2 ++
 app/controllers/api/v1/repos_controller.rb |  6 ++++++
 config/initializers/gitea_client.rb        | 11 +++++++++++
 config/routes.rb                           |  6 ++++++
 config/routes/api.rb                       |  7 +++++++
 7 files changed, 54 insertions(+)
 create mode 100644 app/controllers/api/v1/base_controller.rb
 create mode 100644 app/controllers/api/v1/repos_controller.rb
 create mode 100644 config/initializers/gitea_client.rb
 create mode 100644 config/routes/api.rb

diff --git a/Gemfile b/Gemfile
index effb2be6..0347de45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -134,3 +134,5 @@ gem 'jwt'
 gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
+
+gem 'gitea-client', '~> 0.5.1'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index e27c504a..6e4f079f 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)
@@ -133,6 +135,8 @@ GEM
     fugit (1.4.1)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
+    gitea-client (0.5.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)
@@ -292,6 +303,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)
@@ -418,6 +434,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 +478,7 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
+  gitea-client (~> 0.5.1)
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)
diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
new file mode 100644
index 00000000..76c527d8
--- /dev/null
+++ b/app/controllers/api/v1/base_controller.rb
@@ -0,0 +1,2 @@
+class Api::V1::BaseController < ApplicationController
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/repos_controller.rb b/app/controllers/api/v1/repos_controller.rb
new file mode 100644
index 00000000..667f47db
--- /dev/null
+++ b/app/controllers/api/v1/repos_controller.rb
@@ -0,0 +1,6 @@
+class Api::V1::ReposController < Api::V1::BaseController 
+
+  def index 
+    render_ok
+  end
+end
\ No newline at end of file
diff --git a/config/initializers/gitea_client.rb b/config/initializers/gitea_client.rb
new file mode 100644
index 00000000..92706ffd
--- /dev/null
+++ b/config/initializers/gitea_client.rb
@@ -0,0 +1,11 @@
+require 'gitea-client'
+
+config = Rails.application.config_for(:configuration).symbolize_keys!
+gitea_config = config[:gitea].symbolize_keys!
+
+$gitea_client = Gitea::Api::Client.new({
+  domain: gitea_config[:domain], 
+  base_url: gitea_config[:base_url],
+  username: gitea_config[:username], 
+  password: gitea_config[:password]
+})
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index d3b2e7f3..c0e845a8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,11 @@
 Rails.application.routes.draw do
 
+  def draw(routes_name)
+    instance_eval(File.read(Rails.root.join("config/routes/#{routes_name}.rb")))
+  end
+
+  draw :api
+
   use_doorkeeper
   require 'sidekiq/web'
   require 'sidekiq/cron/web'
diff --git a/config/routes/api.rb b/config/routes/api.rb
new file mode 100644
index 00000000..718f705a
--- /dev/null
+++ b/config/routes/api.rb
@@ -0,0 +1,7 @@
+defaults format: :json do 
+  namespace :api do 
+    namespace :v1 do 
+      resources :repos
+    end
+  end
+end
\ No newline at end of file

From d7dd3901b8f60f76283d00c7f8d9a18bf0e776d0 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 22 Jun 2022 19:08:14 +0800
Subject: [PATCH 079/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  4 +-
 app/controllers/api/v1/base_controller.rb     |  4 ++
 app/controllers/api/v1/projects_controller.rb | 11 +++++
 app/controllers/api/v1/repos_controller.rb    |  6 ---
 .../concerns/api/project_helper.rb            | 20 ++++++++
 app/services/api/v1/projects/get_service.rb   | 48 +++++++++++++++++++
 .../v1/projects/_simple_detail.json.jbuilder  | 10 ++++
 app/views/api/v1/projects/show.json.jbuilder  |  5 ++
 .../api/v1/users/_simple_user.json.jbuilder   |  9 ++++
 config/routes/api.rb                          | 16 ++++++-
 11 files changed, 125 insertions(+), 10 deletions(-)
 create mode 100644 app/controllers/api/v1/projects_controller.rb
 delete mode 100644 app/controllers/api/v1/repos_controller.rb
 create mode 100644 app/controllers/concerns/api/project_helper.rb
 create mode 100644 app/services/api/v1/projects/get_service.rb
 create mode 100644 app/views/api/v1/projects/_simple_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/show.json.jbuilder
 create mode 100644 app/views/api/v1/users/_simple_user.json.jbuilder

diff --git a/Gemfile b/Gemfile
index 0347de45..1542856c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.5.1'
\ No newline at end of file
+gem 'gitea-client', '~> 0.6.2'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 6e4f079f..467e19a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,7 +135,7 @@ GEM
     fugit (1.4.1)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    gitea-client (0.5.1)
+    gitea-client (0.6.2)
       rest-client (~> 2.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -478,7 +478,7 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
-  gitea-client (~> 0.5.1)
+  gitea-client (~> 0.6.2)
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)
diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index 76c527d8..2202df8d 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -1,2 +1,6 @@
 class Api::V1::BaseController < ApplicationController
+
+  include Api::ProjectHelper
+
+  skip_before_action :user_setup
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects_controller.rb b/app/controllers/api/v1/projects_controller.rb
new file mode 100644
index 00000000..05a3750c
--- /dev/null
+++ b/app/controllers/api/v1/projects_controller.rb
@@ -0,0 +1,11 @@
+class Api::V1::ProjectsController < Api::V1::BaseController 
+  before_action :load_project, only: [:show]
+
+  def index 
+    render_ok
+  end
+
+  def show 
+    @result_object = Api::V1::Projects::GetService.call(@project, current_user.gitea_token)
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/repos_controller.rb b/app/controllers/api/v1/repos_controller.rb
deleted file mode 100644
index 667f47db..00000000
--- a/app/controllers/api/v1/repos_controller.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Api::V1::ReposController < Api::V1::BaseController 
-
-  def index 
-    render_ok
-  end
-end
\ No newline at end of file
diff --git a/app/controllers/concerns/api/project_helper.rb b/app/controllers/concerns/api/project_helper.rb
new file mode 100644
index 00000000..0b444c48
--- /dev/null
+++ b/app/controllers/concerns/api/project_helper.rb
@@ -0,0 +1,20 @@
+module Api::ProjectHelper
+  extend ActiveSupport::Concern
+
+  def load_project 
+    namespace = params[:owner]
+    repo = params[:repo]
+
+    @project, @owner = Project.find_with_namespace(namespace, repo)
+
+    if @project
+      logger.info "###########：project not founded"
+			@project
+    else
+			logger.info "###########：project not found"
+      @project = nil
+       render_not_found and return
+    end
+    @project
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/get_service.rb b/app/services/api/v1/projects/get_service.rb
new file mode 100644
index 00000000..1244938c
--- /dev/null
+++ b/app/services/api/v1/projects/get_service.rb
@@ -0,0 +1,48 @@
+class Api::V1::Projects::GetService < ApplicationService
+
+  attr_reader :project, :token, :owner, :repo
+  attr_accessor :gitea_data, :gitea_branch_tag_count
+
+  def initialize(project, token=nil)
+    @project = project
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @token = token
+  end
+
+  def call 
+    $gitea_client.token = token unless token.blank? 
+    load_gitea_data
+    load_gitea_branch_tag_count
+
+    $gitea_client.token = nil unless token.blank? 
+
+    result_object
+  rescue 
+    raise Error, "服务器错误，请联系系统管理员！"
+  end
+
+  private 
+
+  def result_object
+    {
+      full_name: "#{owner}/#{repo}",
+      owner: project&.owner,
+      ssh_url: gitea_data["ssh_url"],
+      clone_url: gitea_data["clone_url"],
+      size: gitea_data["size"],
+      default_branch: gitea_data["default_branch"],
+      empty: gitea_data["empty"],
+      branch_count: gitea_branch_tag_count["branch_count"],
+      tag_count: gitea_branch_tag_count["tag_count"],
+    }
+  end
+
+  def load_gitea_data 
+    @gitea_data = $gitea_client.get_repos_by_owner_repo(owner, repo)
+  end
+
+  def load_gitea_branch_tag_count 
+    @gitea_branch_tag_count = $gitea_client.get_repos_branch_tag_count_by_owner_repo(owner, repo)
+  end
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/_simple_detail.json.jbuilder b/app/views/api/v1/projects/_simple_detail.json.jbuilder
new file mode 100644
index 00000000..f5f6b1db
--- /dev/null
+++ b/app/views/api/v1/projects/_simple_detail.json.jbuilder
@@ -0,0 +1,10 @@
+if project.present?
+  json.type @project.project_type
+  json.(project, 
+    :description, :forked_count, :forked_from_project_id, :identifier, 
+    :issues_count, :pull_requests_count, :invite_code, :website, :platform,
+    :name, :open_devops, :praises_count, :is_public, :status, :watchers_count,
+    :ignore_id, :license_id, :project_category_id, :project_language_id)
+else 
+  json.nil!
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/show.json.jbuilder b/app/views/api/v1/projects/show.json.jbuilder
new file mode 100644
index 00000000..40862365
--- /dev/null
+++ b/app/views/api/v1/projects/show.json.jbuilder
@@ -0,0 +1,5 @@
+json.owner do 
+  json.partial! "api/v1/users/simple_user", user: @result_object[:owner]
+end
+json.(@result_object, :full_name, :ssh_url, :clone_url, :default_branch, :empty, :branch_count, :tag_count)
+json.partial! "api/v1/projects/simple_detail", project: @project
\ No newline at end of file
diff --git a/app/views/api/v1/users/_simple_user.json.jbuilder b/app/views/api/v1/users/_simple_user.json.jbuilder
new file mode 100644
index 00000000..ef45bcd9
--- /dev/null
+++ b/app/views/api/v1/users/_simple_user.json.jbuilder
@@ -0,0 +1,9 @@
+if user.present?
+  json.id user.id
+  json.type user.type
+  json.name user.real_name
+  json.login user.login
+  json.image_url url_to_avatar(user)
+else 
+  json.nil!
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 718f705a..cf55cfcf 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -1,7 +1,21 @@
 defaults format: :json do 
   namespace :api do 
     namespace :v1 do 
-      resources :repos
+      resources :projects, only: [:index]
+      # 项目相关的api
+      scope ':owner/:repo' do 
+        # projects
+        resource :projects, path: '/', only: [:show, :update, :edit, :destroy]
+
+        # projects文件夹下的
+        scope module: :projects do 
+          resources :issues
+          resources :pull_requests
+          resources :versions 
+          resources :release_versions
+        end
+      end
+      
     end
   end
 end
\ No newline at end of file

From d14bf35ca1cdca2b32d1448dd287066662b73a36 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 23 Jun 2022 11:33:11 +0800
Subject: [PATCH 080/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20gitea=20module?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb      |  4 ++--
 app/controllers/concerns/acceleratorable.rb    |  6 +++---
 app/controllers/repositories_controller.rb     | 12 ++++++------
 app/helpers/projects_helper.rb                 |  2 +-
 app/interactors/gitea/register_interactor.rb   |  4 ++--
 app/libs/ci/drone/server.rb                    |  2 +-
 app/libs/{gitea.rb => gitea_service.rb}        |  2 +-
 app/services/educoder/client_service.rb        |  2 +-
 app/services/gitea/accelerator/base_service.rb |  2 +-
 app/services/gitea/client_service.rb           |  4 ++--
 app/services/gitea/user/delete_service.rb      |  4 ++--
 app/services/gitea/user/update_service.rb      |  2 +-
 app/services/repositories/create_service.rb    |  2 +-
 lib/tasks/sync_data_to_gitea.rake              |  2 +-
 14 files changed, 25 insertions(+), 25 deletions(-)
 rename app/libs/{gitea.rb => gitea_service.rb} (96%)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 3aa98257..79047b51 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -33,8 +33,8 @@ class AttachmentsController < ApplicationController
     normal_status(-1, "参数缺失") if params[:download_url].blank?
     url = URI.encode(params[:download_url].to_s.gsub("http:", "https:"))
     if url.starts_with?(base_url)
-      domain  = Gitea.gitea_config[:domain]
-      api_url = Gitea.gitea_config[:base_url]
+      domain  = GiteaService.gitea_config[:domain]
+      api_url = GiteaService.gitea_config[:base_url]
       url = url.split(base_url)[1].gsub("api", "repos").gsub('?filepath=', '/').gsub('&', '?')
       request_url = [domain, api_url, url, "?ref=#{params[:ref]}&access_token=#{current_user&.gitea_token}"].join
       response = Faraday.get(request_url)
diff --git a/app/controllers/concerns/acceleratorable.rb b/app/controllers/concerns/acceleratorable.rb
index 5243ac53..88ec4dd6 100644
--- a/app/controllers/concerns/acceleratorable.rb
+++ b/app/controllers/concerns/acceleratorable.rb
@@ -18,15 +18,15 @@ module Acceleratorable
   end
 
   def accelerator_domain
-    Gitea.gitea_config[:accelerator]["domain"]
+    GiteaService.gitea_config[:accelerator]["domain"]
   end
 
   def accelerator_username
-    Gitea.gitea_config[:accelerator]["access_key_id"]
+    GiteaService.gitea_config[:accelerator]["access_key_id"]
   end
   
   def config_accelerator?
-    Gitea.gitea_config[:accelerator].present?
+    GiteaService.gitea_config[:accelerator].present?
   end
   
   def is_foreign_url?(clone_addr)
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index a2ab33b2..34ac9763 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -54,7 +54,7 @@ class RepositoriesController < ApplicationController
     else
       @entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
       @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
-      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
+      @path = GiteaService.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
     end
   end
 
@@ -222,7 +222,7 @@ class RepositoriesController < ApplicationController
     else
       result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
     end
-    @path = Gitea.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/"
+    @path = GiteaService.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/"
     @readme = result[:status] === :success ? result[:body] : nil
     @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path)
     @readme['replace_content'] = readme_decode64_content(@readme, @owner, @repository, params[:ref], @path)
@@ -240,8 +240,8 @@ class RepositoriesController < ApplicationController
   end
 
   def archive
-    domain  = Gitea.gitea_config[:domain]
-    api_url = Gitea.gitea_config[:base_url]
+    domain  = GiteaService.gitea_config[:domain]
+    api_url = GiteaService.gitea_config[:base_url]
     archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{Addressable::URI.escape(params[:archive])}"
 
     file_path = [domain, api_url, archive_url].join
@@ -253,8 +253,8 @@ class RepositoriesController < ApplicationController
   end
   
   def raw 
-    domain  = Gitea.gitea_config[:domain]
-    api_url = Gitea.gitea_config[:base_url]
+    domain  = GiteaService.gitea_config[:domain]
+    api_url = GiteaService.gitea_config[:base_url]
 
     url = "/repos/#{@owner.login}/#{@repository.identifier}/raw/#{Addressable::URI.escape(params[:filepath])}?ref=#{Addressable::URI.escape(params[:ref])}"
     file_path = [domain, api_url, url].join
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index cc4a3fe0..0dcb6ca1 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -30,7 +30,7 @@ module ProjectsHelper
   end
 
   def gitea_domain
-    Gitea.gitea_config[:domain]
+    GiteaService.gitea_config[:domain]
   end
 
   def find_user_by_login_or_mail(identifier)
diff --git a/app/interactors/gitea/register_interactor.rb b/app/interactors/gitea/register_interactor.rb
index e188809a..ebb2bc4a 100644
--- a/app/interactors/gitea/register_interactor.rb
+++ b/app/interactors/gitea/register_interactor.rb
@@ -44,8 +44,8 @@ module Gitea
 
     def token
       {
-        username: Gitea.gitea_config[:access_key_id],
-        password: Gitea.gitea_config[:access_key_secret]
+        username: GiteaService.gitea_config[:access_key_id],
+        password: GiteaService.gitea_config[:access_key_secret]
       }
     end
   end
diff --git a/app/libs/ci/drone/server.rb b/app/libs/ci/drone/server.rb
index add2e439..de23dd73 100644
--- a/app/libs/ci/drone/server.rb
+++ b/app/libs/ci/drone/server.rb
@@ -37,7 +37,7 @@ class Ci::Drone::Server
 
   private
     def gitea_url
-      Gitea.gitea_config[:domain]
+      GiteaService.gitea_config[:domain]
     end
 
     def database_username
diff --git a/app/libs/gitea.rb b/app/libs/gitea_service.rb
similarity index 96%
rename from app/libs/gitea.rb
rename to app/libs/gitea_service.rb
index 6679b89d..b44f7948 100644
--- a/app/libs/gitea.rb
+++ b/app/libs/gitea_service.rb
@@ -1,4 +1,4 @@
-module Gitea
+module GiteaService
   class << self
     def gitea_config
       gitea_config = {}
diff --git a/app/services/educoder/client_service.rb b/app/services/educoder/client_service.rb
index 6c5c10d9..1e77ad89 100644
--- a/app/services/educoder/client_service.rb
+++ b/app/services/educoder/client_service.rb
@@ -81,7 +81,7 @@ class Educoder::ClientService < ApplicationService
   end
 
   def access_key_secret
-    Gitea.gitea_config[:access_key_secret]
+    GiteaService.gitea_config[:access_key_secret]
   end
 
   def api_url(url)
diff --git a/app/services/gitea/accelerator/base_service.rb b/app/services/gitea/accelerator/base_service.rb
index e63d77aa..9a66eb2b 100644
--- a/app/services/gitea/accelerator/base_service.rb
+++ b/app/services/gitea/accelerator/base_service.rb
@@ -56,7 +56,7 @@ class Gitea::Accelerator::BaseService < ApplicationService
   end
 
   def accelerator
-    Gitea.gitea_config[:accelerator]
+    GiteaService.gitea_config[:accelerator]
   end
 
   def render_status(response)
diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb
index b0c842db..e2bd9d49 100644
--- a/app/services/gitea/client_service.rb
+++ b/app/services/gitea/client_service.rb
@@ -96,11 +96,11 @@ class Gitea::ClientService < ApplicationService
   end
 
   def base_url
-    Gitea.gitea_config[:base_url]
+    GiteaService.gitea_config[:base_url]
   end
 
   def domain
-    Gitea.gitea_config[:domain]
+    GiteaService.gitea_config[:domain]
   end
 
   def api_url
diff --git a/app/services/gitea/user/delete_service.rb b/app/services/gitea/user/delete_service.rb
index 5df3cb6b..9011158d 100644
--- a/app/services/gitea/user/delete_service.rb
+++ b/app/services/gitea/user/delete_service.rb
@@ -14,8 +14,8 @@ class Gitea::User::DeleteService < Gitea::ClientService
   private
   def token
     {
-      username: Gitea.gitea_config[:access_key_id],
-      password: Gitea.gitea_config[:access_key_secret]
+      username: GiteaService.gitea_config[:access_key_id],
+      password: GiteaService.gitea_config[:access_key_secret]
     }
   end
 
diff --git a/app/services/gitea/user/update_service.rb b/app/services/gitea/user/update_service.rb
index 5e6108a9..9826c7ed 100644
--- a/app/services/gitea/user/update_service.rb
+++ b/app/services/gitea/user/update_service.rb
@@ -17,7 +17,7 @@ class Gitea::User::UpdateService < Gitea::ClientService
   # source_id	integer($int64)
   # website	string
 
-  def initialize(edit_username, params={}, token={username: Gitea.gitea_config[:access_key_id], password: Gitea.gitea_config[:access_key_secret]})
+  def initialize(edit_username, params={}, token={username: GiteaService.gitea_config[:access_key_id], password: GiteaService.gitea_config[:access_key_secret]})
     @token         = token
     @params        = params
     @edit_username = edit_username
diff --git a/app/services/repositories/create_service.rb b/app/services/repositories/create_service.rb
index f0c584e1..e7ff8bd1 100644
--- a/app/services/repositories/create_service.rb
+++ b/app/services/repositories/create_service.rb
@@ -63,7 +63,7 @@ class Repositories::CreateService < ApplicationService
   end
 
   def remote_repository_url
-    [Gitea.gitea_config[:domain], '/', user.login, '/', params[:identifier], ".git"].join("")
+    [GiteaService.gitea_config[:domain], '/', user.login, '/', params[:identifier], ".git"].join("")
   end
 
   def repository_params
diff --git a/lib/tasks/sync_data_to_gitea.rake b/lib/tasks/sync_data_to_gitea.rake
index 9e30b290..85df9c69 100644
--- a/lib/tasks/sync_data_to_gitea.rake
+++ b/lib/tasks/sync_data_to_gitea.rake
@@ -128,7 +128,7 @@ namespace :sync_data_to_gitea do
   end
 
   def remote_repository_url(username, identifier)
-    [Gitea.gitea_config[:domain], '/', username, '/', identifier, ".git"].join("")
+    [GiteaService.gitea_config[:domain], '/', username, '/', identifier, ".git"].join("")
   end
 
   def generate_identifier

From 5d0849a1483413d1c0cb0cc75d76faaf2a651279 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 23 Jun 2022 12:19:03 +0800
Subject: [PATCH 081/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?helper=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/base_controller.rb     |  7 ++++
 .../api/v1/users/projects_controller.rb       |  7 ++++
 app/controllers/api/v1/users_controller.rb    |  6 ++++
 app/controllers/concerns/api/user_helper.rb   | 19 +++++++++++
 .../v1/projects/_simple_detail.json.jbuilder  |  2 +-
 .../api/v1/users/projects/index.json.jbuilder |  5 +++
 config/routes/api.rb                          | 33 ++++++++++++-------
 7 files changed, 66 insertions(+), 13 deletions(-)
 create mode 100644 app/controllers/api/v1/users/projects_controller.rb
 create mode 100644 app/controllers/api/v1/users_controller.rb
 create mode 100644 app/controllers/concerns/api/user_helper.rb
 create mode 100644 app/views/api/v1/users/projects/index.json.jbuilder

diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index 2202df8d..4fb6c875 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -1,6 +1,13 @@
 class Api::V1::BaseController < ApplicationController
 
   include Api::ProjectHelper
+  include Api::UserHelper
 
+  before_action :doorkeeper_authorize!
   skip_before_action :user_setup
+
+  protected 
+  def current_user 
+    User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
+  end
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/users/projects_controller.rb b/app/controllers/api/v1/users/projects_controller.rb
new file mode 100644
index 00000000..d130071a
--- /dev/null
+++ b/app/controllers/api/v1/users/projects_controller.rb
@@ -0,0 +1,7 @@
+class Api::V1::Users::ProjectsController < Api::V1::BaseController 
+  before_action :load_observe_user
+
+  def index 
+    @projects = kaminari_paginate(@observe_user.projects)
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
new file mode 100644
index 00000000..55f5cfb2
--- /dev/null
+++ b/app/controllers/api/v1/users_controller.rb
@@ -0,0 +1,6 @@
+class Api::V1::UsersController < Api::V1::BaseController 
+
+  def index 
+    render_ok 
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/concerns/api/user_helper.rb b/app/controllers/concerns/api/user_helper.rb
new file mode 100644
index 00000000..e6156ea5
--- /dev/null
+++ b/app/controllers/concerns/api/user_helper.rb
@@ -0,0 +1,19 @@
+module Api::UserHelper
+  extend ActiveSupport::Concern
+
+  def load_observe_user 
+    username = params[:owner]
+
+    @observe_user = User.find_by(login: username)
+
+    if @observe_user
+      logger.info "###########observe_user not founded"
+			@observe_user
+    else
+			logger.info "###########observe_user not found"
+      @observe_user = nil
+       render_not_found and return
+    end
+    @observe_user
+  end
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/_simple_detail.json.jbuilder b/app/views/api/v1/projects/_simple_detail.json.jbuilder
index f5f6b1db..3eadaaf8 100644
--- a/app/views/api/v1/projects/_simple_detail.json.jbuilder
+++ b/app/views/api/v1/projects/_simple_detail.json.jbuilder
@@ -1,5 +1,5 @@
 if project.present?
-  json.type @project.project_type
+  json.type project.project_type
   json.(project, 
     :description, :forked_count, :forked_from_project_id, :identifier, 
     :issues_count, :pull_requests_count, :invite_code, :website, :platform,
diff --git a/app/views/api/v1/users/projects/index.json.jbuilder b/app/views/api/v1/users/projects/index.json.jbuilder
new file mode 100644
index 00000000..c126d414
--- /dev/null
+++ b/app/views/api/v1/users/projects/index.json.jbuilder
@@ -0,0 +1,5 @@
+json.total_count @projects.total_count
+
+json.projects @projects do |project|
+  json.partial! "api/v1/projects/simple_detail", project: project
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index cf55cfcf..5cefe793 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -1,20 +1,29 @@
 defaults format: :json do 
   namespace :api do 
     namespace :v1 do 
-      resources :projects, only: [:index]
-      # 项目相关的api
-      scope ':owner/:repo' do 
-        # projects
-        resource :projects, path: '/', only: [:show, :update, :edit, :destroy]
-
-        # projects文件夹下的
-        scope module: :projects do 
-          resources :issues
-          resources :pull_requests
-          resources :versions 
-          resources :release_versions
+      scope ':owner' do 
+        resource :users, path: '/', only: [:show, :update, :edit, :destroy]
+        scope module: :users do 
+          resources :projects, only: [:index]
         end
+
+        scope ':repo' do 
+          # projects
+          resource :projects, path: '/', only: [:show, :update, :edit, :destroy]
+
+          # projects文件夹下的
+          scope module: :projects do 
+            resources :issues
+            resources :pull_requests
+            resources :versions 
+            resources :release_versions
+          end
+        end
+
       end
+
+      resources :projects, only: [:index]
+
       
     end
   end

From fe58175ee081edb23d274441574835842c874ddb Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 23 Jun 2022 16:14:00 +0800
Subject: [PATCH 082/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20webhooks=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8token=E8=AE=BF=E9=97=AE=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  4 +-
 .../api/v1/projects/webhooks_controller.rb    | 55 +++++++++++++++++
 .../v1/projects/webhooks/create_service.rb    | 60 ++++++++++++++++++
 .../v1/projects/webhooks/delete_service.rb    | 30 +++++++++
 .../api/v1/projects/webhooks/get_service.rb   | 30 +++++++++
 .../v1/projects/webhooks/hooktasks_service.rb | 30 +++++++++
 .../api/v1/projects/webhooks/list_service.rb  | 29 +++++++++
 .../api/v1/projects/webhooks/tests_service.rb | 30 +++++++++
 .../v1/projects/webhooks/update_service.rb    | 61 +++++++++++++++++++
 .../webhooks/_simple_detail.json.jbuilder     |  3 +
 .../_simple_gitea_detail.json.jbuilder        |  8 +++
 .../v1/projects/webhooks/create.json.jbuilder |  1 +
 .../projects/webhooks/hooktasks.json.jbuilder |  6 ++
 .../v1/projects/webhooks/index.json.jbuilder  |  4 ++
 .../v1/projects/webhooks/show.json.jbuilder   |  1 +
 .../v1/projects/webhooks/update.json.jbuilder |  1 +
 config/routes/api.rb                          |  6 ++
 18 files changed, 358 insertions(+), 3 deletions(-)
 create mode 100644 app/controllers/api/v1/projects/webhooks_controller.rb
 create mode 100644 app/services/api/v1/projects/webhooks/create_service.rb
 create mode 100644 app/services/api/v1/projects/webhooks/delete_service.rb
 create mode 100644 app/services/api/v1/projects/webhooks/get_service.rb
 create mode 100644 app/services/api/v1/projects/webhooks/hooktasks_service.rb
 create mode 100644 app/services/api/v1/projects/webhooks/list_service.rb
 create mode 100644 app/services/api/v1/projects/webhooks/tests_service.rb
 create mode 100644 app/services/api/v1/projects/webhooks/update_service.rb
 create mode 100644 app/views/api/v1/projects/webhooks/_simple_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/webhooks/_simple_gitea_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/webhooks/create.json.jbuilder
 create mode 100644 app/views/api/v1/projects/webhooks/hooktasks.json.jbuilder
 create mode 100644 app/views/api/v1/projects/webhooks/index.json.jbuilder
 create mode 100644 app/views/api/v1/projects/webhooks/show.json.jbuilder
 create mode 100644 app/views/api/v1/projects/webhooks/update.json.jbuilder

diff --git a/Gemfile b/Gemfile
index 1542856c..1b3ff3e0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.6.2'
\ No newline at end of file
+gem 'gitea-client', '~> 0.8.1'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 467e19a2..e231bbef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,7 +135,7 @@ GEM
     fugit (1.4.1)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    gitea-client (0.6.2)
+    gitea-client (0.8.1)
       rest-client (~> 2.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -478,7 +478,7 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
-  gitea-client (~> 0.6.2)
+  gitea-client (~> 0.8.1)
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)
diff --git a/app/controllers/api/v1/projects/webhooks_controller.rb b/app/controllers/api/v1/projects/webhooks_controller.rb
new file mode 100644
index 00000000..bb828a70
--- /dev/null
+++ b/app/controllers/api/v1/projects/webhooks_controller.rb
@@ -0,0 +1,55 @@
+class Api::V1::Projects::WebhooksController < Api::V1::BaseController 
+  before_action :load_project
+  before_action :find_webhook, only: [:show, :update, :destroy, :tests, :hooktasks]
+
+  def index 
+    # @result_object = Api::V1::Projects::Webhooks::ListService.call(@project, current_user&.gitea_token)
+    @webhooks = @project.webhooks
+    @webhooks = kaminari_paginate(@webhooks)
+  end
+
+  def create 
+    @result_object = Api::V1::Projects::Webhooks::CreateService.call(@project, webhook_params, current_user&.gitea_token)
+  end
+
+  def show 
+    @result_object = Api::V1::Projects::Webhooks::GetService.call(@project, params[:id], current_user&.gitea_token)
+  end
+
+  def update 
+    @result_object = Api::V1::Projects::Webhooks::UpdateService.call(@project, params[:id], webhook_params, current_user&.gitea_token)
+  end
+
+  def destroy 
+    @result_object = Api::V1::Projects::Webhooks::DeleteService.call(@project, params[:id], current_user&.gitea_token)
+    if @result_object
+      return render_ok 
+    else
+      return render_error('删除失败!') 
+    end
+  end
+
+  def tests 
+    @result_object = Api::V1::Projects::Webhooks::TestsService.call(@project, params[:id], current_user&.gitea_token)
+    if @result_object
+      return render_ok 
+    else
+      return render_error('推送失败!') 
+    end
+  end
+
+  def hooktasks 
+    @hooktasks = @webhook.tasks.where(is_delivered: true).order("delivered desc")
+    @hooktasks = kaminari_paginate(@hooktasks)
+  end
+
+  private 
+  def webhook_params 
+    params.require(:webhook).permit(:active, :branch_filter, :http_method, :url, :content_type, :secret, events: [])
+  end
+
+  def find_webhook 
+    @webhook = Gitea::Webhook.find_by_id(params[:id])
+    return render_not_found unless @webhook.present?
+  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
new file mode 100644
index 00000000..401ff9ff
--- /dev/null
+++ b/app/services/api/v1/projects/webhooks/create_service.rb
@@ -0,0 +1,60 @@
+class Api::V1::Projects::Webhooks::CreateService < ApplicationService
+  include ActiveModel::Model
+
+  attr_reader :project, :token, :owner, :repo, :active, :branch_filter, :content_type, :url, :http_method, :secret, :events
+  attr_accessor :gitea_data
+
+  validates :url, format: { with: URI::regexp(%w[http https]), message: "请输入正确的地址" }
+  validates :active, inclusion: {in: [true, false]}
+  validates :http_method, inclusion: { in: %w(POST GET), message: "请输入正确的请求方式"}
+  validates :content_type, inclusion: { in: %w(json form), message: "请输入正确的Content Type"} 
+
+  def initialize(project, params, token=nil)
+    @project = project
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @active = params[:active]
+    @branch_filter = params[:branch_filter]
+    @content_type = params[:content_type]
+    @url = params[:url]
+    @http_method = params[:http_method]
+    @secret = params[:secret]
+    @events = params[:events]
+    @token = token
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid?
+    begin
+      $gitea_client.token = token unless token.blank? 
+
+      excute_data_to_gitea
+
+      $gitea_client.token = nil unless token.blank? 
+
+      gitea_data
+    rescue 
+      raise Error, "服务器错误，请联系系统管理员！"
+    end
+  end
+
+  private 
+  def request_body 
+    {
+      active: active,
+      branch_filter: branch_filter,
+      config: {
+        content_type: content_type,
+        url: url,
+        http_method: http_method,
+        secret: secret
+      },
+      events: events || [],
+      type: 'gitea',
+    }
+  end
+
+  def excute_data_to_gitea 
+    @gitea_data = $gitea_client.post_repos_hooks_by_owner_repo(owner, repo, {body: request_body.to_json})
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/webhooks/delete_service.rb b/app/services/api/v1/projects/webhooks/delete_service.rb
new file mode 100644
index 00000000..53fd8edd
--- /dev/null
+++ b/app/services/api/v1/projects/webhooks/delete_service.rb
@@ -0,0 +1,30 @@
+class Api::V1::Projects::Webhooks::DeleteService < ApplicationService
+
+  attr_reader :project, :id, :token, :owner, :repo
+  attr_accessor :gitea_data
+
+  def initialize(project, id, token=nil)
+    @project = project
+    @id = id
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @token = token
+  end
+
+  def call 
+    $gitea_client.token = token unless token.blank? 
+    excute_data_to_gitea
+
+    $gitea_client.token = nil unless token.blank? 
+
+    gitea_data
+  # rescue 
+  #   raise Error, "服务器错误，请联系系统管理员！"
+  end
+
+  private 
+
+  def excute_data_to_gitea 
+    @gitea_data = $gitea_client.delete_repos_hooks_by_owner_repo_id(owner, repo, id)
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/webhooks/get_service.rb b/app/services/api/v1/projects/webhooks/get_service.rb
new file mode 100644
index 00000000..1ae5c54e
--- /dev/null
+++ b/app/services/api/v1/projects/webhooks/get_service.rb
@@ -0,0 +1,30 @@
+class Api::V1::Projects::Webhooks::GetService < ApplicationService
+
+  attr_reader :project, :id, :token, :owner, :repo
+  attr_accessor :gitea_data
+
+  def initialize(project, id, token=nil)
+    @project = project
+    @id = id
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @token = token
+  end
+
+  def call 
+    $gitea_client.token = token unless token.blank? 
+    load_gitea_data
+
+    $gitea_client.token = nil unless token.blank? 
+
+    gitea_data
+  rescue 
+    raise Error, "服务器错误，请联系系统管理员！"
+  end
+
+  private 
+
+  def load_gitea_data 
+    @gitea_data = $gitea_client.get_repos_hooks_by_owner_repo_id(owner, repo, id)
+  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
new file mode 100644
index 00000000..4dd90ee3
--- /dev/null
+++ b/app/services/api/v1/projects/webhooks/hooktasks_service.rb
@@ -0,0 +1,30 @@
+class Api::V1::Projects::Webhooks::ListService < ApplicationService
+
+  attr_reader :project, :id, :token, :owner, :repo
+  attr_accessor :gitea_data
+
+  def initialize(project, id, token=nil)
+    @project = project
+    @id = id
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @token = token
+  end
+
+  def call 
+    $gitea_client.token = token unless token.blank? 
+    load_gitea_data
+
+    $gitea_client.token = nil unless token.blank? 
+
+    gitea_data
+  rescue 
+    raise Error, "服务器错误，请联系系统管理员！"
+  end
+
+  private 
+
+  def load_gitea_data 
+    @gitea_data = $gitea_client.get_repos_hooks_hooktasks_by_owner_repo(owner, repo, id)
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/webhooks/list_service.rb b/app/services/api/v1/projects/webhooks/list_service.rb
new file mode 100644
index 00000000..fb746de4
--- /dev/null
+++ b/app/services/api/v1/projects/webhooks/list_service.rb
@@ -0,0 +1,29 @@
+class Api::V1::Projects::Webhooks::ListService < ApplicationService
+
+  attr_reader :project, :token, :owner, :repo
+  attr_accessor :gitea_data
+
+  def initialize(project, token=nil)
+    @project = project
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @token = token
+  end
+
+  def call 
+    $gitea_client.token = token unless token.blank? 
+    load_gitea_data
+
+    $gitea_client.token = nil unless token.blank? 
+
+    gitea_data
+  rescue 
+    raise Error, "服务器错误，请联系系统管理员！"
+  end
+
+  private 
+
+  def load_gitea_data 
+    @gitea_data = $gitea_client.get_repos_hooks_by_owner_repo(owner, repo)
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/webhooks/tests_service.rb b/app/services/api/v1/projects/webhooks/tests_service.rb
new file mode 100644
index 00000000..3d8b99c9
--- /dev/null
+++ b/app/services/api/v1/projects/webhooks/tests_service.rb
@@ -0,0 +1,30 @@
+class Api::V1::Projects::Webhooks::TestsService < ApplicationService
+
+  attr_reader :project, :id, :token, :owner, :repo
+  attr_accessor :gitea_data
+
+  def initialize(project, id, token=nil)
+    @project = project
+    @id = id
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @token = token
+  end
+
+  def call 
+    $gitea_client.token = token unless token.blank? 
+    excute_data_to_gitea
+
+    $gitea_client.token = nil unless token.blank? 
+
+    gitea_data
+  rescue 
+    raise Error, "服务器错误，请联系系统管理员！"
+  end
+
+  private 
+
+  def excute_data_to_gitea 
+    @gitea_data = $gitea_client.post_repos_hooks_tests_by_owner_repo_id(owner, repo, id)
+  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
new file mode 100644
index 00000000..19ff4f32
--- /dev/null
+++ b/app/services/api/v1/projects/webhooks/update_service.rb
@@ -0,0 +1,61 @@
+class Api::V1::Projects::Webhooks::UpdateService < ApplicationService
+  include ActiveModel::Model
+
+  attr_reader :project, :id, :token, :owner, :repo, :active, :branch_filter, :content_type, :url, :http_method, :secret, :events
+  attr_accessor :gitea_data
+
+  validates :url, format: { with: URI::regexp(%w[http https]), message: "请输入正确的地址" }
+  validates :active, inclusion: {in: [true, false]}
+  validates :http_method, inclusion: { in: %w(POST GET), message: "请输入正确的请求方式"}
+  validates :content_type, inclusion: { in: %w(json form), message: "请输入正确的Content Type"} 
+
+  def initialize(project, id, params, token=nil)
+    @project = project
+    @id = id
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @active = params[:active]
+    @branch_filter = params[:branch_filter]
+    @content_type = params[:content_type]
+    @url = params[:url]
+    @http_method = params[:http_method]
+    @secret = params[:secret]
+    @events = params[:events]
+    @token = token
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid?
+    begin
+      $gitea_client.token = token unless token.blank? 
+
+      excute_data_to_gitea
+
+      $gitea_client.token = nil unless token.blank? 
+
+      gitea_data
+    rescue 
+      raise Error, "服务器错误，请联系系统管理员！"
+    end
+  end
+
+  private 
+  def request_body 
+    {
+      active: active,
+      branch_filter: branch_filter,
+      config: {
+        content_type: content_type,
+        url: url,
+        http_method: http_method,
+        secret: secret
+      },
+      events: events || [],
+      type: 'gitea',
+    }
+  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})
+  end
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/webhooks/_simple_detail.json.jbuilder b/app/views/api/v1/projects/webhooks/_simple_detail.json.jbuilder
new file mode 100644
index 00000000..145b3e59
--- /dev/null
+++ b/app/views/api/v1/projects/webhooks/_simple_detail.json.jbuilder
@@ -0,0 +1,3 @@
+json.(webhook, :id, :url, :http_method, :is_active)
+json.last_status webhook.last_status
+json.create_time Time.at(webhook.created_unix).strftime("%Y-%m-%d %H:%M:%S")
\ No newline at end of file
diff --git a/app/views/api/v1/projects/webhooks/_simple_gitea_detail.json.jbuilder b/app/views/api/v1/projects/webhooks/_simple_gitea_detail.json.jbuilder
new file mode 100644
index 00000000..ca180d8b
--- /dev/null
+++ b/app/views/api/v1/projects/webhooks/_simple_gitea_detail.json.jbuilder
@@ -0,0 +1,8 @@
+json.id webhook["id"]
+json.content_type webhook['config']['content_type']
+json.http_method webhook['config']['http_method']
+json.url webhook['config']['url']
+json.events webhook['events']
+json.active webhook['active']
+json.branch_filter webhook['branch_filter']
+json.created_at format_time(webhook['created_at'].to_time)
\ No newline at end of file
diff --git a/app/views/api/v1/projects/webhooks/create.json.jbuilder b/app/views/api/v1/projects/webhooks/create.json.jbuilder
new file mode 100644
index 00000000..01f91963
--- /dev/null
+++ b/app/views/api/v1/projects/webhooks/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "api/v1/projects/webhooks/simple_gitea_detail", webhook: @result_object
\ No newline at end of file
diff --git a/app/views/api/v1/projects/webhooks/hooktasks.json.jbuilder b/app/views/api/v1/projects/webhooks/hooktasks.json.jbuilder
new file mode 100644
index 00000000..618a0551
--- /dev/null
+++ b/app/views/api/v1/projects/webhooks/hooktasks.json.jbuilder
@@ -0,0 +1,6 @@
+json.total_count @hooktasks.total_count 
+json.hooktasks @hooktasks.each do |task|
+  json.(task, :id, :event_type, :type, :uuid, :is_succeed, :is_delivered, :payload_content, :request_content)
+  json.response_content task.response_content_json
+  json.delivered_time Time.at(task.delivered*10**-9).strftime("%Y-%m-%d %H:%M:%S")
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/webhooks/index.json.jbuilder b/app/views/api/v1/projects/webhooks/index.json.jbuilder
new file mode 100644
index 00000000..7a375619
--- /dev/null
+++ b/app/views/api/v1/projects/webhooks/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.total_count @webhooks.total_count
+json.webhooks @webhooks do |webhook|
+  json.partial! "api/v1/projects/webhooks/simple_detail", webhook: webhook
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/webhooks/show.json.jbuilder b/app/views/api/v1/projects/webhooks/show.json.jbuilder
new file mode 100644
index 00000000..01f91963
--- /dev/null
+++ b/app/views/api/v1/projects/webhooks/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "api/v1/projects/webhooks/simple_gitea_detail", webhook: @result_object
\ No newline at end of file
diff --git a/app/views/api/v1/projects/webhooks/update.json.jbuilder b/app/views/api/v1/projects/webhooks/update.json.jbuilder
new file mode 100644
index 00000000..01f91963
--- /dev/null
+++ b/app/views/api/v1/projects/webhooks/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "api/v1/projects/webhooks/simple_gitea_detail", webhook: @result_object
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 5cefe793..32acdabd 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -17,6 +17,12 @@ defaults format: :json do
             resources :pull_requests
             resources :versions 
             resources :release_versions
+            resources :webhooks do 
+              member do 
+                post :tests 
+                get :hooktasks 
+              end
+            end
           end
         end
 

From 7cad953413e5282de00bb8c666ada9e204313a4b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 23 Jun 2022 18:16:57 +0800
Subject: [PATCH 083/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/base_controller.rb     |  5 ++
 .../api/v1/projects/webhooks_controller.rb    |  2 +-
 .../api/v1/users/projects_controller.rb       |  8 +-
 .../api/v1/users/projects/list_service.rb     | 79 +++++++++++++++++++
 .../api/v1/users/projects/index.json.jbuilder |  3 +
 5 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 app/services/api/v1/users/projects/list_service.rb

diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index 4fb6c875..9170975b 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -10,4 +10,9 @@ class Api::V1::BaseController < ApplicationController
   def current_user 
     User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
   end
+
+  def require_manager_above
+    @project = load_project
+    return render_forbidden unless current_user.admin? && @project.manager?(current_user)
+  end
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/webhooks_controller.rb b/app/controllers/api/v1/projects/webhooks_controller.rb
index bb828a70..bb2c2172 100644
--- a/app/controllers/api/v1/projects/webhooks_controller.rb
+++ b/app/controllers/api/v1/projects/webhooks_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::Projects::WebhooksController < Api::V1::BaseController 
-  before_action :load_project
+  before_action :require_manager_above
   before_action :find_webhook, only: [:show, :update, :destroy, :tests, :hooktasks]
 
   def index 
diff --git a/app/controllers/api/v1/users/projects_controller.rb b/app/controllers/api/v1/users/projects_controller.rb
index d130071a..ac4b4832 100644
--- a/app/controllers/api/v1/users/projects_controller.rb
+++ b/app/controllers/api/v1/users/projects_controller.rb
@@ -2,6 +2,12 @@ class Api::V1::Users::ProjectsController < Api::V1::BaseController
   before_action :load_observe_user
 
   def index 
-    @projects = kaminari_paginate(@observe_user.projects)
+    @object_results = Api::V1::Users::Projects::ListService.call(@observe_user, query_params, current_user)
+    @projects = kaminari_paginate(@object_results)
+  end
+
+  private 
+  def query_params
+    params.permit(:category, :is_public, :project_type, :sort_by, :sort_direction, :search)
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb
new file mode 100644
index 00000000..32884ac7
--- /dev/null
+++ b/app/services/api/v1/users/projects/list_service.rb
@@ -0,0 +1,79 @@
+class Api::V1::Users::Projects::ListService < ApplicationService
+  include ActiveModel::Model
+
+  attr_reader :observe_user, :category, :is_public, :project_type, :sort_by, :sort_direction, :search, :current_user
+  attr_accessor :queried_projects
+
+  validates :category, inclusion: {in: %w(all join created watched forked), message: "请输入正确的Category"}
+  validates :is_public, inclusion: {in: [true, false], message: '请输入正确的IsPublic'}
+  validates :project_type, inclusion: {in: %w(common mirror sync_mirror), message: '请输入正确的ProjectType'}, allow_nil: true
+  validates :sort_by, inclusion: {in: Project.column_names, message: '请输入正确的SortBy'}
+  validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}
+
+  def initialize(observe_user, params, current_user=nil)
+    @observe_user = observe_user
+    @category = params[:category] || 'all'
+    @is_public = params[:is_public] || true
+    @project_type = params[:project_type]
+    @sort_by = params[:sort_by] || 'updated_on'
+    @sort_direction = params[:sort_direction] || 'desc'
+    @search = params[:search]
+    @current_user = current_user
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(", ") unless valid? 
+    # begin
+      project_query_data
+
+      queried_projects
+    # rescue 
+    #   raise Error, "服务器错误，请联系系统管理员！"
+    # end
+  end
+
+  private 
+  def project_query_data 
+    if current_user.admin?
+      projects = Project
+    else
+      projects = Project.visible 
+    end
+
+    case category 
+    when 'join'
+      normal_projects = projects.where.not(user_id: observe_user.id).members_projects(observe_user.id).to_sql 
+      org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: observe_user.id}).to_sql
+      projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct 
+    when 'created'
+      projects = projects.where(user_id: observe_user.id)
+    when 'watched'
+      projects = projects.where.not(user_id: observe_user.id).joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id})
+    when 'forked'
+      fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id)
+      projects = projects.where(id: fork_ids)
+    else
+      normal_projects = projects.members_projects(observe_user.id).to_sql
+      org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: observe_user.id}).to_sql
+      projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
+    end
+
+    if is_public
+      projects = projects.visible 
+    else
+      projects = projects.is_private
+    end
+
+    projects = projects.with_project_type(project_type) 
+
+    q = projects.ransack(name_or_identifier_cont: search)
+
+    scope = q.result.includes(:project_category, :project_language,:owner, :repository, :has_pinned_users)
+
+
+    scope = scope.order("projects.#{sort_by} #{sort_direction}")
+
+    @queried_projects = scope
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/api/v1/users/projects/index.json.jbuilder b/app/views/api/v1/users/projects/index.json.jbuilder
index c126d414..5450d2dd 100644
--- a/app/views/api/v1/users/projects/index.json.jbuilder
+++ b/app/views/api/v1/users/projects/index.json.jbuilder
@@ -1,5 +1,8 @@
 json.total_count @projects.total_count
 
 json.projects @projects do |project|
+  json.owner do 
+    json.partial! "api/v1/users/simple_user", user: project.owner
+  end
   json.partial! "api/v1/projects/simple_detail", project: project
 end
\ No newline at end of file

From 211581cef0ffababcf9b30f0090f3f35bd4da478 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 24 Jun 2022 09:26:01 +0800
Subject: [PATCH 084/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20webhooks=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E4=BD=BF=E7=94=A8=E6=96=B0api=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slate/source/includes/_repositories.md    | 108 ++++++++++--------
 .../v1/projects/webhooks/delete_service.rb    |   4 +-
 .../api/v1/users/projects/list_service.rb     |   8 +-
 3 files changed, 67 insertions(+), 53 deletions(-)

diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index a44d2b35..9238615e 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -1115,15 +1115,15 @@ await octokit.request('GET /api/yystopf/csfjkkj/contributors.json')
 
 ```shell
 curl -X GET \
-http://localhost:3000/api/yystopf/ceshi/webhooks.json
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 ```
 
 ```javascript
-await octokit.request('GET /api/yystopf/ceshi/webhooks.json')
+await octokit.request('GET /api/v1/yystopf/ceshi/webhooks.json')
 ```
 
 ### HTTP 请求
-`GET /api/:owner/:repo/webhooks.json`
+`GET /api/v1/:owner/:repo/webhooks.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
@@ -1200,15 +1200,15 @@ await octokit.request('GET /api/yystopf/ceshi/webhooks.json')
 
 ```shell
 curl -X GET \
-http://localhost:3000/api/yystopf/ceshi/webhooks/3/edit.json
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 ```
 
 ```javascript
-await octokit.request('GET /api/yystopf/ceshi/webhooks/3/edit.json')
+await octokit.request('GET /api/v1/yystopf/ceshi/webhooks/3.json')
 ```
 
 ### HTTP 请求
-`GET /api/:owner/:repo/webhooks/:id/edit.json`
+`GET /api/v1/:owner/:repo/webhooks/:id.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
@@ -1226,12 +1226,10 @@ await octokit.request('GET /api/yystopf/ceshi/webhooks/3/edit.json')
 |content_type       |string|POST Content Type|
 |http_method        |string|请求方式|
 |secret|            |string|密钥|
-|is_active          |bool  |是否激活|
-|type               |string|类型|
-|last_status        |string|最后一次推送的状态, waiting 等待,fail 失败,succeed 成功|
+|active          |bool  |是否激活|
 |branch_filter      |string|分支过滤|
 |events             |string|触发条件|
-|create_time        |string|创建时间|
+|create_at        |string|创建时间|
 
 
 参数| 含义|
@@ -1266,11 +1264,8 @@ await octokit.request('GET /api/yystopf/ceshi/webhooks/3/edit.json')
     "http_method": "GET",
     "content_type": "form",
     "url": "http://localhost:3000",
-    "secret": "123456",
-    "last_status": "succeed",
-    "is_active": true,
-    "type": "gitea",
-    "create_time": "2021-07-26 10:03:45",
+    "active": true,
+    "create_at": "2021-07-26 10:03",
     "branch_filter": "*",
     "events": [
         "create",
@@ -1305,15 +1300,15 @@ await octokit.request('GET /api/yystopf/ceshi/webhooks/3/edit.json')
 
 ```shell
 curl -X POST \
-http://localhost:3000/api/yystopf/ceshi/webhooks.json
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 ```
 
 ```javascript
-await octokit.request('POST /api/yystopf/ceshi/webhooks.json')
+await octokit.request('POST /api/v1/yystopf/ceshi/webhooks.json')
 ```
 
 ### HTTP 请求
-`POST /api/:owner/:repo/webhooks.json`
+`POST /api/v1/:owner/:repo/webhooks.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
@@ -1321,7 +1316,6 @@ await octokit.request('POST /api/yystopf/ceshi/webhooks.json')
 |owner                |是| | string |用户登录名  |
 |repo                 |是| | string |项目标识identifier  |
 |webhook.url          |是| | string |目标url  |
-|webhook.type         |否| | string |类型|
 |webhook.http_method  |是| | string | http方法, POST和GET |
 |webhook.content_type |是| | string | POST Content Type |
 |webhook.secret       |否| | string |密钥文本|
@@ -1335,24 +1329,24 @@ await octokit.request('POST /api/yystopf/ceshi/webhooks.json')
 --------- | ------- | ------- | 
 |create|创建分支或标签|
 |delete|分支或标签删除|
-|fork|仓库被fork|
+<!-- |fork|仓库被fork| -->
 |push|git仓库推送|
-|issue|疑修已打开、已关闭、已重新打开或编辑|
+<!-- |issue|疑修已打开、已关闭、已重新打开或编辑|
 |issue_assign|疑修被指派|
 |issue_label|疑修标签被更新或删除|
 |issue_milestone|疑修被收入里程碑|
-|issue_comment|疑修评论|
+|issue_comment|疑修评论| -->
 |pull_request|合并请求|
 |pull_request_assign|合并请求被指派|
-|pull_request_label|合并请求被贴上标签|
+<!-- |pull_request_label|合并请求被贴上标签|
 |pull_request_milestone|合并请求被记录于里程碑中|
-|pull_request_comment|合并请求被评论|
+|pull_request_comment|合并请求被评论| -->
 |pull_request_review_approved|合并请求被批准|
 |pull_request_review_rejected|合并请求被拒绝|
-|pull_request_review_comment|合并请求被提出审查意见|
+<!-- |pull_request_review_comment|合并请求被提出审查意见|
 |pull_request_sync|合并请求被同步|
 |repository|创建或删除仓库|
-|release|版本发布|
+|release|版本发布| -->
 
 
 > 请求的JSON示例:
@@ -1385,15 +1379,22 @@ await octokit.request('POST /api/yystopf/ceshi/webhooks.json')
 
 ```json
 {
-    "id": 18,
-    "type": "gitea",
+    "id": 68,
     "content_type": "json",
-    "url": "http://localhost:10000",
+    "http_method": "GET",
+    "url": "http://127.0.0.1:3000",
     "events": [
-        "push"
+        "create",
+        "delete",
+        "push",
+        "pull_request",
+        "pull_request_assign",
+        "pull_request_review_approved",
+        "pull_request_review_rejected"
     ],
     "active": true,
-    "create_time": "2021-07-26 18:53:43"
+    "branch_filter": "*",
+    "created_at": "2022-06-23 15:52"
 }
 ```
 <aside class="success">
@@ -1407,15 +1408,15 @@ await octokit.request('POST /api/yystopf/ceshi/webhooks.json')
 
 ```shell
 curl -X PATCH \
-http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 ```
 
 ```javascript
-await octokit.request('PATCH /api/yystopf/ceshi/webhooks/7.json')
+await octokit.request('PATCH /api/v1/yystopf/ceshi/webhooks/7.json')
 ```
 
 ### HTTP 请求
-`PATCH /api/:owner/:repo/webhooks/:id.json`
+`PATCH /api/v1/:owner/:repo/webhooks/68.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
@@ -1424,7 +1425,6 @@ await octokit.request('PATCH /api/yystopf/ceshi/webhooks/7.json')
 |repo                 |是| | string |项目标识identifier  |
 |id                   |是| | string |webhook id  |
 |webhook.url          |是| | string |目标url  |
-|webhook.type         |否| | string |类型|
 |webhook.http_method  |是| | string | http方法, POST和GET |
 |webhook.content_type |是| | string | POST Content Type |
 |webhook.secret       |否| | string |密钥文本|
@@ -1438,24 +1438,24 @@ await octokit.request('PATCH /api/yystopf/ceshi/webhooks/7.json')
 --------- | ------- | ------- | 
 |create|创建分支或标签|
 |delete|分支或标签删除|
-|fork|仓库被fork|
+<!-- |fork|仓库被fork| -->
 |push|git仓库推送|
-|issue|疑修已打开、已关闭、已重新打开或编辑|
+<!-- |issue|疑修已打开、已关闭、已重新打开或编辑|
 |issue_assign|疑修被指派|
 |issue_label|疑修标签被更新或删除|
 |issue_milestone|疑修被收入里程碑|
-|issue_comment|疑修评论|
+|issue_comment|疑修评论| -->
 |pull_request|合并请求|
 |pull_request_assign|合并请求被指派|
-|pull_request_label|合并请求被贴上标签|
+<!-- |pull_request_label|合并请求被贴上标签|
 |pull_request_milestone|合并请求被记录于里程碑中|
-|pull_request_comment|合并请求被评论|
+|pull_request_comment|合并请求被评论| -->
 |pull_request_review_approved|合并请求被批准|
 |pull_request_review_rejected|合并请求被拒绝|
-|pull_request_review_comment|合并请求被提出审查意见|
+<!-- |pull_request_review_comment|合并请求被提出审查意见|
 |pull_request_sync|合并请求被同步|
 |repository|创建或删除仓库|
-|release|版本发布|
+|release|版本发布| -->
 
 
 > 请求的JSON示例:
@@ -1478,8 +1478,22 @@ await octokit.request('PATCH /api/yystopf/ceshi/webhooks/7.json')
 
 ```json
 {
-    "status": 0,
-    "message": "success"
+    "id": 68,
+    "content_type": "json",
+    "http_method": "GET",
+    "url": "http://127.0.0.1:3000",
+    "events": [
+        "create",
+        "delete",
+        "push",
+        "pull_request",
+        "pull_request_assign",
+        "pull_request_review_approved",
+        "pull_request_review_rejected"
+    ],
+    "active": true,
+    "branch_filter": "*",
+    "created_at": "2022-06-23 15:52"
 }
 ```
 <aside class="success">
@@ -1494,15 +1508,15 @@ await octokit.request('PATCH /api/yystopf/ceshi/webhooks/7.json')
 
 ```shell
 curl -X DELETE \
-http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 ```
 
 ```javascript
-await octokit.request('DELETE /api/yystopf/ceshi/webhooks/7.json')
+await octokit.request('DELETE /api/v1/yystopf/ceshi/webhooks/7.json')
 ```
 
 ### HTTP 请求
-`DELETE /api/:owner/:repo/webhooks/:id.json`
+`DELETE /api/v1/:owner/:repo/webhooks/:id.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
diff --git a/app/services/api/v1/projects/webhooks/delete_service.rb b/app/services/api/v1/projects/webhooks/delete_service.rb
index 53fd8edd..5dd499e6 100644
--- a/app/services/api/v1/projects/webhooks/delete_service.rb
+++ b/app/services/api/v1/projects/webhooks/delete_service.rb
@@ -18,8 +18,8 @@ class Api::V1::Projects::Webhooks::DeleteService < ApplicationService
     $gitea_client.token = nil unless token.blank? 
 
     gitea_data
-  # rescue 
-  #   raise Error, "服务器错误，请联系系统管理员！"
+  rescue 
+    raise Error, "服务器错误，请联系系统管理员！"
   end
 
   private 
diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb
index 32884ac7..00f85239 100644
--- a/app/services/api/v1/users/projects/list_service.rb
+++ b/app/services/api/v1/users/projects/list_service.rb
@@ -23,13 +23,13 @@ class Api::V1::Users::Projects::ListService < ApplicationService
 
   def call 
     raise Error, errors.full_messages.join(", ") unless valid? 
-    # begin
+    begin
       project_query_data
 
       queried_projects
-    # rescue 
-    #   raise Error, "服务器错误，请联系系统管理员！"
-    # end
+    rescue 
+      raise Error, "服务器错误，请联系系统管理员！"
+    end
   end
 
   private 

From b59b76be4a24120d837153cd35178727f3655911 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 24 Jun 2022 11:04:16 +0800
Subject: [PATCH 085/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slate/source/includes/_repositories.md    |   71 +-
 app/docs/slate/source/includes/_users.md      |   99 ++
 .../api/v1/users/projects/list_service.rb     |   21 +-
 public/docs/api.html                          | 1037 +++++++++--------
 4 files changed, 667 insertions(+), 561 deletions(-)

diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index 9238615e..c1c8b367 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -1139,7 +1139,6 @@ await octokit.request('GET /api/v1/yystopf/ceshi/webhooks.json')
 |url                |string|地址|
 |http_method        |string|请求方式|
 |is_active          |bool  |是否激活|
-|type               |string|类型|
 |last_status        |string|最后一次推送的状态|
 |create_time        |string|创建时间|
 
@@ -1155,7 +1154,6 @@ await octokit.request('GET /api/v1/yystopf/ceshi/webhooks.json')
             "url": "https://oapi.dingtalk.com/robot/send?access_token=7e1e19d0eddb6a5e33c5c2c4e66f4c88f9437184b9ed2c2653194c6374c7d513",
             "http_method": "",
             "is_active": true,
-            "type": "dingtalk",
             "last_status": "succeed",
             "create_time": "2021-07-12 10:50:07"
         },
@@ -1164,7 +1162,6 @@ await octokit.request('GET /api/v1/yystopf/ceshi/webhooks.json')
             "url": "http://localhost:3000",
             "http_method": "GET",
             "is_active": true,
-            "type": "gitea",
             "last_status": "succeed",
             "create_time": "2021-07-26 10:03:45"
         },
@@ -1173,7 +1170,6 @@ await octokit.request('GET /api/v1/yystopf/ceshi/webhooks.json')
             "url": "http://localhost:10081",
             "http_method": "POST",
             "is_active": true,
-            "type": "gitea",
             "last_status": "waiting",
             "create_time": "2021-07-26 16:56:53"
         },
@@ -1182,7 +1178,6 @@ await octokit.request('GET /api/v1/yystopf/ceshi/webhooks.json')
             "url": "http://localhost:3001",
             "http_method": "POST",
             "is_active": true,
-            "type": "gitea",
             "last_status": "fail",
             "create_time": "2021-07-26 16:58:23"
         }
@@ -1236,24 +1231,11 @@ await octokit.request('GET /api/v1/yystopf/ceshi/webhooks/3.json')
 --------- | ------- | ------- | 
 |create|创建分支或标签|
 |delete|分支或标签删除|
-|fork|仓库被fork|
 |push|git仓库推送|
-|issue|疑修已打开、已关闭、已重新打开或编辑|
-|issue_assign|疑修被指派|
-|issue_label|疑修标签被更新或删除|
-|issue_milestone|疑修被收入里程碑|
-|issue_comment|疑修评论|
 |pull_request|合并请求|
 |pull_request_assign|合并请求被指派|
-|pull_request_label|合并请求被贴上标签|
-|pull_request_milestone|合并请求被记录于里程碑中|
-|pull_request_comment|合并请求被评论|
 |pull_request_review_approved|合并请求被批准|
 |pull_request_review_rejected|合并请求被拒绝|
-|pull_request_review_comment|合并请求被提出审查意见|
-|pull_request_sync|合并请求被同步|
-|repository|创建或删除仓库|
-|release|版本发布|
 
 
 > 返回的JSON示例:
@@ -1270,22 +1252,9 @@ await octokit.request('GET /api/v1/yystopf/ceshi/webhooks/3.json')
     "events": [
         "create",
         "delete",
-        "fork",
-        "issues",
-        "issue_assign",
-        "issue_label",
-        "issue_milestone",
-        "issue_comment",
         "push",
         "pull_request",
         "pull_request_assign",
-        "pull_request_label",
-        "pull_request_milestone",
-        "pull_request_comment",
-        "pull_request_review",
-        "pull_request_sync",
-        "repository",
-        "release"
     ]
 }
 ```
@@ -1329,24 +1298,11 @@ await octokit.request('POST /api/v1/yystopf/ceshi/webhooks.json')
 --------- | ------- | ------- | 
 |create|创建分支或标签|
 |delete|分支或标签删除|
-<!-- |fork|仓库被fork| -->
 |push|git仓库推送|
-<!-- |issue|疑修已打开、已关闭、已重新打开或编辑|
-|issue_assign|疑修被指派|
-|issue_label|疑修标签被更新或删除|
-|issue_milestone|疑修被收入里程碑|
-|issue_comment|疑修评论| -->
 |pull_request|合并请求|
 |pull_request_assign|合并请求被指派|
-<!-- |pull_request_label|合并请求被贴上标签|
-|pull_request_milestone|合并请求被记录于里程碑中|
-|pull_request_comment|合并请求被评论| -->
 |pull_request_review_approved|合并请求被批准|
 |pull_request_review_rejected|合并请求被拒绝|
-<!-- |pull_request_review_comment|合并请求被提出审查意见|
-|pull_request_sync|合并请求被同步|
-|repository|创建或删除仓库|
-|release|版本发布| -->
 
 
 > 请求的JSON示例:
@@ -1438,24 +1394,11 @@ await octokit.request('PATCH /api/v1/yystopf/ceshi/webhooks/7.json')
 --------- | ------- | ------- | 
 |create|创建分支或标签|
 |delete|分支或标签删除|
-<!-- |fork|仓库被fork| -->
 |push|git仓库推送|
-<!-- |issue|疑修已打开、已关闭、已重新打开或编辑|
-|issue_assign|疑修被指派|
-|issue_label|疑修标签被更新或删除|
-|issue_milestone|疑修被收入里程碑|
-|issue_comment|疑修评论| -->
 |pull_request|合并请求|
 |pull_request_assign|合并请求被指派|
-<!-- |pull_request_label|合并请求被贴上标签|
-|pull_request_milestone|合并请求被记录于里程碑中|
-|pull_request_comment|合并请求被评论| -->
 |pull_request_review_approved|合并请求被批准|
 |pull_request_review_rejected|合并请求被拒绝|
-<!-- |pull_request_review_comment|合并请求被提出审查意见|
-|pull_request_sync|合并请求被同步|
-|repository|创建或删除仓库|
-|release|版本发布| -->
 
 
 > 请求的JSON示例:
@@ -1546,15 +1489,15 @@ await octokit.request('DELETE /api/v1/yystopf/ceshi/webhooks/7.json')
 
 ```shell
 curl -X GET \
-http://localhost:3000/api/yystopf/ceshi/webhooks/3/tasks.json
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 ```
 
 ```javascript
-await octokit.request('GET /api/yystopf/ceshi/webhooks/3/tasks.json')
+await octokit.request('GET /api/v1/yystopf/ceshi/webhooks/3/hooktasks.json')
 ```
 
 ### HTTP 请求
-`GET /api/:owner/:repo/webhooks/:id/tasks.json`
+`GET /api/v1/:owner/:repo/webhooks/:id/hooktasks.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
@@ -1582,7 +1525,7 @@ await octokit.request('GET /api/yystopf/ceshi/webhooks/3/tasks.json')
 ```json
 {
   "total_count": 6,
-  "tasks": [
+  "hooktasks": [
     {
       "id": 20,
       "type": "gitea",
@@ -1758,15 +1701,15 @@ await octokit.request('GET /api/yystopf/ceshi/webhooks/3/tasks.json')
 
 ```shell
 curl -X POST \
-http://localhost:3000/api/yystopf/ceshi/webhooks/3/test.json
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 ```
 
 ```javascript
-await octokit.request('POST /api/yystopf/ceshi/webhooks/3/test.json')
+await octokit.request('POST /api/v1/yystopf/ceshi/webhooks/3/tests.json')
 ```
 
 ### HTTP 请求
-`POST /api/:owner/:repo/webhooks/:id/test.json`
+`POST /api/v1/:owner/:repo/webhooks/:id/tests.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
diff --git a/app/docs/slate/source/includes/_users.md b/app/docs/slate/source/includes/_users.md
index dc3faea8..318c7930 100644
--- a/app/docs/slate/source/includes/_users.md
+++ b/app/docs/slate/source/includes/_users.md
@@ -47,6 +47,105 @@ await octokit.request('GET /api/users/me.json')
   Success Data.
 </aside>
 
+## 用户项目列表
+获取用户项目列表
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/v1/:login/projects.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/:login/projects.json')
+```
+
+### HTTP 请求
+`GET api/v1/yystopf/projects.json`
+
+### 请求字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|login          | string  | 用户的用户名|
+|category       | string  | 归属项目，默认为全部项目， join: 参与项目, created: 创建项目, manage: 管理项目, watched: 关注项目, forked: 复刻项目 |
+|is_public      | boolean |  公/私有项目，true为公开项目，false为私有项目|
+|project_type   | string  | 项目类型，common为托管项目, mirror为镜像项目, sync_mirror为同步镜像项目|
+|sort_by        | string  | 项目的排序字段，比如 created_on, updated_on等|
+|sort_direction | string  | 排序的类型，desc 倒序，asc 正序|
+|limit          | integer | 每页个数 |
+|page           | integer | 页码 |
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|total_count              | integer | 项目总数 |
+|projects.owner.id        | integer | 项目拥有者id |
+|projects.owner.type      | string  | 项目拥有者类型，User 用户，Organization 组织 |
+|projects.owner.name      | string  | 项目拥有者名称|
+|projects.owner.login     | string  | 项目拥有者用户名 |
+|projects.owner.image_url | string  | 项目拥有者头像地址 |
+|type                     | string  | 项目类型，common 托管项目，mirror 镜像项目, sync 同步镜像项目 |
+|description              | string  | 项目描述 |
+|forked_count             | integer | 项目复刻数量 |
+|forked_from_project_id   | integer | 项目复刻来源项目 |
+|identifier               | string  | 项目标识 |
+|issues_count             | integer | 项目issues数量|
+|pull_requests_count      | integer | 项目合并请求数量 |
+|invite_code              | string  | 项目邀请码|
+|website                  | string  | 项目网址|
+|platform                 | string  | 项目平台 |
+|name                     | string  | 项目名称|
+|open_devops              | boolean | 项目是否开启工作流 |
+|praises_count            | integer | 项目点赞数量|
+|is_public                | boolean | 项目是否公开|
+|status                   | integer | 项目状态|
+|watchers_count           | integer | 项目关注数量|
+|ignore_id                | integer | 项目ignoreID|
+|license_id               | integer | 项目许可证ID|
+|project_category_id      | integer | 项目分类ID|
+|project_language_id      | integer | 项目语言ID|
+
+
+> 返回的JSON示例:
+
+```json
+"total_count": 1,
+"projects": [
+    {
+        "owner": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "type": "common",
+        "description": null,
+        "forked_count": 1,
+        "forked_from_project_id": null,
+        "identifier": "hahahah",
+        "issues_count": 5,
+        "pull_requests_count": 3,
+        "invite_code": "8zfKtM",
+        "website": null,
+        "platform": "forge",
+        "name": "hahahah",
+        "open_devops": false,
+        "praises_count": 0,
+        "is_public": true,
+        "status": 1,
+        "watchers_count": 0,
+        "ignore_id": null,
+        "license_id": null,
+        "project_category_id": null,
+        "project_language_id": null
+    }
+]
+```
+<aside class="success">
+  Success Data.
+</aside>
+
 ## 用户消息列表
 获取用户消息列表
 
diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb
index 00f85239..9a095c60 100644
--- a/app/services/api/v1/users/projects/list_service.rb
+++ b/app/services/api/v1/users/projects/list_service.rb
@@ -4,8 +4,8 @@ class Api::V1::Users::Projects::ListService < ApplicationService
   attr_reader :observe_user, :category, :is_public, :project_type, :sort_by, :sort_direction, :search, :current_user
   attr_accessor :queried_projects
 
-  validates :category, inclusion: {in: %w(all join created watched forked), message: "请输入正确的Category"}
-  validates :is_public, inclusion: {in: [true, false], message: '请输入正确的IsPublic'}
+  validates :category, inclusion: {in: %w(all join created manage watched forked), message: "请输入正确的Category"}
+  validates :is_public, inclusion: {in: [true, false], message: '请输入正确的IsPublic'}, allow_nil: true
   validates :project_type, inclusion: {in: %w(common mirror sync_mirror), message: '请输入正确的ProjectType'}, allow_nil: true
   validates :sort_by, inclusion: {in: Project.column_names, message: '请输入正确的SortBy'}
   validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}
@@ -13,7 +13,7 @@ class Api::V1::Users::Projects::ListService < ApplicationService
   def initialize(observe_user, params, current_user=nil)
     @observe_user = observe_user
     @category = params[:category] || 'all'
-    @is_public = params[:is_public] || true
+    @is_public = params[:is_public]
     @project_type = params[:project_type]
     @sort_by = params[:sort_by] || 'updated_on'
     @sort_direction = params[:sort_direction] || 'desc'
@@ -47,6 +47,10 @@ class Api::V1::Users::Projects::ListService < ApplicationService
       projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct 
     when 'created'
       projects = projects.where(user_id: observe_user.id)
+    when 'manage'
+      normal_projects = projects.joins(members: :roles).where(members: {user_id: observe_user.id}, roles: {name: 'Manager'}).to_sql 
+      org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: observe_user.id}, teams: {authorize: %w(owner admin)}).to_sql
+      projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct 
     when 'watched'
       projects = projects.where.not(user_id: observe_user.id).joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id})
     when 'forked'
@@ -58,11 +62,14 @@ class Api::V1::Users::Projects::ListService < ApplicationService
       projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
     end
 
-    if is_public
-      projects = projects.visible 
-    else
-      projects = projects.is_private
+    unless is_public.nil? 
+      if is_public
+        projects = projects.visible 
+      else
+        projects = projects.is_private
+      end
     end
+    
 
     projects = projects.with_project_type(project_type) 
 
diff --git a/public/docs/api.html b/public/docs/api.html
index 82b751e9..cdb82817 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -345,6 +345,9 @@
                   <li>
                     <a href="#1ae74893b1" class="toc-h2 toc-link" data-title="获取当前登陆用户信息">获取当前登陆用户信息</a>
                   </li>
+                  <li>
+                    <a href="#890d851006" class="toc-h2 toc-link" data-title="用户项目列表">用户项目列表</a>
+                  </li>
                   <li>
                     <a href="#5b752913ae" class="toc-h2 toc-link" data-title="用户消息列表">用户消息列表</a>
                   </li>
@@ -1036,6 +1039,244 @@ Success — a happy kitten is an authenticated kitten!
 <aside class="success">
   Success Data.
 </aside>
+<h2 id='890d851006'>用户项目列表</h2>
+<p>获取用户项目列表</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/:login/projects.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/:login/projects.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-2'>HTTP 请求</h3>
+<p><code>GET api/v1/yystopf/projects.json</code></p>
+<h3 id='aa883f5d52'>请求字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>login</td>
+<td>string</td>
+<td>用户的用户名</td>
+</tr>
+<tr>
+<td>category</td>
+<td>string</td>
+<td>归属项目，默认为全部项目， join: 参与项目, created: 创建项目, manage: 管理项目, watched: 关注项目, forked: 复刻项目</td>
+</tr>
+<tr>
+<td>is_public</td>
+<td>boolean</td>
+<td>公/私有项目，true为公开项目，false为私有项目</td>
+</tr>
+<tr>
+<td>project_type</td>
+<td>string</td>
+<td>项目类型，common为托管项目, mirror为镜像项目, sync_mirror为同步镜像项目</td>
+</tr>
+<tr>
+<td>sort_by</td>
+<td>string</td>
+<td>项目的排序字段，比如 created_on, updated_on等</td>
+</tr>
+<tr>
+<td>sort_direction</td>
+<td>string</td>
+<td>排序的类型，desc 倒序，asc 正序</td>
+</tr>
+<tr>
+<td>limit</td>
+<td>integer</td>
+<td>每页个数</td>
+</tr>
+<tr>
+<td>page</td>
+<td>integer</td>
+<td>页码</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-2'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>total_count</td>
+<td>integer</td>
+<td>项目总数</td>
+</tr>
+<tr>
+<td>projects.owner.id</td>
+<td>integer</td>
+<td>项目拥有者id</td>
+</tr>
+<tr>
+<td>projects.owner.type</td>
+<td>string</td>
+<td>项目拥有者类型，User 用户，Organization 组织</td>
+</tr>
+<tr>
+<td>projects.owner.name</td>
+<td>string</td>
+<td>项目拥有者名称</td>
+</tr>
+<tr>
+<td>projects.owner.login</td>
+<td>string</td>
+<td>项目拥有者用户名</td>
+</tr>
+<tr>
+<td>projects.owner.image_url</td>
+<td>string</td>
+<td>项目拥有者头像地址</td>
+</tr>
+<tr>
+<td>type</td>
+<td>string</td>
+<td>项目类型，common 托管项目，mirror 镜像项目, sync 同步镜像项目</td>
+</tr>
+<tr>
+<td>description</td>
+<td>string</td>
+<td>项目描述</td>
+</tr>
+<tr>
+<td>forked_count</td>
+<td>integer</td>
+<td>项目复刻数量</td>
+</tr>
+<tr>
+<td>forked_from_project_id</td>
+<td>integer</td>
+<td>项目复刻来源项目</td>
+</tr>
+<tr>
+<td>identifier</td>
+<td>string</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>issues_count</td>
+<td>integer</td>
+<td>项目issues数量</td>
+</tr>
+<tr>
+<td>pull_requests_count</td>
+<td>integer</td>
+<td>项目合并请求数量</td>
+</tr>
+<tr>
+<td>invite_code</td>
+<td>string</td>
+<td>项目邀请码</td>
+</tr>
+<tr>
+<td>website</td>
+<td>string</td>
+<td>项目网址</td>
+</tr>
+<tr>
+<td>platform</td>
+<td>string</td>
+<td>项目平台</td>
+</tr>
+<tr>
+<td>name</td>
+<td>string</td>
+<td>项目名称</td>
+</tr>
+<tr>
+<td>open_devops</td>
+<td>boolean</td>
+<td>项目是否开启工作流</td>
+</tr>
+<tr>
+<td>praises_count</td>
+<td>integer</td>
+<td>项目点赞数量</td>
+</tr>
+<tr>
+<td>is_public</td>
+<td>boolean</td>
+<td>项目是否公开</td>
+</tr>
+<tr>
+<td>status</td>
+<td>integer</td>
+<td>项目状态</td>
+</tr>
+<tr>
+<td>watchers_count</td>
+<td>integer</td>
+<td>项目关注数量</td>
+</tr>
+<tr>
+<td>ignore_id</td>
+<td>integer</td>
+<td>项目ignoreID</td>
+</tr>
+<tr>
+<td>license_id</td>
+<td>integer</td>
+<td>项目许可证ID</td>
+</tr>
+<tr>
+<td>project_category_id</td>
+<td>integer</td>
+<td>项目分类ID</td>
+</tr>
+<tr>
+<td>project_language_id</td>
+<td>integer</td>
+<td>项目语言ID</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="err">,</span><span class="w">
+</span><span class="nl">"projects"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+    </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"owner"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"common"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"forked_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"forked_from_project_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"issues_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"pull_requests_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"invite_code"</span><span class="p">:</span><span class="w"> </span><span class="s2">"8zfKtM"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"website"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"platform"</span><span class="p">:</span><span class="w"> </span><span class="s2">"forge"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"open_devops"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"praises_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_public"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"watchers_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"ignore_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"license_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"project_category_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"project_language_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+    </span><span class="p">}</span><span class="w">
+</span><span class="p">]</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
 <h2 id='5b752913ae'>用户消息列表</h2>
 <p>获取用户消息列表</p>
 
@@ -1044,9 +1285,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/:login/messages.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/messages.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-2'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-3'>HTTP 请求</h3>
 <p><code>GET api/users/yystopf/messages.json</code></p>
-<h3 id='aa883f5d52'>请求字段说明:</h3>
+<h3 id='aa883f5d52-2'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1075,7 +1316,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>页码</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-2'>返回字段说明:</h3>
+<h3 id='7447e4874e-3'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1363,9 +1604,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/yystopf/system_notification_histories.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/system_notification_histories.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-3'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-4'>HTTP 请求</h3>
 <p><code>POST /api/users/:login/system_notification_histories.json</code></p>
-<h3 id='aa883f5d52-2'>请求字段说明:</h3>
+<h3 id='aa883f5d52-3'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1395,9 +1636,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/:login/messages.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/users/:login/messages.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-4'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-5'>HTTP 请求</h3>
 <p><code>POST api/users/yystopf/messages.json</code></p>
-<h3 id='aa883f5d52-3'>请求字段说明:</h3>
+<h3 id='aa883f5d52-4'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1456,9 +1697,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/:login/messages/read.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/users/:login/messages/read.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-5'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
 <p><code>POST api/users/yystopf/messages/read.json</code></p>
-<h3 id='aa883f5d52-4'>请求字段说明:</h3>
+<h3 id='aa883f5d52-5'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1497,9 +1738,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE http://localhost:3000/api/users/:login/messages.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/users/:login/messages.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
 <p><code>DELETE api/users/yystopf/messages.json</code></p>
-<h3 id='aa883f5d52-5'>请求字段说明:</h3>
+<h3 id='aa883f5d52-6'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1538,9 +1779,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH/PUT http://localhost:3000/api/users/yystopf.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH/PUT /api/users/:login.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
 <p><code>PATCH/PUT /api/users/:login.json</code></p>
-<h3 id='aa883f5d52-6'>请求字段说明:</h3>
+<h3 id='aa883f5d52-7'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1636,9 +1877,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/template_message_settings.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/template_message_settings.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
 <p><code>GET /api/template_message_settings.json</code></p>
-<h3 id='7447e4874e-3'>返回字段说明:</h3>
+<h3 id='7447e4874e-4'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1779,9 +2020,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/template_message_settings.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/uses/yystopf/template_message_settings.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
 <p><code>GET /api/users/:user_id/template_message_settings.json</code></p>
-<h3 id='7447e4874e-4'>返回字段说明:</h3>
+<h3 id='7447e4874e-5'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1849,9 +2090,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/yystopf/template_message_settings/update_setting.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/uses/yystopf/template_message_settings/update_setting.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
 <p><code>POST /api/users/:user_id/template_message_settings/update_setting.json</code></p>
-<h3 id='aa883f5d52-7'>请求字段说明:</h3>
+<h3 id='aa883f5d52-8'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1900,7 +2141,7 @@ Success — a happy kitten is an authenticated kitten!
         </span><span class="p">}</span><span class="w">
    </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-5'>返回字段说明:</h3>
+</span></code></pre></div><h3 id='7447e4874e-6'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -1968,9 +2209,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/is_pinned_projects.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/is_pinned_projects.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-12'>HTTP 请求</h3>
 <p><code>GET api/users/:login/is_pinned_projects.json</code></p>
-<h3 id='7447e4874e-6'>返回字段说明:</h3>
+<h3 id='7447e4874e-7'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2155,9 +2396,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/yystopf/is_pinned_projects/pin.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/is_pinned_projects/pin.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-12'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
 <p><code>POST /api/users/:login/is_pinned_projects/pin.json</code></p>
-<h3 id='aa883f5d52-8'>请求字段说明:</h3><h4 id='0ca7f0efb8'>同时设定多个星标项目</h4>
+<h3 id='aa883f5d52-9'>请求字段说明:</h3><h4 id='0ca7f0efb8'>同时设定多个星标项目</h4>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2201,9 +2442,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH http://localhost:3000/api/users/yystopf/is_pinned_projects/11.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH/PUT /api/users/:login/is_pinned_projects/:id.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
 <p><code>PATCH/PUT /api/users/:login/is_pinned_projects/:id.json</code></p>
-<h3 id='aa883f5d52-9'>请求字段说明:</h3>
+<h3 id='aa883f5d52-10'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2242,9 +2483,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/statistics/activity.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/statistics/activity.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
 <p><code>GET /api/users/:login/statistics/activity.json</code></p>
-<h3 id='7447e4874e-7'>返回字段说明:</h3>
+<h3 id='7447e4874e-8'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2331,9 +2572,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/headmaps.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/headmaps.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-16'>HTTP 请求</h3>
 <p><code>GET api/users/:login/headmaps.json</code></p>
-<h3 id='aa883f5d52-10'>请求字段说明:</h3>
+<h3 id='aa883f5d52-11'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2347,7 +2588,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>年份</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-8'>返回字段说明:</h3>
+<h3 id='7447e4874e-9'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2476,9 +2717,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/project_trends.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/project_trends.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-16'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
 <p><code>GET api/users/:login/project_trends.json</code></p>
-<h3 id='aa883f5d52-11'>请求字段说明:</h3>
+<h3 id='aa883f5d52-12'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2492,7 +2733,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>日期，格式: 2021-05-28</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-9'>返回字段说明:</h3>
+<h3 id='7447e4874e-10'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2793,9 +3034,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/statistics/develop.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/statistics/develop.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
 <p><code>GET /api/users/:login/statistics/develop.json</code></p>
-<h3 id='aa883f5d52-12'>请求字段说明:</h3>
+<h3 id='aa883f5d52-13'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2814,7 +3055,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>时间戳，结束时间，格式：1622131200</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-10'>返回字段说明:</h3>
+<h3 id='7447e4874e-11'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2936,9 +3177,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/statistics/role.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/statistics/role.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-19'>HTTP 请求</h3>
 <p><code>GET /api/users/:login/statistics/role.json</code></p>
-<h3 id='aa883f5d52-13'>请求字段说明:</h3>
+<h3 id='aa883f5d52-14'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -2957,7 +3198,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>时间戳，结束时间，格式：1622131200</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-11'>返回字段说明:</h3>
+<h3 id='7447e4874e-12'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -3018,9 +3259,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/statistics/major.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/statistics/major.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-19'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
 <p><code>GET /api/users/:login/statistics/major.json</code></p>
-<h3 id='aa883f5d52-14'>请求字段说明:</h3>
+<h3 id='aa883f5d52-15'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -3039,7 +3280,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>时间戳，结束时间，格式：1622131200</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-12'>返回字段说明:</h3>
+<h3 id='7447e4874e-13'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -3079,9 +3320,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/applied_messages.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/applied_messages.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
 <p><code>GET /api/users/:login/applied_messages.json</code></p>
-<h3 id='aa883f5d52-15'>请求字段说明:</h3>
+<h3 id='aa883f5d52-16'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -3095,7 +3336,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>用户标识</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-13'>返回字段说明:</h3>
+<h3 id='7447e4874e-14'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -3358,9 +3599,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/applied_transfer_projects.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/applied_transfer_projects.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
 <p><code>GET /api/users/:login/applied_transfer_projects.json</code></p>
-<h3 id='aa883f5d52-16'>请求字段说明:</h3>
+<h3 id='aa883f5d52-17'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -3374,7 +3615,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>用户标识</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-14'>返回字段说明:</h3>
+<h3 id='7447e4874e-15'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -3550,199 +3791,8 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/yystopf/applied_transfer_projects/2/accept.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/applied_transfer_projects/:id/accept.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
-<p><code>GET /api/users/:login/applied_transfer_projects/:id/accept.json</code></p>
-<h3 id='aa883f5d52-17'>请求字段说明:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>login</td>
-<td>string</td>
-<td>用户标识</td>
-</tr>
-<tr>
-<td>id</td>
-<td>int</td>
-<td>迁移id</td>
-</tr>
-</tbody></table>
-<h3 id='7447e4874e-15'>返回字段说明:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>id</td>
-<td>int</td>
-<td>迁移id</td>
-</tr>
-<tr>
-<td>status</td>
-<td>string</td>
-<td>迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝</td>
-</tr>
-<tr>
-<td>time_ago</td>
-<td>string</td>
-<td>迁移创建的时间</td>
-</tr>
-<tr>
-<td>project.id</td>
-<td>int</td>
-<td>迁移项目的id</td>
-</tr>
-<tr>
-<td>project.identifier</td>
-<td>string</td>
-<td>迁移项目的标识</td>
-</tr>
-<tr>
-<td>project.name</td>
-<td>string</td>
-<td>迁移项目的名称</td>
-</tr>
-<tr>
-<td>project.description</td>
-<td>string</td>
-<td>迁移项目的描述</td>
-</tr>
-<tr>
-<td>project.is_public</td>
-<td>bool</td>
-<td>迁移项目是否公开</td>
-</tr>
-<tr>
-<td>project.owner.id</td>
-<td>bool</td>
-<td>迁移项目拥有者id</td>
-</tr>
-<tr>
-<td>project.owner.type</td>
-<td>string</td>
-<td>迁移项目拥有者类型</td>
-</tr>
-<tr>
-<td>project.owner.name</td>
-<td>string</td>
-<td>迁移项目拥有者昵称</td>
-</tr>
-<tr>
-<td>project.owner.login</td>
-<td>string</td>
-<td>迁移项目拥有者标识</td>
-</tr>
-<tr>
-<td>project.owner.image_url</td>
-<td>string</td>
-<td>迁移项目拥有者头像</td>
-</tr>
-<tr>
-<td>user.id</td>
-<td>int</td>
-<td>迁移创建者的id</td>
-</tr>
-<tr>
-<td>user.type</td>
-<td>string</td>
-<td>迁移创建者的类型</td>
-</tr>
-<tr>
-<td>user.name</td>
-<td>string</td>
-<td>迁移创建者的名称</td>
-</tr>
-<tr>
-<td>user.login</td>
-<td>string</td>
-<td>迁移创建者的标识</td>
-</tr>
-<tr>
-<td>user.image_url</td>
-<td>string</td>
-<td>迁移创建者头像</td>
-</tr>
-<tr>
-<td>owner.id</td>
-<td>int</td>
-<td>迁移接受者的id</td>
-</tr>
-<tr>
-<td>owner.type</td>
-<td>string</td>
-<td>迁移接受者的类型</td>
-</tr>
-<tr>
-<td>owner.name</td>
-<td>string</td>
-<td>迁移接受者的名称</td>
-</tr>
-<tr>
-<td>owner.login</td>
-<td>string</td>
-<td>迁移接受者的标识</td>
-</tr>
-<tr>
-<td>owner.image_url</td>
-<td>string</td>
-<td>迁移接受者头像</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>返回的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"project"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">86</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi_repo1"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试项目啊1"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"二十多"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"is_public"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"owner"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">52</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Organization"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"身份卡手动阀"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi1"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"images/avatars/Organization/52?t=1618805056"</span><span class="w">
-        </span><span class="p">}</span><span class="w">
-    </span><span class="p">},</span><span class="w">
-    </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">6</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/Y/241_125_89/120.png"</span><span class="w">
-    </span><span class="p">},</span><span class="w">
-    </span><span class="nl">"owner"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">52</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Organization"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"身份卡手动阀"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi1"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"images/avatars/Organization/52?t=1618805056"</span><span class="w">
-    </span><span class="p">},</span><span class="w">
-    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"canceled"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-04-25 18:06"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"16小时前"</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div><h2 id='5e6ed41015'>用户拒绝迁移</h2>
-<p>用户拒绝迁移</p>
-
-<blockquote>
-<p>示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/yystopf/applied_transfer_projects/2/refuse.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/applied_transfer_projects/:id/refuse.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-23'>HTTP 请求</h3>
-<p><code>GET /api/users/:login/applied_transfer_projects/:id/refuse.json</code></p>
+<p><code>GET /api/users/:login/applied_transfer_projects/:id/accept.json</code></p>
 <h3 id='aa883f5d52-18'>请求字段说明:</h3>
 <table><thead>
 <tr>
@@ -3924,16 +3974,16 @@ Success — a happy kitten is an authenticated kitten!
     </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-04-25 18:06"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"16小时前"</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h2 id='ba97e431b8'>待办事项-项目申请</h2>
-<p>待办事项-项目申请</p>
+</span></code></pre></div><h2 id='5e6ed41015'>用户拒绝迁移</h2>
+<p>用户拒绝迁移</p>
 
 <blockquote>
 <p>示例:</p>
 </blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/applied_projects.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/applied_projects.json</span><span class="dl">'</span><span class="p">)</span>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/yystopf/applied_transfer_projects/2/refuse.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/applied_transfer_projects/:id/refuse.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-24'>HTTP 请求</h3>
-<p><code>GET /api/users/:login/applied_projects.json</code></p>
+<p><code>GET /api/users/:login/applied_transfer_projects/:id/refuse.json</code></p>
 <h3 id='aa883f5d52-19'>请求字段说明:</h3>
 <table><thead>
 <tr>
@@ -3947,6 +3997,11 @@ Success — a happy kitten is an authenticated kitten!
 <td>string</td>
 <td>用户标识</td>
 </tr>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>迁移id</td>
+</tr>
 </tbody></table>
 <h3 id='7447e4874e-17'>返回字段说明:</h3>
 <table><thead>
@@ -3959,6 +4014,192 @@ Success — a happy kitten is an authenticated kitten!
 <tr>
 <td>id</td>
 <td>int</td>
+<td>迁移id</td>
+</tr>
+<tr>
+<td>status</td>
+<td>string</td>
+<td>迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝</td>
+</tr>
+<tr>
+<td>time_ago</td>
+<td>string</td>
+<td>迁移创建的时间</td>
+</tr>
+<tr>
+<td>project.id</td>
+<td>int</td>
+<td>迁移项目的id</td>
+</tr>
+<tr>
+<td>project.identifier</td>
+<td>string</td>
+<td>迁移项目的标识</td>
+</tr>
+<tr>
+<td>project.name</td>
+<td>string</td>
+<td>迁移项目的名称</td>
+</tr>
+<tr>
+<td>project.description</td>
+<td>string</td>
+<td>迁移项目的描述</td>
+</tr>
+<tr>
+<td>project.is_public</td>
+<td>bool</td>
+<td>迁移项目是否公开</td>
+</tr>
+<tr>
+<td>project.owner.id</td>
+<td>bool</td>
+<td>迁移项目拥有者id</td>
+</tr>
+<tr>
+<td>project.owner.type</td>
+<td>string</td>
+<td>迁移项目拥有者类型</td>
+</tr>
+<tr>
+<td>project.owner.name</td>
+<td>string</td>
+<td>迁移项目拥有者昵称</td>
+</tr>
+<tr>
+<td>project.owner.login</td>
+<td>string</td>
+<td>迁移项目拥有者标识</td>
+</tr>
+<tr>
+<td>project.owner.image_url</td>
+<td>string</td>
+<td>迁移项目拥有者头像</td>
+</tr>
+<tr>
+<td>user.id</td>
+<td>int</td>
+<td>迁移创建者的id</td>
+</tr>
+<tr>
+<td>user.type</td>
+<td>string</td>
+<td>迁移创建者的类型</td>
+</tr>
+<tr>
+<td>user.name</td>
+<td>string</td>
+<td>迁移创建者的名称</td>
+</tr>
+<tr>
+<td>user.login</td>
+<td>string</td>
+<td>迁移创建者的标识</td>
+</tr>
+<tr>
+<td>user.image_url</td>
+<td>string</td>
+<td>迁移创建者头像</td>
+</tr>
+<tr>
+<td>owner.id</td>
+<td>int</td>
+<td>迁移接受者的id</td>
+</tr>
+<tr>
+<td>owner.type</td>
+<td>string</td>
+<td>迁移接受者的类型</td>
+</tr>
+<tr>
+<td>owner.name</td>
+<td>string</td>
+<td>迁移接受者的名称</td>
+</tr>
+<tr>
+<td>owner.login</td>
+<td>string</td>
+<td>迁移接受者的标识</td>
+</tr>
+<tr>
+<td>owner.image_url</td>
+<td>string</td>
+<td>迁移接受者头像</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"project"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">86</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi_repo1"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试项目啊1"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"二十多"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_public"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"owner"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">52</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Organization"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"身份卡手动阀"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi1"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"images/avatars/Organization/52?t=1618805056"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">6</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/Y/241_125_89/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"owner"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">52</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Organization"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"身份卡手动阀"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi1"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"images/avatars/Organization/52?t=1618805056"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"canceled"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-04-25 18:06"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"16小时前"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='ba97e431b8'>待办事项-项目申请</h2>
+<p>待办事项-项目申请</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/users/yystopf/applied_projects.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/applied_projects.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
+<p><code>GET /api/users/:login/applied_projects.json</code></p>
+<h3 id='aa883f5d52-20'>请求字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>login</td>
+<td>string</td>
+<td>用户标识</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-18'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>id</td>
+<td>int</td>
 <td>申请id</td>
 </tr>
 <tr>
@@ -4092,9 +4333,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/yystopf/applied_projects/2/accept.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/applied_projects/:id/accept.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
 <p><code>GET /api/users/:login/applied_projects/:id/accept.json</code></p>
-<h3 id='aa883f5d52-20'>请求字段说明:</h3>
+<h3 id='aa883f5d52-21'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4113,7 +4354,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>申请id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-18'>返回字段说明:</h3>
+<h3 id='7447e4874e-19'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4251,9 +4492,9 @@ Success — a happy kitten is an authenticated kitten!
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/users/yystopf/applied_projects/2/refuse.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/users/:login/applied_projects/:id/refuse.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
 <p><code>GET /api/users/:login/applied_projects/:id/refuse.json</code></p>
-<h3 id='aa883f5d52-21'>请求字段说明:</h3>
+<h3 id='aa883f5d52-22'>请求字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -4272,7 +4513,7 @@ Success — a happy kitten is an authenticated kitten!
 <td>申请id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-19'>返回字段说明:</h3>
+<h3 id='7447e4874e-20'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8715,10 +8956,10 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 <p>示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
-http://localhost:3000/api/yystopf/ceshi/webhooks.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-17'>HTTP 请求</h3>
-<p><code>GET /api/:owner/:repo/webhooks.json</code></p>
+<p><code>GET /api/v1/:owner/:repo/webhooks.json</code></p>
 <h3 id='2eb6f47757-17'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -8773,11 +9014,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
 <td>是否激活</td>
 </tr>
 <tr>
-<td>type</td>
-<td>string</td>
-<td>类型</td>
-</tr>
-<tr>
 <td>last_status</td>
 <td>string</td>
 <td>最后一次推送的状态</td>
@@ -8800,7 +9036,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
             </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"https://oapi.dingtalk.com/robot/send?access_token=7e1e19d0eddb6a5e33c5c2c4e66f4c88f9437184b9ed2c2653194c6374c7d513"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
             </span><span class="nl">"is_active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"dingtalk"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"last_status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"succeed"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"create_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-07-12 10:50:07"</span><span class="w">
         </span><span class="p">},</span><span class="w">
@@ -8809,7 +9044,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
             </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"is_active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"gitea"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"last_status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"succeed"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"create_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-07-26 10:03:45"</span><span class="w">
         </span><span class="p">},</span><span class="w">
@@ -8818,7 +9052,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
             </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10081"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"POST"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"is_active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"gitea"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"last_status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"waiting"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"create_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-07-26 16:56:53"</span><span class="w">
         </span><span class="p">},</span><span class="w">
@@ -8827,7 +9060,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
             </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3001"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"POST"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"is_active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"gitea"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"last_status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fail"</span><span class="p">,</span><span class="w">
             </span><span class="nl">"create_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-07-26 16:58:23"</span><span class="w">
         </span><span class="p">}</span><span class="w">
@@ -8844,10 +9076,10 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
 <p>示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
-http://localhost:3000/api/yystopf/ceshi/webhooks/3/edit.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/ceshi/webhooks/3/edit.json</span><span class="dl">'</span><span class="p">)</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-18'>HTTP 请求</h3>
-<p><code>GET /api/:owner/:repo/webhooks/:id/edit.json</code></p>
+<p><code>GET /api/v1/:owner/:repo/webhooks/:id.json</code></p>
 <h3 id='2eb6f47757-18'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -8914,21 +9146,11 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/edit.json
 <td>string</td>
 </tr>
 <tr>
-<td>is_active</td>
+<td>active</td>
 <td>bool</td>
 <td>是否激活</td>
 </tr>
 <tr>
-<td>type</td>
-<td>string</td>
-<td>类型</td>
-</tr>
-<tr>
-<td>last_status</td>
-<td>string</td>
-<td>最后一次推送的状态, waiting 等待,fail 失败,succeed 成功</td>
-</tr>
-<tr>
 <td>branch_filter</td>
 <td>string</td>
 <td>分支过滤</td>
@@ -8939,7 +9161,7 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/edit.json
 <td>触发条件</td>
 </tr>
 <tr>
-<td>create_time</td>
+<td>create_at</td>
 <td>string</td>
 <td>创建时间</td>
 </tr>
@@ -8960,34 +9182,10 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/edit.json
 <td>分支或标签删除</td>
 </tr>
 <tr>
-<td>fork</td>
-<td>仓库被fork</td>
-</tr>
-<tr>
 <td>push</td>
 <td>git仓库推送</td>
 </tr>
 <tr>
-<td>issue</td>
-<td>疑修已打开、已关闭、已重新打开或编辑</td>
-</tr>
-<tr>
-<td>issue_assign</td>
-<td>疑修被指派</td>
-</tr>
-<tr>
-<td>issue_label</td>
-<td>疑修标签被更新或删除</td>
-</tr>
-<tr>
-<td>issue_milestone</td>
-<td>疑修被收入里程碑</td>
-</tr>
-<tr>
-<td>issue_comment</td>
-<td>疑修评论</td>
-</tr>
-<tr>
 <td>pull_request</td>
 <td>合并请求</td>
 </tr>
@@ -8996,18 +9194,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/edit.json
 <td>合并请求被指派</td>
 </tr>
 <tr>
-<td>pull_request_label</td>
-<td>合并请求被贴上标签</td>
-</tr>
-<tr>
-<td>pull_request_milestone</td>
-<td>合并请求被记录于里程碑中</td>
-</tr>
-<tr>
-<td>pull_request_comment</td>
-<td>合并请求被评论</td>
-</tr>
-<tr>
 <td>pull_request_review_approved</td>
 <td>合并请求被批准</td>
 </tr>
@@ -9015,22 +9201,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/edit.json
 <td>pull_request_review_rejected</td>
 <td>合并请求被拒绝</td>
 </tr>
-<tr>
-<td>pull_request_review_comment</td>
-<td>合并请求被提出审查意见</td>
-</tr>
-<tr>
-<td>pull_request_sync</td>
-<td>合并请求被同步</td>
-</tr>
-<tr>
-<td>repository</td>
-<td>创建或删除仓库</td>
-</tr>
-<tr>
-<td>release</td>
-<td>版本发布</td>
-</tr>
 </tbody></table>
 
 <blockquote>
@@ -9041,31 +9211,15 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/edit.json
     </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"form"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"last_status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"succeed"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"is_active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"gitea"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"create_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-07-26 10:03:45"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"create_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-07-26 10:03"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
         </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
         </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"fork"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"issues"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"issue_assign"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"issue_label"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"issue_milestone"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"issue_comment"</span><span class="p">,</span><span class="w">
         </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
         </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
         </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_label"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_milestone"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_comment"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_sync"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"repository"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"release"</span><span class="w">
     </span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div>
@@ -9079,10 +9233,10 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/edit.json
 <p>示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
-http://localhost:3000/api/yystopf/ceshi/webhooks.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-19'>HTTP 请求</h3>
-<p><code>POST /api/:owner/:repo/webhooks.json</code></p>
+<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
 <h3 id='2eb6f47757-19'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -9115,13 +9269,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
 <td>目标url</td>
 </tr>
 <tr>
-<td>webhook.type</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>类型</td>
-</tr>
-<tr>
 <td>webhook.http_method</td>
 <td>是</td>
 <td></td>
@@ -9182,34 +9329,10 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
 <td>分支或标签删除</td>
 </tr>
 <tr>
-<td>fork</td>
-<td>仓库被fork</td>
-</tr>
-<tr>
 <td>push</td>
 <td>git仓库推送</td>
 </tr>
 <tr>
-<td>issue</td>
-<td>疑修已打开、已关闭、已重新打开或编辑</td>
-</tr>
-<tr>
-<td>issue_assign</td>
-<td>疑修被指派</td>
-</tr>
-<tr>
-<td>issue_label</td>
-<td>疑修标签被更新或删除</td>
-</tr>
-<tr>
-<td>issue_milestone</td>
-<td>疑修被收入里程碑</td>
-</tr>
-<tr>
-<td>issue_comment</td>
-<td>疑修评论</td>
-</tr>
-<tr>
 <td>pull_request</td>
 <td>合并请求</td>
 </tr>
@@ -9218,18 +9341,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
 <td>合并请求被指派</td>
 </tr>
 <tr>
-<td>pull_request_label</td>
-<td>合并请求被贴上标签</td>
-</tr>
-<tr>
-<td>pull_request_milestone</td>
-<td>合并请求被记录于里程碑中</td>
-</tr>
-<tr>
-<td>pull_request_comment</td>
-<td>合并请求被评论</td>
-</tr>
-<tr>
 <td>pull_request_review_approved</td>
 <td>合并请求被批准</td>
 </tr>
@@ -9237,22 +9348,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
 <td>pull_request_review_rejected</td>
 <td>合并请求被拒绝</td>
 </tr>
-<tr>
-<td>pull_request_review_comment</td>
-<td>合并请求被提出审查意见</td>
-</tr>
-<tr>
-<td>pull_request_sync</td>
-<td>合并请求被同步</td>
-</tr>
-<tr>
-<td>repository</td>
-<td>创建或删除仓库</td>
-</tr>
-<tr>
-<td>release</td>
-<td>版本发布</td>
-</tr>
 </tbody></table>
 
 <blockquote>
@@ -9316,15 +9411,22 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
 <p>返回的JSON示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">18</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"gitea"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
     </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-        </span><span class="s2">"push"</span><span class="w">
+        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
     </span><span class="p">],</span><span class="w">
     </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"create_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-07-26 18:53:43"</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div>
 <aside class="success">
@@ -9337,10 +9439,10 @@ http://localhost:3000/api/yystopf/ceshi/webhooks.json
 <p>示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
-http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-20'>HTTP 请求</h3>
-<p><code>PATCH /api/:owner/:repo/webhooks/:id.json</code></p>
+<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
 <h3 id='2eb6f47757-20'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -9380,13 +9482,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
 <td>目标url</td>
 </tr>
 <tr>
-<td>webhook.type</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>类型</td>
-</tr>
-<tr>
 <td>webhook.http_method</td>
 <td>是</td>
 <td></td>
@@ -9447,34 +9542,10 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
 <td>分支或标签删除</td>
 </tr>
 <tr>
-<td>fork</td>
-<td>仓库被fork</td>
-</tr>
-<tr>
 <td>push</td>
 <td>git仓库推送</td>
 </tr>
 <tr>
-<td>issue</td>
-<td>疑修已打开、已关闭、已重新打开或编辑</td>
-</tr>
-<tr>
-<td>issue_assign</td>
-<td>疑修被指派</td>
-</tr>
-<tr>
-<td>issue_label</td>
-<td>疑修标签被更新或删除</td>
-</tr>
-<tr>
-<td>issue_milestone</td>
-<td>疑修被收入里程碑</td>
-</tr>
-<tr>
-<td>issue_comment</td>
-<td>疑修评论</td>
-</tr>
-<tr>
 <td>pull_request</td>
 <td>合并请求</td>
 </tr>
@@ -9483,18 +9554,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
 <td>合并请求被指派</td>
 </tr>
 <tr>
-<td>pull_request_label</td>
-<td>合并请求被贴上标签</td>
-</tr>
-<tr>
-<td>pull_request_milestone</td>
-<td>合并请求被记录于里程碑中</td>
-</tr>
-<tr>
-<td>pull_request_comment</td>
-<td>合并请求被评论</td>
-</tr>
-<tr>
 <td>pull_request_review_approved</td>
 <td>合并请求被批准</td>
 </tr>
@@ -9502,22 +9561,6 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
 <td>pull_request_review_rejected</td>
 <td>合并请求被拒绝</td>
 </tr>
-<tr>
-<td>pull_request_review_comment</td>
-<td>合并请求被提出审查意见</td>
-</tr>
-<tr>
-<td>pull_request_sync</td>
-<td>合并请求被同步</td>
-</tr>
-<tr>
-<td>repository</td>
-<td>创建或删除仓库</td>
-</tr>
-<tr>
-<td>release</td>
-<td>版本发布</td>
-</tr>
 </tbody></table>
 
 <blockquote>
@@ -9537,8 +9580,22 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
 <p>返回的JSON示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div>
 <aside class="success">
@@ -9551,10 +9608,10 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
 <p>示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
-http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-21'>HTTP 请求</h3>
-<p><code>DELETE /api/:owner/:repo/webhooks/:id.json</code></p>
+<p><code>DELETE /api/v1/:owner/:repo/webhooks/:id.json</code></p>
 <h3 id='2eb6f47757-21'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -9606,10 +9663,10 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/7.json
 <p>示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
-http://localhost:3000/api/yystopf/ceshi/webhooks/3/tasks.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/ceshi/webhooks/3/tasks.json</span><span class="dl">'</span><span class="p">)</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3/hooktasks.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-22'>HTTP 请求</h3>
-<p><code>GET /api/:owner/:repo/webhooks/:id/tasks.json</code></p>
+<p><code>GET /api/v1/:owner/:repo/webhooks/:id/hooktasks.json</code></p>
 <h3 id='2eb6f47757-22'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -9702,7 +9759,7 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/tasks.json
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
   </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">6</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"tasks"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+  </span><span class="nl">"hooktasks"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
     </span><span class="p">{</span><span class="w">
       </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">20</span><span class="p">,</span><span class="w">
       </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"gitea"</span><span class="p">,</span><span class="w">
@@ -9877,10 +9934,10 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/tasks.json
 <p>示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
-http://localhost:3000/api/yystopf/ceshi/webhooks/3/test.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/ceshi/webhooks/3/test.json</span><span class="dl">'</span><span class="p">)</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks/3/tests.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-23'>HTTP 请求</h3>
-<p><code>POST /api/:owner/:repo/webhooks/:id/test.json</code></p>
+<p><code>POST /api/v1/:owner/:repo/webhooks/:id/tests.json</code></p>
 <h3 id='2eb6f47757-23'>请求参数:</h3>
 <table><thead>
 <tr>

From acd031ca7de8da14df4c676d3b704ba23335e805 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 24 Jun 2022 14:14:57 +0800
Subject: [PATCH 086/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20gemfile.lock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile.lock | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e231bbef..e27c504a 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)
@@ -135,8 +133,6 @@ GEM
     fugit (1.4.1)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    gitea-client (0.8.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)
@@ -303,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)
@@ -434,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)
@@ -478,7 +459,6 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
-  gitea-client (~> 0.8.1)
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)

From e76503ae2637a8511eead573ef48c8be575de628 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Sun, 26 Jun 2022 09:06:11 +0800
Subject: [PATCH 087/208] fix: gitea client version

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

diff --git a/Gemfile b/Gemfile
index 1b3ff3e0..175ca330 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.8.1'
\ No newline at end of file
+gem 'gitea-client', '~> 0.8.2'
\ No newline at end of file

From 76cc185a1d0f3f974151fa870778a9d6010e510e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 29 Jun 2022 17:16:29 +0800
Subject: [PATCH 088/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=AE=A1=E6=A0=B8model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/reviews_controller.rb         | 19 +++++++++
 app/models/issue.rb                           |  1 +
 app/models/journal.rb                         |  2 +
 app/models/review.rb                          | 27 +++++++++++++
 .../pull_requests/reviews/create_service.rb   | 40 +++++++++++++++++++
 app/views/reviews/create.json.jbuilder        | 10 +++++
 config/routes.rb                              |  1 +
 db/migrate/20220629054645_create_reviews.rb   | 15 +++++++
 spec/models/review_spec.rb                    |  5 +++
 9 files changed, 120 insertions(+)
 create mode 100644 app/controllers/reviews_controller.rb
 create mode 100644 app/models/review.rb
 create mode 100644 app/services/api/v1/projects/pull_requests/reviews/create_service.rb
 create mode 100644 app/views/reviews/create.json.jbuilder
 create mode 100644 db/migrate/20220629054645_create_reviews.rb
 create mode 100644 spec/models/review_spec.rb

diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb
new file mode 100644
index 00000000..17566060
--- /dev/null
+++ b/app/controllers/reviews_controller.rb
@@ -0,0 +1,19 @@
+class ReviewsController < ApplicationController
+  before_action :require_login
+  before_action :load_project 
+  before_action :load_pull_request
+
+  def create 
+   @journal, @review = Api::V1::Projects::PullRequests::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
+  end
+
+  private 
+  def review_params 
+    params.require(:review).permit(:content, :commit_id, :status)
+  end
+
+  def load_pull_request
+    @pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || PullRequest.find_by_id(params[:id])
+  end
+
+end
\ No newline at end of file
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 2a3b9595..fa8c43ea 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -68,6 +68,7 @@ class Issue < ApplicationRecord
   has_many :issue_tags, through: :issue_tags_relates
   has_many :issue_times, dependent: :destroy
   has_many :issue_depends, dependent: :destroy
+  has_many :reviews, dependent: :destroy
   scope :issue_includes, ->{includes(:user)}
   scope :issue_many_includes, ->{includes(journals: :user)}
   scope :issue_issue, ->{where(issue_classify: [nil,"issue"])}
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 5bf05b0d..297c7a14 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -12,11 +12,13 @@
 #  parent_id        :integer
 #  comments_count   :integer          default("0")
 #  reply_id         :integer
+#  review_id        :integer
 #
 # Indexes
 #
 #  index_journals_on_created_on      (created_on)
 #  index_journals_on_journalized_id  (journalized_id)
+#  index_journals_on_review_id       (review_id)
 #  index_journals_on_user_id         (user_id)
 #  journals_journalized_id           (journalized_id,journalized_type)
 #
diff --git a/app/models/review.rb b/app/models/review.rb
new file mode 100644
index 00000000..f2d3e678
--- /dev/null
+++ b/app/models/review.rb
@@ -0,0 +1,27 @@
+# == Schema Information
+#
+# Table name: reviews
+#
+#  id          :integer          not null, primary key
+#  issue_id    :integer
+#  reviewer_id :integer
+#  content     :text(65535)
+#  commit_id   :string(255)
+#  status      :integer          default("0")
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+# Indexes
+#
+#  index_reviews_on_issue_id     (issue_id)
+#  index_reviews_on_reviewer_id  (reviewer_id)
+#
+
+class Review < ApplicationRecord
+
+  belongs_to :issue
+  belongs_to :reviewer, class_name: 'User', foreign_key: :reviewer_id
+  has_one :journal, dependent: :destroy
+
+  enum status: {common: 0, approved: 1, rejected: 2} 
+end
diff --git a/app/services/api/v1/projects/pull_requests/reviews/create_service.rb b/app/services/api/v1/projects/pull_requests/reviews/create_service.rb
new file mode 100644
index 00000000..c003256d
--- /dev/null
+++ b/app/services/api/v1/projects/pull_requests/reviews/create_service.rb
@@ -0,0 +1,40 @@
+class Api::V1::Projects::PullRequests::Reviews::CreateService < ApplicationService
+  include ActiveModel::Model
+
+  attr_reader :project, :pull_request, :issue, :status, :commit_id, :content, :current_user
+  attr_accessor :review, :journal
+
+  validates :status, inclusion: { in: %w(common approved rejected), message: '请输入正确的Type'}
+
+  def initialize(project, pull_request, params, current_user)
+    @project = project 
+    @pull_request = pull_request 
+    @issue = pull_request&.issue
+    @status = params[:status]
+    @commit_id = params[:commit_id]
+    @content = params[:content]
+    @current_user = current_user
+  end
+
+  def call
+    raise Error, errors.full_messages.join(", ") unless valid?
+    ActiveRecord::Base.transaction do 
+      create_review 
+      create_journal
+    end 
+
+    return @journal, @review
+  rescue 
+    raise Error, '服务器错误，请联系系统管理员！'
+  end
+
+  private 
+  def create_review  
+    @review = issue.reviews.create!(status: status, content: content, commit_id: commit_id, reviewer_id: @current_user.id)
+  end
+
+  def create_journal
+    @journal = issue.journals.create!(notes: content, user_id: @current_user.id, review_id: @review.id)
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/reviews/create.json.jbuilder b/app/views/reviews/create.json.jbuilder
new file mode 100644
index 00000000..57e6933e
--- /dev/null
+++ b/app/views/reviews/create.json.jbuilder
@@ -0,0 +1,10 @@
+json.issue do 
+  json.partial! 'pull_requests/detail', issue: @pull_request.issue
+end
+json.journal_id @journal.id 
+json.journal_notes @journal.notes 
+json.review_id @review.id
+json.commit_id @review.commit_id
+json.content @review.content 
+json.status @review.status
+json.created_at format_time(@review.created_at)
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index c0e845a8..79b937b0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -528,6 +528,7 @@ Rails.application.routes.draw do
           post :refuse_merge
           get :files
           get :commits
+          resources :reviews, only: [:create] 
         end
         collection do
           post :check_can_merge
diff --git a/db/migrate/20220629054645_create_reviews.rb b/db/migrate/20220629054645_create_reviews.rb
new file mode 100644
index 00000000..5027b074
--- /dev/null
+++ b/db/migrate/20220629054645_create_reviews.rb
@@ -0,0 +1,15 @@
+class CreateReviews < ActiveRecord::Migration[5.2]
+  def change
+    create_table :reviews do |t|
+      t.references :issue
+      t.references :reviewer 
+      t.text :content 
+      t.string :commit_id
+      t.integer :status, default: 0
+
+      t.timestamps
+    end
+
+    add_reference :journals, :review
+  end
+end
diff --git a/spec/models/review_spec.rb b/spec/models/review_spec.rb
new file mode 100644
index 00000000..8fc75815
--- /dev/null
+++ b/spec/models/review_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Review, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From a608803aa887ea810a411e2c11b56189b7f3a837 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 30 Jun 2022 11:00:18 +0800
Subject: [PATCH 089/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=AE=A1=E6=9F=A5=E9=9C=80=E5=AE=A1?=
 =?UTF-8?q?=E6=9F=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/pull_requests_controller.rb |  1 +
 app/controllers/reviews_controller.rb       |  3 ++-
 app/views/pull_requests/show.json.jbuilder  | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index f45d1f35..52da4ac4 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -176,6 +176,7 @@ class PullRequestsController < ApplicationController
     @issue_assign_to = @issue.get_assign_user
     @gitea_pull = Gitea::PullRequest::GetService.call(@owner.login, 
       @repository.identifier, @pull_request.gitea_number, current_user&.gitea_token)
+    @last_review = @pull_request.issue.reviews.take
   end
 
   def pr_merge
diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb
index 17566060..eec57113 100644
--- a/app/controllers/reviews_controller.rb
+++ b/app/controllers/reviews_controller.rb
@@ -4,7 +4,8 @@ class ReviewsController < ApplicationController
   before_action :load_pull_request
 
   def create 
-   @journal, @review = Api::V1::Projects::PullRequests::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
+    return render_forbidden('您不是审查人员，无法进行审查！') if current_user&.id != @pull_request.issue.assigned_to_id
+    @journal, @review = Api::V1::Projects::PullRequests::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
   end
 
   private 
diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder
index 739bfd74..4d5e7aef 100644
--- a/app/views/pull_requests/show.json.jbuilder
+++ b/app/views/pull_requests/show.json.jbuilder
@@ -7,6 +7,18 @@ json.commits_count @gitea_pull["commit_num"]
 json.files_count @gitea_pull["changed_files"]
 json.comments_count @issue.journals.parent_journals.size
 json.comments_total_count @issue.get_journals_size
+json.assign_user do 
+  json.partial! 'users/user_simple', user: @issue_assign_to
+end
+
+json.author do 
+  json.partial! 'users/user_simple', user: @issue_user
+end
+
+json.last_review do
+  json.(@last_review, :id, :commit_id, :content, :status) 
+  json.created_at format_time(@last_review.created_at)
+end
 
 json.pull_request do
   json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original

From 9dbb9a42d67ab8de9056ed1a036db9a53d8d28a5 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 30 Jun 2022 16:33:09 +0800
Subject: [PATCH 090/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20compare=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81sha=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/compare_controller.rb | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb
index 1aab7adb..be7afaa1 100644
--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@@ -6,13 +6,18 @@ class CompareController < ApplicationController
   end
 
   def show
-    load_compare_params
-    compare
-    @merge_status, @merge_message = get_merge_message
-    @page_size = page_size <= 0 ? 1 : page_size
-    @page_limit = page_limit <=0 ? 15 : page_limit
-    @page_offset = (@page_size -1) * @page_limit
-    Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
+    if params[:type] == "sha" 
+      load_compare_params
+      @compare_result ||= gitea_compare(@base, @head)
+    else 
+      load_compare_params
+      compare
+      @merge_status, @merge_message = get_merge_message
+      @page_size = page_size <= 0 ? 1 : page_size
+      @page_limit = page_limit <=0 ? 15 : page_limit
+      @page_offset = (@page_size -1) * @page_limit
+      Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
+    end
   end
 
   private

From 7b91ad37e5c14267aa2605ce064f56ed739fdfd4 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 30 Jun 2022 16:38:46 +0800
Subject: [PATCH 091/208] =?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/controllers/compare_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb
index be7afaa1..afdceac9 100644
--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@@ -13,11 +13,11 @@ class CompareController < ApplicationController
       load_compare_params
       compare
       @merge_status, @merge_message = get_merge_message
-      @page_size = page_size <= 0 ? 1 : page_size
-      @page_limit = page_limit <=0 ? 15 : page_limit
-      @page_offset = (@page_size -1) * @page_limit
-      Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
     end
+    @page_size = page_size <= 0 ? 1 : page_size
+    @page_limit = page_limit <=0 ? 15 : page_limit
+    @page_offset = (@page_size -1) * @page_limit
+    Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
   end
 
   private

From 484c91a58108ae59f33deb872e99f8eb634083bc Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Wed, 6 Jul 2022 15:26:49 +0800
Subject: [PATCH 092/208] =?UTF-8?q?fixed=20=E5=90=8C=E6=AD=A5gitea?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=8A=B6=E6=80=81is=5Fsync=5Fpwd=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/concerns/login_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index e608b783..86ab175e 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -116,6 +116,7 @@ module LoginHelper
     interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params.merge(hash))
     if interactor.success?
       Rails.logger.info "########_ login is #{user.login} sync_pwd_to_gitea success _########"
+      user.update_column(:is_sync_pwd, true)
       true
     else
       Rails.logger.info "########_ login is #{user.login} sync_pwd_to_gitea fail!: #{interactor.error}"

From 1d6d48fc9492c6bc0e6deab9fe94e4574d063472 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 7 Jul 2022 09:24:11 +0800
Subject: [PATCH 093/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20pr=20=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E6=AC=A1=E5=AE=A1=E6=A0=B8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 2 +-
 app/views/pull_requests/show.json.jbuilder | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 34ac9763..51fa37ac 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -9,7 +9,7 @@ class RepositoriesController < ApplicationController
   before_action :load_repository
   before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive]
   before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
-  before_action :get_ref, only: %i[entries sub_entries top_counts file archive]
+  before_action :get_ref, only: %i[entries sub_entries top_counts files archive]
   before_action :get_latest_commit, only: %i[entries sub_entries top_counts]
   before_action :get_statistics, only: %i[top_counts]
 
diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder
index 4d5e7aef..684a60e9 100644
--- a/app/views/pull_requests/show.json.jbuilder
+++ b/app/views/pull_requests/show.json.jbuilder
@@ -15,9 +15,11 @@ json.author do
   json.partial! 'users/user_simple', user: @issue_user
 end
 
-json.last_review do
-  json.(@last_review, :id, :commit_id, :content, :status) 
-  json.created_at format_time(@last_review.created_at)
+if @last_review.present?
+  json.last_review do 
+    json.(@last_review, :id, :commit_id, :content, :status) 
+    json.created_at format_time(@last_review.created_at)
+  end
 end
 
 json.pull_request do

From 3b62f096698d2ba99f5281b66e2c010768f70676 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 7 Jul 2022 10:05:12 +0800
Subject: [PATCH 094/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=AD=E8=A8=80=E5=8C=B9=E9=85=8D=E5=B9=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../concerns/repository/languages_percentagable.rb    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/controllers/concerns/repository/languages_percentagable.rb b/app/controllers/concerns/repository/languages_percentagable.rb
index dc6abcb9..53876327 100644
--- a/app/controllers/concerns/repository/languages_percentagable.rb
+++ b/app/controllers/concerns/repository/languages_percentagable.rb
@@ -5,7 +5,16 @@ module Repository::LanguagesPercentagable
     result = Gitea::Repository::Languages::ListService.call(@owner.login,
       @repository.identifier, current_user&.gitea_token)
 
-    result[:status] === :success ? hash_transform_precentagable(result[:body]) : nil
+    @transform_language = result[:status] === :success ? hash_transform_precentagable(result[:body]) : nil
+    update_project_language(@transform_language) unless @transform_language.nil?
+    @transform_language
+  end
+
+  def update_project_language(language)
+    db_language = ProjectLanguage.find_or_create_by!(name: language.keys.first.downcase.upcase_first)
+    @project.update_column(:project_language_id, db_language.id)
+  rescue 
+    return
   end
 
   # hash eq:{"JavaScript": 301681522,"Ruby": 1444004,"Roff": 578781}

From 29d9410e4230eb21fa73e586b9d565d97443478e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 7 Jul 2022 15:02:25 +0800
Subject: [PATCH 095/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20readme=20?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/repositories_helper.rb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index c31b9c59..45eccca9 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -104,12 +104,18 @@ module RepositoriesHelper
         # 链接直接跳过不做替换
         next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:') || s_content.blank?
         ext = File.extname(s_content)[1..-1]
+        repo_regex = /([a-zA-Z0-9_-]{4,15})\/[a-zA-Z0-9_-]+$/
         if (image_type?(ext) || download_type(ext)) && !s_content.to_s.end_with?('/')
-          s_content = File.expand_path(s_content, file_path)
-          s_content = s_content.split("#{Rails.root}/")[1]
-          # content = content.gsub(s[0], "/#{s_content}")
-          s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{s_content}&ref=#{ref}"].join
-          content = content.gsub(s[0], s_content)
+          if s_content.to_s.scan(repo_regex).size > 0
+            s_content = [base_url, '/', s_content].join 
+            content = content.gsub(s[0], s_content)
+          else
+            s_content = File.expand_path(s_content, file_path)
+            s_content = s_content.split("#{Rails.root}/")[1]
+            # content = content.gsub(s[0], "/#{s_content}")
+            s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{s_content}&ref=#{ref}"].join
+            content = content.gsub(s[0], s_content)
+          end
         else
           path = [owner&.login, repo&.identifier, 'tree', ref, file_path].join("/")
           s_content = File.expand_path(s_content, path)

From d154f0aecc38c22b3982fd27a987e488a22f2548 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 8 Jul 2022 11:31:17 +0800
Subject: [PATCH 096/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20readme=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb |  2 +-
 app/helpers/repositories_helper.rb         | 20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 51fa37ac..fdec82b6 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -99,7 +99,7 @@ class RepositoriesController < ApplicationController
         end
       end
     else
-      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
+      @path = GiteaService.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
       interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: @ref)
       if interactor.success?
         result = interactor.result
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 45eccca9..998629c9 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -104,23 +104,17 @@ module RepositoriesHelper
         # 链接直接跳过不做替换
         next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:') || s_content.blank?
         ext = File.extname(s_content)[1..-1]
-        repo_regex = /([a-zA-Z0-9_-]{4,15})\/[a-zA-Z0-9_-]+$/
-        if (image_type?(ext) || download_type(ext)) && !s_content.to_s.end_with?('/')
-          if s_content.to_s.scan(repo_regex).size > 0
-            s_content = [base_url, '/', s_content].join 
-            content = content.gsub(s[0], s_content)
-          else
-            s_content = File.expand_path(s_content, file_path)
-            s_content = s_content.split("#{Rails.root}/")[1]
-            # content = content.gsub(s[0], "/#{s_content}")
-            s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{s_content}&ref=#{ref}"].join
-            content = content.gsub(s[0], s_content)
-          end
+        if (image_type?(ext) || download_type(ext)) && !ext.blank?
+          s_content = File.expand_path(s_content, file_path)
+          s_content = s_content.split("#{Rails.root}/")[1]
+          # content = content.gsub(s[0], "/#{s_content}")
+          s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{s_content}&ref=#{ref}"].join
+          content = content.gsub(s[0], s_content)
         else
           path = [owner&.login, repo&.identifier, 'tree', ref, file_path].join("/")
           s_content = File.expand_path(s_content, path)
           s_content = s_content.split("#{Rails.root}/")[1]
-          content = content.gsub(s[0], "/#{s_content}")
+          content = content.gsub('('+s[0]+')', '('+"/#{s_content}"+')')
         end
       rescue
         next

From d0988e42b48e7629bc8a90576a10ec7153293d13 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 8 Jul 2022 18:01:07 +0800
Subject: [PATCH 097/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/docs/slate/source/api.html.md             |  10 +-
 .../slate/source/includes/_repositories.md    | 426 ++++++---
 public/docs/api.html                          | 888 +++++++++++++-----
 3 files changed, 944 insertions(+), 380 deletions(-)

diff --git a/app/docs/slate/source/api.html.md b/app/docs/slate/source/api.html.md
index a846317c..a283f683 100644
--- a/app/docs/slate/source/api.html.md
+++ b/app/docs/slate/source/api.html.md
@@ -1,13 +1,13 @@
 ---
-title: Trustie API Reference
+title: GitLink API Reference
 
 language_tabs: # must be one of https://git.io/vQNgJ
   - shell: Shell
   - javascript: JavaScript
 
 toc_footers:
-  - <a href='https://www.trustie.net/login?login=false'>Sign Up for a User</a>
-  - <a href='https://www.trustie.net'>Powered by Trustie</a>
+  - <a href='https://www.gitlink.org.cn/login'>Sign In for a User</a>
+  - <a href='https://www.gitlink.org.cn'>Powered by GitLink</a>
 
 includes:
   - licenses
@@ -30,8 +30,8 @@ code_clipboard: true
 
 # Introduction
 
-Welcome to the Trustie API! You can use our API to access Trustie API endpoints, which can get information on projects, repository, and users in our platform.
+Welcome to the GitLink API! You can use our API to access GitLink API endpoints, which can get information on projects, repository, and users in our platform.
 
 We have language bindings in Shell,avaScript! You can view code examples in the dark area to the right, and you can switch the programming language of the examples with the tabs in the top right.
 
-This example API documentation page was created with [Trustie](https://www.trustie.net). Feel free to edit it and use it as a base for your own API's documentation.
+This example API documentation page was created with [GitLink](https://www.gitlink.org.cn). Feel free to edit it and use it as a base for your own API's documentation.
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index c1c8b367..f0a64a60 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -26,25 +26,84 @@ await octokit.request('GET /api/jasder/jasder_test.json')
 ### 返回字段说明:
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
-|id             |int   |id |
-|name           |string|项目名称|
-|identifier     |string|项目标识|
-|is_public      |boolean|项目是否公开， true:公开，false:私有|
-|description    |string|项目简介|
-|repo_id        |int|仓库id|
-|repo_identifier|string|仓库标识|
+|identifier                       |string|项目标识|
+|name                             |string|项目名称|
+|project_id                       |int   |项目ID |
+|repo_id                          |int   |仓库ID|
+|issues_count                     |int   |疑修数量|
+|pull_requests_count              |int   |合并请求数量|
+|project_identifier               |string|项目标识|
+|praises_count                    |int   |项目点赞数|
+|forked_count                     |int   |项目复刻数|
+|watchers_count                   |int   |项目关注数|
+|versions_count                   |int   |项目里程碑数量|
+|version_releases_count           |int   |项目版本数|
+|version_releasesed_count         |int   |项目已发行项目版本数|
+|contributor_users_count          |int   |项目贡献者数|
+|permission                       |string|用户权限 Admin: 平台管理员, Manager: 项目管理员, Developer: 项目开发者, Reporter: 项目报告者|
+|mirror_url                       |string|项目镜像地址|
+|mirror                           |bool  |是否为镜像项目|
+|type                             |int   |项目类型 0: 托管项目，1: 镜像项目，2: 同步镜像项目|
+|forked_from_project_id           |int   |项目复刻来源项目ID|
+|fork_info.fork_form_name         |string|项目复刻来源项目的名称|
+|fork_info.fork_project_user_login|string|项目复刻来源项目拥有者标识|
+|fork_info.fork_project_identifier|string|项目复刻来源项目标识|
+|fork_info.fork_project_user_name |string|项目复刻来源项目拥有者名称|
+|size                             |string|项目大小|
+|ssh_url                          |string|项目ssh clone地址|
+|clone_url                        |string|项目http clone地址|
+|default_branch                   |string|项目默认分支|
+|empty                            |bool  |项目是否为空|
+|full_name                        |string|项目路径|
+|private                          |bool  |项目是否为私有项目|
+|author.id                        |int   |项目拥有者ID|
+|author.login                     |string|项目拥有者标识|
+|author.type                      |string|项目拥有者类型|
+|author.name                      |string|项目拥有者名称|
+|author.image_url                 |string|项目拥有者头像地址|
 
 
 > 返回的JSON示例:
 
 ```json
 {
-  "name": "ni项目",
-  "identifier": "mirror_demo",
-  "is_public": true,
-  "description": "my first project mirror_demo",
-  "repo_id": 75073,
-  "repo_identifier": "mirror_demo"
+    "identifier": "hahahah",
+    "name": "hahahah",
+    "project_id": 469,
+    "repo_id": 469,
+    "issues_count": 2,
+    "pull_requests_count": 3,
+    "project_identifier": "hahahah",
+    "praises_count": 0,
+    "forked_count": 1,
+    "watchers_count": 0,
+    "versions_count": 0,
+    "version_releases_count": 0,
+    "version_releasesed_count": 0,
+    "contributor_users_count": 1,
+    "permission": "Admin",
+    "mirror_url": null,
+    "mirror": false,
+    "type": 0,
+    "open_devops": false,
+    "watched": false,
+    "praised": false,
+    "status": 1,
+    "forked_from_project_id": null,
+    "size": "2.1 MB",
+    "ssh_url": "virus@127.0.0.1:10081:yystopf/hahahah.git",
+    "clone_url": "http://127.0.0.1:10081/yystopf/hahahah.git",
+    "default_branch": "master",
+    "empty": false,
+    "full_name": "yystopf/hahahah",
+    "private": false,
+    "author": {
+        "id": 2,
+        "login": "yystopf",
+        "type": "User",
+        "name": "heh",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    }
 }
 ```
 
@@ -75,25 +134,36 @@ await octokit.request('GET /api/jasder/jasder_test/simple.json')
 ### 返回字段说明:
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
-|id             |int   |id |
-|name           |string|项目名称|
-|identifier     |string|项目标识|
-|is_public      |boolean|项目是否公开， true:公开，false:私有|
-|description    |string|项目简介|
-|repo_id        |int|仓库id|
-|repo_identifier|string|仓库标识|
+|id              |int   |id |
+|name            |string|项目名称|
+|platform        |string|项目平台|
+|identifier      |string|项目标识|
+|repo_id         |int   |仓库id|
+|open_devops     |bool  |是否开启工作流|
+|type            |int   |项目类型 0: 托管项目，1: 镜像项目，2: 同步镜像项目|
+|author.login    |string|项目拥有者标识|
+|author.type     |string|项目拥有者类型|
+|author.name     |string|项目拥有者名称|
+|author.image_url|string|项目拥有者头像地址|
 
 
 > 返回的JSON示例:
 
 ```json
 {
-  "name": "ni项目",
-  "identifier": "mirror_demo",
-  "is_public": true,
-  "description": "my first project mirror_demo",
-  "repo_id": 75073,
-  "repo_identifier": "mirror_demo"
+    "identifier": "hahahah",
+    "name": "hahahah",
+    "platform": "forge",
+    "id": 469,
+    "repo_id": 469,
+    "open_devops": false,
+    "type": 0,
+    "author": {
+        "login": "yystopf",
+        "name": "heh",
+        "type": "User",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    }
 }
 ```
 
@@ -125,9 +195,13 @@ await octokit.request('GET /api/yystopf/ceshi/detail.json')
 --------- | ----------- | -----------
 |content                          |string   |仓库简介   |
 |website                          |string   |仓库网址   |
-|readme                           |string   |readme文件｜
+|lesson_url                       |string   |课程地址   |
 |identifier                       |string   |项目标识   |
+|invite_code                      |string   |项目邀请码 |
 |name                             |string   |项目名称   |
+|description                      |string   |项目描述   |
+|project_id                       |int      |项目ID    |
+|repo_id                          |int      |仓库ID|
 |issues_count                     |int      |项目issue数量|
 |pull_requests_count              |int      |项目合并请求数量|
 |project_identifier               |int      |项目标识|
@@ -137,7 +211,7 @@ await octokit.request('GET /api/yystopf/ceshi/detail.json')
 |versions_count                   |int      |项目里程碑数量|
 |version_releases_count           |int      |项目发行版数量|
 |version_releasesed_count         |int      |项目发行版已发行数量|
-|permission                       |string   |项目权限|
+|permission                       |string   |项目权限, Admin: 平台管理员，Manager: 项目管理员, Developer: 项目开发者, Reporter: 项目报告者|
 |mirror_url                       |string   |镜像地址|
 |mirror                           |bool     |是否为镜像项目|
 |type                             |int      |项目类型 0 普通项目 1 普通镜像项目 2 同步镜像项目|
@@ -145,59 +219,49 @@ await octokit.request('GET /api/yystopf/ceshi/detail.json')
 |watched                          |bool     |是否关注|
 |praised                          |bool     |是否点赞|
 |status                           |int      |项目状态|
-|forked_from_project_id           |int      |fork项目id|
-|fork_info                        |object   |fork项目信息|
+|forked_from_project_id           |int      |项目复刻来源项目id|
+|fork_info.fork_form_name         |string   |项目复刻来源项目的名称|
+|fork_info.fork_project_user_login|string   |项目复刻来源项目拥有者标识|
+|fork_info.fork_project_identifier|string   |项目复刻来源项目标识|
+|fork_info.fork_project_user_name |string   |项目复刻来源项目拥有者名称|
 |size                             |string   |仓库大小|
-|ssh_url                          |string   |项目ssh地址|
-|clone_url                        |string   |项目克隆地址|
+|ssh_url                          |string   |项目ssh克隆地址|
+|clone_url                        |string   |项目http克隆地址|
 |default_branch                   |string   |仓库默认分支|
 |empty                            |bool     |仓库是否为空|
 |full_name                        |string   |仓库全称|
 |private                          |bool     |仓库是否为私有项目|
 |license_name                     |string   |许可证名称|
-|release_versions.list.name       |string   |项目issue数量|
-|release_versions.list.tag_name   |string   |发行版标签名称|
-|release_versions.list.created_at |string   |发行版创建时间|
-|release_versions.total_count  |int         |发行版数量|
-|branches.list.name            |string      |分支名称|
-|branches.total_count          |int         |分支数量|
-|tags.list.name                |string      |标签名称|
-|tags.total_count              |int         |标签数量|
-|contributors.list.contributions|int        |贡献数量|
-|contributors.list.login       |string      |贡献者登录名|
-|contributors.list.name        |string      |贡献者用户名称|
-|contributors.list.image_url   |string      |贡献者头像|
-|languages                     |object      |项目语言占比|
+|author.id                        |int      |项目拥有者ID|
+|author.login                     |string   |项目拥有者标识|
+|author.type                      |string   |项目拥有者类型|
+|author.name                      |string   |项目拥有者名称|
+|author.image_url                 |string   |项目拥有者头像地址|
+
 
 > 返回的JSON示例:
 
 ```json
 {
-    "content": "仓库简介",
-    "website": "仓库网址",
-    "readme": {
-        "type": "file",
-        "encoding": "base64",
-        "size": 9,
-        "name": "README.md",
-        "path": "README.md",
-        "content": "# ceshi\n\n",
-        "sha": ""
-    },
-    "identifier": "ceshi",
-    "name": "测试项目",
-    "project_id": 2,
-    "repo_id": 2,
-    "issues_count": 0,
-    "pull_requests_count": 0,
-    "project_identifier": "ceshi",
+    "content": null,
+    "website": null,
+    "lesson_url": null,
+    "identifier": "hahahah",
+    "invite_code": "8zfKtM",
+    "name": "hahahah",
+    "description": null,
+    "project_id": 469,
+    "repo_id": 469,
+    "issues_count": 2,
+    "pull_requests_count": 2,
+    "project_identifier": "hahahah",
     "praises_count": 0,
-    "forked_count": 0,
+    "forked_count": 1,
     "watchers_count": 0,
     "versions_count": 0,
     "version_releases_count": 0,
     "version_releasesed_count": 0,
-    "permission": "Reporter",
+    "permission": "Admin",
     "mirror_url": null,
     "mirror": false,
     "type": 0,
@@ -205,71 +269,23 @@ await octokit.request('GET /api/yystopf/ceshi/detail.json')
     "watched": false,
     "praised": false,
     "status": 1,
-    "forked_from_project_id": 1,
-    "fork_info": {
-        "fork_form_name": "测试项目",
-        "fork_project_user_login": "ceshi_org",
-        "fork_project_identifier": "ceshi",
-        "fork_project_user_name": "ceshi_org"
-    },
-    "size": "25.0 KB",
-    "ssh_url": "virus@localhost:yystopf/ceshi.git",
-    "clone_url": "http://localhost:10080/yystopf/ceshi.git",
+    "forked_from_project_id": null,
+    "size": "2.1 MB",
+    "ssh_url": "virus@127.0.0.1:10081:yystopf/hahahah.git",
+    "clone_url": "http://127.0.0.1:10081/yystopf/hahahah.git",
     "default_branch": "master",
     "empty": false,
-    "full_name": "yystopf/ceshi",
+    "full_name": "yystopf/hahahah",
     "private": false,
-    "license_name": "gnu-javamail-exception",
-    "release_versions": {
-        "list": [
-            {
-                "id": 2,
-                "name": "vvvv",
-                "tag_name": "v1.1",
-                "created_at": "2019-07-18 10:16"
-            }
-        ],
-        "total_count": 1
-    },
-    "branches": {
-        "list": [
-            {
-                "name": "master"
-            }
-        ],
-        "total_count": 1
-    },
-    "tags": {
-        "list": [
-            {
-                "name": "v1.1"
-            },
-            {
-                "name": "v1.0"
-            }
-        ],
-        "total_count": 2
-    },
-    "contributors": {
-        "list": [
-            {
-                "contributions": 1,
-                "gid": 2,
-                "login": "yystopf",
-                "type": "User",
-                "name": "yystopf",
-                "image_url": "avatars/User/b"
-            }
-        ],
-        "total_count": 1
-    },
-    "languages": {
-        "HTML": "50.9%",
-        "Ruby": "25.6%",
-        "JavaScript": "21.4%",
-        "CSS": "1.3%",
-        "CoffeeScript": "0.7%",
-        "Shell": "0.1%"
+    "license_name": null,
+    "branches_count": 1201,
+    "tags_count": 0,
+    "author": {
+        "id": 2,
+        "login": "yystopf",
+        "type": "User",
+        "name": "heh",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
     }
 }
 ```
@@ -392,6 +408,162 @@ await octokit.request('GET /api/yystopf/csfjkkj/tags.json')
 ]
 ```
 
+
+## 仓库分支列表
+仓库分支列表
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/yystopf/csfjkkj/branches.json
+```
+
+```javascript
+await octokit.request('GET /api/yystopf/csfjkkj/branches.json')
+```
+
+### HTTP 请求
+`GET /api/:owner/:repo/branches.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是| |string |用户登录名  |
+|repo             |是| |string |项目标识identifier  |
+
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|name           |string|分支名称|
+|http_url       |string|分支http地址|
+|zip_url        |string|分支zip包下载地址|
+|tar_url        |string|分支tar包下载地址|
+
+
+> 返回的JSON示例:
+
+```json
+[
+    {
+        "name": "master",
+        "http_url": "http://127.0.0.1:10081/yystopf/hahahah.git",
+        "zip_url": "http://localhost:3000/api/yystopf/hahahah/archive/master.zip",
+        "tar_url": "http://localhost:3000/api/yystopf/hahahah/archive/master.tar.gz"
+    },
+    {
+        "name": "touch-10",
+        "http_url": "http://127.0.0.1:10081/yystopf/hahahah.git",
+        "zip_url": "http://localhost:3000/api/yystopf/hahahah/archive/touch-10.zip",
+        "tar_url": "http://localhost:3000/api/yystopf/hahahah/archive/touch-10.tar.gz"
+    },
+    {
+        "name": "touch-100",
+        "http_url": "http://127.0.0.1:10081/yystopf/hahahah.git",
+        "zip_url": "http://localhost:3000/api/yystopf/hahahah/archive/touch-100.zip",
+        "tar_url": "http://localhost:3000/api/yystopf/hahahah/archive/touch-100.tar.gz"
+    }
+]
+```
+
+## 仓库贡献者列表
+仓库贡献者列表
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/yystopf/csfjkkj/contributors.json
+```
+
+```javascript
+await octokit.request('GET /api/yystopf/csfjkkj/contributors.json')
+```
+
+### HTTP 请求
+`GET /api/:owner/:repo/contributors.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是| |string |用户登录名  |
+|repo             |是| |string |项目标识identifier  |
+
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|list.contributions           |int   |贡献者commit数量|
+|list.login                   |string|贡献者标识|
+|list.type                    |string|贡献者类型|
+|list.name                    |string|贡献者昵称|
+|list.image_url               |string|贡献者头像地址|
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "list": [
+        {
+            "contributions": 2411,
+            "login": "yystopf",
+            "type": "User",
+            "name": "heh",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        {
+            "contributions": 6,
+            "login": "testforge3",
+            "type": null,
+            "name": "testforge3",
+            "image_url": "system/lets/letter_avatars/2/T/132_143_60/120.png"
+        }
+    ],
+    "total_count": 2
+}
+```
+
+## 仓库开发语言
+仓库开发语言组成
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/yystopf/csfjkkj/languages.json
+```
+
+```javascript
+await octokit.request('GET /api/yystopf/csfjkkj/languages.json')
+```
+
+### HTTP 请求
+`GET /api/:owner/:repo/languages.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是| |string |用户登录名  |
+|repo             |是| |string |项目标识identifier  |
+
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|key          |string   |语言类型|
+|value        |string   |语言占比|
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "Go": "99.0%",
+    "Shell": "0.4%",
+    "Smarty": "0.4%",
+    "Makefile": "0.2%"
+}
+```
+
 ## 编辑仓库信息
 编辑仓库信息
 
diff --git a/public/docs/api.html b/public/docs/api.html
index cdb82817..86560740 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Trustie API Reference</title>
+    <title>GitLink API Reference</title>
 
     <style media="screen">
       .highlight table td { padding: 5px; }
@@ -502,6 +502,15 @@
                   <li>
                     <a href="#46a7ce7681" class="toc-h2 toc-link" data-title="仓库标签列表">仓库标签列表</a>
                   </li>
+                  <li>
+                    <a href="#a43972f107" class="toc-h2 toc-link" data-title="仓库分支列表">仓库分支列表</a>
+                  </li>
+                  <li>
+                    <a href="#636c36d314" class="toc-h2 toc-link" data-title="仓库贡献者列表">仓库贡献者列表</a>
+                  </li>
+                  <li>
+                    <a href="#3fd5cce10e" class="toc-h2 toc-link" data-title="仓库开发语言">仓库开发语言</a>
+                  </li>
                   <li>
                     <a href="#af9709123a" class="toc-h2 toc-link" data-title="编辑仓库信息">编辑仓库信息</a>
                   </li>
@@ -595,19 +604,19 @@
           </li>
       </ul>
         <ul class="toc-footer">
-            <li><a href='https://www.trustie.net/login?login=false'>Sign Up for a User</a></li>
-            <li><a href='https://www.trustie.net'>Powered by Trustie</a></li>
+            <li><a href='https://www.gitlink.org.cn/login'>Sign In for a User</a></li>
+            <li><a href='https://www.gitlink.org.cn'>Powered by GitLink</a></li>
         </ul>
     </div>
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
         <h1 id='introduction'>Introduction</h1>
-<p>Welcome to the Trustie API! You can use our API to access Trustie API endpoints, which can get information on projects, repository, and users in our platform.</p>
+<p>Welcome to the GitLink API! You can use our API to access GitLink API endpoints, which can get information on projects, repository, and users in our platform.</p>
 
 <p>We have language bindings in Shell,avaScript! You can view code examples in the dark area to the right, and you can switch the programming language of the examples with the tabs in the top right.</p>
 
-<p>This example API documentation page was created with <a href="https://www.trustie.net">Trustie</a>. Feel free to edit it and use it as a base for your own API&#39;s documentation.</p>
+<p>This example API documentation page was created with <a href="https://www.gitlink.org.cn">GitLink</a>. Feel free to edit it and use it as a base for your own API&#39;s documentation.</p>
 <h1 id='licenses'>Licenses</h1><h2 id='get-all-licenses'>Get All Licenses</h2>
 <p>The Licenses API returns metadata about popular open source licenses and information about a particular project&#39;s license file.</p>
 
@@ -6934,9 +6943,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </tr>
 </thead><tbody>
 <tr>
-<td>id</td>
-<td>int</td>
-<td>id</td>
+<td>identifier</td>
+<td>string</td>
+<td>项目标识</td>
 </tr>
 <tr>
 <td>name</td>
@@ -6944,29 +6953,169 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>项目名称</td>
 </tr>
 <tr>
-<td>identifier</td>
-<td>string</td>
-<td>项目标识</td>
-</tr>
-<tr>
-<td>is_public</td>
-<td>boolean</td>
-<td>项目是否公开， true:公开，false:私有</td>
-</tr>
-<tr>
-<td>description</td>
-<td>string</td>
-<td>项目简介</td>
+<td>project_id</td>
+<td>int</td>
+<td>项目ID</td>
 </tr>
 <tr>
 <td>repo_id</td>
 <td>int</td>
-<td>仓库id</td>
+<td>仓库ID</td>
 </tr>
 <tr>
-<td>repo_identifier</td>
+<td>issues_count</td>
+<td>int</td>
+<td>疑修数量</td>
+</tr>
+<tr>
+<td>pull_requests_count</td>
+<td>int</td>
+<td>合并请求数量</td>
+</tr>
+<tr>
+<td>project_identifier</td>
 <td>string</td>
-<td>仓库标识</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>praises_count</td>
+<td>int</td>
+<td>项目点赞数</td>
+</tr>
+<tr>
+<td>forked_count</td>
+<td>int</td>
+<td>项目复刻数</td>
+</tr>
+<tr>
+<td>watchers_count</td>
+<td>int</td>
+<td>项目关注数</td>
+</tr>
+<tr>
+<td>versions_count</td>
+<td>int</td>
+<td>项目里程碑数量</td>
+</tr>
+<tr>
+<td>version_releases_count</td>
+<td>int</td>
+<td>项目版本数</td>
+</tr>
+<tr>
+<td>version_releasesed_count</td>
+<td>int</td>
+<td>项目已发行项目版本数</td>
+</tr>
+<tr>
+<td>contributor_users_count</td>
+<td>int</td>
+<td>项目贡献者数</td>
+</tr>
+<tr>
+<td>permission</td>
+<td>string</td>
+<td>用户权限 Admin: 平台管理员, Manager: 项目管理员, Developer: 项目开发者, Reporter: 项目报告者</td>
+</tr>
+<tr>
+<td>mirror_url</td>
+<td>string</td>
+<td>项目镜像地址</td>
+</tr>
+<tr>
+<td>mirror</td>
+<td>bool</td>
+<td>是否为镜像项目</td>
+</tr>
+<tr>
+<td>type</td>
+<td>int</td>
+<td>项目类型 0: 托管项目，1: 镜像项目，2: 同步镜像项目</td>
+</tr>
+<tr>
+<td>forked_from_project_id</td>
+<td>int</td>
+<td>项目复刻来源项目ID</td>
+</tr>
+<tr>
+<td>fork_info.fork_form_name</td>
+<td>string</td>
+<td>项目复刻来源项目的名称</td>
+</tr>
+<tr>
+<td>fork_info.fork_project_user_login</td>
+<td>string</td>
+<td>项目复刻来源项目拥有者标识</td>
+</tr>
+<tr>
+<td>fork_info.fork_project_identifier</td>
+<td>string</td>
+<td>项目复刻来源项目标识</td>
+</tr>
+<tr>
+<td>fork_info.fork_project_user_name</td>
+<td>string</td>
+<td>项目复刻来源项目拥有者名称</td>
+</tr>
+<tr>
+<td>size</td>
+<td>string</td>
+<td>项目大小</td>
+</tr>
+<tr>
+<td>ssh_url</td>
+<td>string</td>
+<td>项目ssh clone地址</td>
+</tr>
+<tr>
+<td>clone_url</td>
+<td>string</td>
+<td>项目http clone地址</td>
+</tr>
+<tr>
+<td>default_branch</td>
+<td>string</td>
+<td>项目默认分支</td>
+</tr>
+<tr>
+<td>empty</td>
+<td>bool</td>
+<td>项目是否为空</td>
+</tr>
+<tr>
+<td>full_name</td>
+<td>string</td>
+<td>项目路径</td>
+</tr>
+<tr>
+<td>private</td>
+<td>bool</td>
+<td>项目是否为私有项目</td>
+</tr>
+<tr>
+<td>author.id</td>
+<td>int</td>
+<td>项目拥有者ID</td>
+</tr>
+<tr>
+<td>author.login</td>
+<td>string</td>
+<td>项目拥有者标识</td>
+</tr>
+<tr>
+<td>author.type</td>
+<td>string</td>
+<td>项目拥有者类型</td>
+</tr>
+<tr>
+<td>author.name</td>
+<td>string</td>
+<td>项目拥有者名称</td>
+</tr>
+<tr>
+<td>author.image_url</td>
+<td>string</td>
+<td>项目拥有者头像地址</td>
 </tr>
 </tbody></table>
 
@@ -6974,12 +7123,43 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <p>返回的JSON示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-  </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ni项目"</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mirror_demo"</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"is_public"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"my first project mirror_demo"</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"repo_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">75073</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"repo_identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mirror_demo"</span><span class="w">
+    </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"project_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">469</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"repo_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">469</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"issues_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pull_requests_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"project_identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"praises_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"forked_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"watchers_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"versions_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"version_releases_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"version_releasesed_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"contributor_users_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"permission"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Admin"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"mirror_url"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"mirror"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"open_devops"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"watched"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"praised"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"forked_from_project_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"size"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2.1 MB"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"ssh_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"virus@127.0.0.1:10081:yystopf/hahahah.git"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"clone_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:10081/yystopf/hahahah.git"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"default_branch"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"empty"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"full_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf/hahahah"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"private"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h2 id='32bf9fcdcf'>仓库详情(简版)</h2>
 <p>仓库详情</p>
@@ -7035,29 +7215,49 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>项目名称</td>
 </tr>
 <tr>
+<td>platform</td>
+<td>string</td>
+<td>项目平台</td>
+</tr>
+<tr>
 <td>identifier</td>
 <td>string</td>
 <td>项目标识</td>
 </tr>
 <tr>
-<td>is_public</td>
-<td>boolean</td>
-<td>项目是否公开， true:公开，false:私有</td>
-</tr>
-<tr>
-<td>description</td>
-<td>string</td>
-<td>项目简介</td>
-</tr>
-<tr>
 <td>repo_id</td>
 <td>int</td>
 <td>仓库id</td>
 </tr>
 <tr>
-<td>repo_identifier</td>
+<td>open_devops</td>
+<td>bool</td>
+<td>是否开启工作流</td>
+</tr>
+<tr>
+<td>type</td>
+<td>int</td>
+<td>项目类型 0: 托管项目，1: 镜像项目，2: 同步镜像项目</td>
+</tr>
+<tr>
+<td>author.login</td>
 <td>string</td>
-<td>仓库标识</td>
+<td>项目拥有者标识</td>
+</tr>
+<tr>
+<td>author.type</td>
+<td>string</td>
+<td>项目拥有者类型</td>
+</tr>
+<tr>
+<td>author.name</td>
+<td>string</td>
+<td>项目拥有者名称</td>
+</tr>
+<tr>
+<td>author.image_url</td>
+<td>string</td>
+<td>项目拥有者头像地址</td>
 </tr>
 </tbody></table>
 
@@ -7065,12 +7265,19 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <p>返回的JSON示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-  </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ni项目"</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mirror_demo"</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"is_public"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"my first project mirror_demo"</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"repo_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">75073</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"repo_identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mirror_demo"</span><span class="w">
+    </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"platform"</span><span class="p">:</span><span class="w"> </span><span class="s2">"forge"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">469</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"repo_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">469</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"open_devops"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h2 id='ba8983357c'>仓库详情(新版)</h2>
 <p>仓库详情</p>
@@ -7126,9 +7333,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>仓库网址</td>
 </tr>
 <tr>
-<td>readme</td>
+<td>lesson_url</td>
 <td>string</td>
-<td>readme文件｜</td>
+<td>课程地址</td>
 </tr>
 <tr>
 <td>identifier</td>
@@ -7136,11 +7343,31 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>项目标识</td>
 </tr>
 <tr>
+<td>invite_code</td>
+<td>string</td>
+<td>项目邀请码</td>
+</tr>
+<tr>
 <td>name</td>
 <td>string</td>
 <td>项目名称</td>
 </tr>
 <tr>
+<td>description</td>
+<td>string</td>
+<td>项目描述</td>
+</tr>
+<tr>
+<td>project_id</td>
+<td>int</td>
+<td>项目ID</td>
+</tr>
+<tr>
+<td>repo_id</td>
+<td>int</td>
+<td>仓库ID</td>
+</tr>
+<tr>
 <td>issues_count</td>
 <td>int</td>
 <td>项目issue数量</td>
@@ -7188,7 +7415,7 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <tr>
 <td>permission</td>
 <td>string</td>
-<td>项目权限</td>
+<td>项目权限, Admin: 平台管理员，Manager: 项目管理员, Developer: 项目开发者, Reporter: 项目报告者</td>
 </tr>
 <tr>
 <td>mirror_url</td>
@@ -7228,12 +7455,27 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <tr>
 <td>forked_from_project_id</td>
 <td>int</td>
-<td>fork项目id</td>
+<td>项目复刻来源项目id</td>
 </tr>
 <tr>
-<td>fork_info</td>
-<td>object</td>
-<td>fork项目信息</td>
+<td>fork_info.fork_form_name</td>
+<td>string</td>
+<td>项目复刻来源项目的名称</td>
+</tr>
+<tr>
+<td>fork_info.fork_project_user_login</td>
+<td>string</td>
+<td>项目复刻来源项目拥有者标识</td>
+</tr>
+<tr>
+<td>fork_info.fork_project_identifier</td>
+<td>string</td>
+<td>项目复刻来源项目标识</td>
+</tr>
+<tr>
+<td>fork_info.fork_project_user_name</td>
+<td>string</td>
+<td>项目复刻来源项目拥有者名称</td>
 </tr>
 <tr>
 <td>size</td>
@@ -7243,12 +7485,12 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <tr>
 <td>ssh_url</td>
 <td>string</td>
-<td>项目ssh地址</td>
+<td>项目ssh克隆地址</td>
 </tr>
 <tr>
 <td>clone_url</td>
 <td>string</td>
-<td>项目克隆地址</td>
+<td>项目http克隆地址</td>
 </tr>
 <tr>
 <td>default_branch</td>
@@ -7276,69 +7518,29 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>许可证名称</td>
 </tr>
 <tr>
-<td>release_versions.list.name</td>
-<td>string</td>
-<td>项目issue数量</td>
-</tr>
-<tr>
-<td>release_versions.list.tag_name</td>
-<td>string</td>
-<td>发行版标签名称</td>
-</tr>
-<tr>
-<td>release_versions.list.created_at</td>
-<td>string</td>
-<td>发行版创建时间</td>
-</tr>
-<tr>
-<td>release_versions.total_count</td>
+<td>author.id</td>
 <td>int</td>
-<td>发行版数量</td>
+<td>项目拥有者ID</td>
 </tr>
 <tr>
-<td>branches.list.name</td>
+<td>author.login</td>
 <td>string</td>
-<td>分支名称</td>
+<td>项目拥有者标识</td>
 </tr>
 <tr>
-<td>branches.total_count</td>
-<td>int</td>
-<td>分支数量</td>
-</tr>
-<tr>
-<td>tags.list.name</td>
+<td>author.type</td>
 <td>string</td>
-<td>标签名称</td>
+<td>项目拥有者类型</td>
 </tr>
 <tr>
-<td>tags.total_count</td>
-<td>int</td>
-<td>标签数量</td>
-</tr>
-<tr>
-<td>contributors.list.contributions</td>
-<td>int</td>
-<td>贡献数量</td>
-</tr>
-<tr>
-<td>contributors.list.login</td>
+<td>author.name</td>
 <td>string</td>
-<td>贡献者登录名</td>
+<td>项目拥有者名称</td>
 </tr>
 <tr>
-<td>contributors.list.name</td>
+<td>author.image_url</td>
 <td>string</td>
-<td>贡献者用户名称</td>
-</tr>
-<tr>
-<td>contributors.list.image_url</td>
-<td>string</td>
-<td>贡献者头像</td>
-</tr>
-<tr>
-<td>languages</td>
-<td>object</td>
-<td>项目语言占比</td>
+<td>项目拥有者头像地址</td>
 </tr>
 </tbody></table>
 
@@ -7346,31 +7548,25 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <p>返回的JSON示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"仓库简介"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"website"</span><span class="p">:</span><span class="w"> </span><span class="s2">"仓库网址"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"readme"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"file"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"encoding"</span><span class="p">:</span><span class="w"> </span><span class="s2">"base64"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">9</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"# ceshi</span><span class="se">\n\n</span><span class="s2">"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="w">
-    </span><span class="p">},</span><span class="w">
-    </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试项目"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"project_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"repo_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"issues_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"pull_requests_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"project_identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"website"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"lesson_url"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"invite_code"</span><span class="p">:</span><span class="w"> </span><span class="s2">"8zfKtM"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"project_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">469</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"repo_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">469</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"issues_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pull_requests_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"project_identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hahahah"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"praises_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"forked_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"forked_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
     </span><span class="nl">"watchers_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
     </span><span class="nl">"versions_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
     </span><span class="nl">"version_releases_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
     </span><span class="nl">"version_releasesed_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"permission"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Reporter"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"permission"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Admin"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"mirror_url"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
     </span><span class="nl">"mirror"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
     </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
@@ -7378,71 +7574,23 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
     </span><span class="nl">"watched"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
     </span><span class="nl">"praised"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
     </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"forked_from_project_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"fork_info"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"fork_form_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试项目"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"fork_project_user_login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi_org"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"fork_project_identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"fork_project_user_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi_org"</span><span class="w">
-    </span><span class="p">},</span><span class="w">
-    </span><span class="nl">"size"</span><span class="p">:</span><span class="w"> </span><span class="s2">"25.0 KB"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"ssh_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"virus@localhost:yystopf/ceshi.git"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"clone_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10080/yystopf/ceshi.git"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"forked_from_project_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"size"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2.1 MB"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"ssh_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"virus@127.0.0.1:10081:yystopf/hahahah.git"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"clone_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:10081/yystopf/hahahah.git"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"default_branch"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"empty"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"full_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf/ceshi"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"full_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf/hahahah"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"private"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"license_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"gnu-javamail-exception"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"release_versions"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"list"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-            </span><span class="p">{</span><span class="w">
-                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
-                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"vvvv"</span><span class="p">,</span><span class="w">
-                </span><span class="nl">"tag_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"v1.1"</span><span class="p">,</span><span class="w">
-                </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2019-07-18 10:16"</span><span class="w">
-            </span><span class="p">}</span><span class="w">
-        </span><span class="p">],</span><span class="w">
-        </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="w">
-    </span><span class="p">},</span><span class="w">
-    </span><span class="nl">"branches"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"list"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-            </span><span class="p">{</span><span class="w">
-                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="w">
-            </span><span class="p">}</span><span class="w">
-        </span><span class="p">],</span><span class="w">
-        </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="w">
-    </span><span class="p">},</span><span class="w">
-    </span><span class="nl">"tags"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"list"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-            </span><span class="p">{</span><span class="w">
-                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"v1.1"</span><span class="w">
-            </span><span class="p">},</span><span class="w">
-            </span><span class="p">{</span><span class="w">
-                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"v1.0"</span><span class="w">
-            </span><span class="p">}</span><span class="w">
-        </span><span class="p">],</span><span class="w">
-        </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="w">
-    </span><span class="p">},</span><span class="w">
-    </span><span class="nl">"contributors"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"list"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-            </span><span class="p">{</span><span class="w">
-                </span><span class="nl">"contributions"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-                </span><span class="nl">"gid"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
-                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
-                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
-                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
-                </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"avatars/User/b"</span><span class="w">
-            </span><span class="p">}</span><span class="w">
-        </span><span class="p">],</span><span class="w">
-        </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="w">
-    </span><span class="p">},</span><span class="w">
-    </span><span class="nl">"languages"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"HTML"</span><span class="p">:</span><span class="w"> </span><span class="s2">"50.9%"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"Ruby"</span><span class="p">:</span><span class="w"> </span><span class="s2">"25.6%"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"JavaScript"</span><span class="p">:</span><span class="w"> </span><span class="s2">"21.4%"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"CSS"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1.3%"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"CoffeeScript"</span><span class="p">:</span><span class="w"> </span><span class="s2">"0.7%"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"Shell"</span><span class="p">:</span><span class="w"> </span><span class="s2">"0.1%"</span><span class="w">
+    </span><span class="nl">"license_name"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branches_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1201</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"tags_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
     </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h2 id='46a7ce7681'>仓库标签列表</h2>
@@ -7650,16 +7798,16 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
         </span><span class="p">}</span><span class="w">
     </span><span class="p">}</span><span class="w">
 </span><span class="p">]</span><span class="w">
-</span></code></pre></div><h2 id='af9709123a'>编辑仓库信息</h2>
-<p>编辑仓库信息</p>
+</span></code></pre></div><h2 id='a43972f107'>仓库分支列表</h2>
+<p>仓库分支列表</p>
 
 <blockquote>
 <p>示例:</p>
 </blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/jasder/jasder_test/edit.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/edit.json</span><span class="dl">'</span><span class="p">)</span>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/yystopf/csfjkkj/branches.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/branches.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-5'>HTTP 请求</h3>
-<p><code>GET /api/:owner/:repo/edit.json</code></p>
+<p><code>GET /api/:owner/:repo/branches.json</code></p>
 <h3 id='2eb6f47757-5'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -7694,6 +7842,250 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </tr>
 </thead><tbody>
 <tr>
+<td>name</td>
+<td>string</td>
+<td>分支名称</td>
+</tr>
+<tr>
+<td>http_url</td>
+<td>string</td>
+<td>分支http地址</td>
+</tr>
+<tr>
+<td>zip_url</td>
+<td>string</td>
+<td>分支zip包下载地址</td>
+</tr>
+<tr>
+<td>tar_url</td>
+<td>string</td>
+<td>分支tar包下载地址</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">[</span><span class="w">
+    </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"http_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:10081/yystopf/hahahah.git"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"zip_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000/api/yystopf/hahahah/archive/master.zip"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"tar_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000/api/yystopf/hahahah/archive/master.tar.gz"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"touch-10"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"http_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:10081/yystopf/hahahah.git"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"zip_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000/api/yystopf/hahahah/archive/touch-10.zip"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"tar_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000/api/yystopf/hahahah/archive/touch-10.tar.gz"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"touch-100"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"http_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:10081/yystopf/hahahah.git"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"zip_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000/api/yystopf/hahahah/archive/touch-100.zip"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"tar_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000/api/yystopf/hahahah/archive/touch-100.tar.gz"</span><span class="w">
+    </span><span class="p">}</span><span class="w">
+</span><span class="p">]</span><span class="w">
+</span></code></pre></div><h2 id='636c36d314'>仓库贡献者列表</h2>
+<p>仓库贡献者列表</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/yystopf/csfjkkj/contributors.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/contributors.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
+<p><code>GET /api/:owner/:repo/contributors.json</code></p>
+<h3 id='2eb6f47757-6'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-6'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>list.contributions</td>
+<td>int</td>
+<td>贡献者commit数量</td>
+</tr>
+<tr>
+<td>list.login</td>
+<td>string</td>
+<td>贡献者标识</td>
+</tr>
+<tr>
+<td>list.type</td>
+<td>string</td>
+<td>贡献者类型</td>
+</tr>
+<tr>
+<td>list.name</td>
+<td>string</td>
+<td>贡献者昵称</td>
+</tr>
+<tr>
+<td>list.image_url</td>
+<td>string</td>
+<td>贡献者头像地址</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"list"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"contributions"</span><span class="p">:</span><span class="w"> </span><span class="mi">2411</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"contributions"</span><span class="p">:</span><span class="w"> </span><span class="mi">6</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"testforge3"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"testforge3"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/T/132_143_60/120.png"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='3fd5cce10e'>仓库开发语言</h2>
+<p>仓库开发语言组成</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/yystopf/csfjkkj/languages.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/languages.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
+<p><code>GET /api/:owner/:repo/languages.json</code></p>
+<h3 id='2eb6f47757-7'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-7'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>key</td>
+<td>string</td>
+<td>语言类型</td>
+</tr>
+<tr>
+<td>value</td>
+<td>string</td>
+<td>语言占比</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"Go"</span><span class="p">:</span><span class="w"> </span><span class="s2">"99.0%"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"Shell"</span><span class="p">:</span><span class="w"> </span><span class="s2">"0.4%"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"Smarty"</span><span class="p">:</span><span class="w"> </span><span class="s2">"0.4%"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"Makefile"</span><span class="p">:</span><span class="w"> </span><span class="s2">"0.2%"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='af9709123a'>编辑仓库信息</h2>
+<p>编辑仓库信息</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/jasder/jasder_test/edit.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/edit.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
+<p><code>GET /api/:owner/:repo/edit.json</code></p>
+<h3 id='2eb6f47757-8'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-8'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
 <td>identifier</td>
 <td>string</td>
 <td>仓库标识</td>
@@ -7762,9 +8154,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <span class="nt">-d</span> <span class="s2">"private=true"</span> <span class="se">\</span>
 http://localhost:3000/api/jasder/jasder_test.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/jasder/jasder_test.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
 <p><code>PATCH /api/:owner/:repo</code></p>
-<h3 id='2eb6f47757-6'>请求参数:</h3>
+<h3 id='2eb6f47757-9'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -7824,7 +8216,7 @@ http://localhost:3000/api/jasder/jasder_test.json
 <td>项目是否私有, true：为私有，false: 公开，默认为公开</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-6'>返回字段说明:</h3>
+<h3 id='7447e4874e-9'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -7889,9 +8281,9 @@ http://localhost:3000/api/jasder/jasder_test.json
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE http://localhost:3000/api/jasder/jasder_test.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/jasder/jasder_test.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
 <p><code>PATCH /api/:owner/:repo</code></p>
-<h3 id='2eb6f47757-7'>请求参数:</h3>
+<h3 id='2eb6f47757-10'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -7916,7 +8308,7 @@ http://localhost:3000/api/jasder/jasder_test.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-7'>返回字段说明:</h3>
+<h3 id='7447e4874e-10'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -7957,9 +8349,9 @@ http://localhost:3000/api/jasder/jasder_test.json
 <span class="nt">-d</span> <span class="s2">"user_id=12"</span> <span class="se">\</span>
 http://localhost:3000/api/jasder/jasder_test/collaborators.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/jasder/jasder_test/collaborators.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
 <p><code>POST /api/:owner/:repo/collaborators.json</code></p>
-<h3 id='2eb6f47757-8'>请求参数:</h3>
+<h3 id='2eb6f47757-11'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -7991,7 +8383,7 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 <td>用户id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-8'>返回字段说明:</h3>
+<h3 id='7447e4874e-11'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8032,9 +8424,9 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 <span class="nt">-d</span> <span class="s2">"user_id=12"</span> <span class="se">\</span>
 http://localhost:3000/api/jasder/jasder_test/collaborators.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/jasder/jasder_test/collaborators.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-12'>HTTP 请求</h3>
 <p><code>DELETE /api/:owner/:repo/collaborators.json</code></p>
-<h3 id='2eb6f47757-9'>请求参数:</h3>
+<h3 id='2eb6f47757-12'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8066,7 +8458,7 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 <td>用户id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-9'>返回字段说明:</h3>
+<h3 id='7447e4874e-12'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8108,9 +8500,9 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 <span class="nt">-d</span> <span class="s2">"role=Developer"</span> <span class="se">\</span>
 http://localhost:3000/api/jasder/jasder_test/change_role.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PUT /api/jasder/jasder_test/change_role.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
 <p><code>PUT /api/:owner/:repo/change_role.json</code></p>
-<h3 id='2eb6f47757-10'>请求参数:</h3>
+<h3 id='2eb6f47757-13'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8149,7 +8541,7 @@ http://localhost:3000/api/jasder/jasder_test/change_role.json
 <td>取值范围：&quot;Manager&quot;, &quot;Developer&quot;, &quot;Reporter&quot;；分别为项目管理人员(拥有所有操作权限)、项目开发人员(只拥有读写权限)、项目报告人员(只拥有读权限)</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-10'>返回字段说明:</h3>
+<h3 id='7447e4874e-13'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8191,9 +8583,9 @@ http://localhost:3000/api/jasder/jasder_test/change_role.json
 <span class="nt">-d</span> <span class="s2">"limit=5"</span> <span class="se">\</span>
 http://localhost:3000/api/jasder/jasder_test/collaborators.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/collaborators.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/collaborators.json</code></p>
-<h3 id='2eb6f47757-11'>请求参数:</h3>
+<h3 id='2eb6f47757-14'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8232,7 +8624,7 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 <td>每页多少条数据，默认15条</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-11'>返回字段说明:</h3>
+<h3 id='7447e4874e-14'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8320,9 +8712,9 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 <span class="nt">-d</span> <span class="s2">"ref=develop"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/ceshi/files.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/ceshi/files.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-12'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/files</code></p>
-<h3 id='2eb6f47757-12'>请求参数:</h3>
+<h3 id='2eb6f47757-15'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8361,7 +8753,7 @@ http://localhost:3000/api/yystopf/ceshi/files.json
 <td>分支名，默认为仓库默认分支</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-12'>返回字段说明:</h3>
+<h3 id='7447e4874e-15'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8443,9 +8835,9 @@ http://localhost:3000/api/yystopf/ceshi/files.json
 <span class="nt">-d</span> <span class="s2">"ref=develop"</span> <span class="se">\</span>
 http://localhost:3000//api/jasder/jasder_test/entries.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/entries.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-16'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/entries.json</code></p>
-<h3 id='2eb6f47757-13'>请求参数:</h3>
+<h3 id='2eb6f47757-16'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8477,7 +8869,7 @@ http://localhost:3000//api/jasder/jasder_test/entries.json
 <td>分支名称、tag名称或是提交记录id，默认为master分支</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-13'>返回字段说明:</h3>
+<h3 id='7447e4874e-16'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8591,9 +8983,9 @@ http://localhost:3000//api/jasder/jasder_test/entries.json
 <span class="nt">-d</span> <span class="s2">"filepath=file"</span> <span class="se">\</span>
 http://localhost:3000//api/jasder/jasder_test/sub_entries.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/sub_entries.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/sub_entries.json</code></p>
-<h3 id='2eb6f47757-14'>请求参数:</h3>
+<h3 id='2eb6f47757-17'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8632,7 +9024,7 @@ http://localhost:3000//api/jasder/jasder_test/sub_entries.json
 <td>分支名称、tag名称或是提交记录id，默认为master分支</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-14'>返回字段说明:</h3>
+<h3 id='7447e4874e-17'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8729,9 +9121,9 @@ http://localhost:3000//api/jasder/jasder_test/sub_entries.json
 <span class="nt">-d</span> <span class="s2">"filepath=lib"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/csfjkkj/readme.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/readme.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/readme.json</code></p>
-<h3 id='2eb6f47757-15'>请求参数:</h3>
+<h3 id='2eb6f47757-18'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8770,7 +9162,7 @@ http://localhost:3000/api/yystopf/csfjkkj/readme.json
 <td>子目录名称，默认为空</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-15'>返回字段说明:</h3>
+<h3 id='7447e4874e-18'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8842,9 +9234,9 @@ http://localhost:3000/api/yystopf/csfjkkj/readme.json
 <span class="nt">-d</span> <span class="s2">"filepath=lib"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/contributors.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-16'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-19'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/contributors.json</code></p>
-<h3 id='2eb6f47757-16'>请求参数:</h3>
+<h3 id='2eb6f47757-19'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8883,7 +9275,7 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 <td>子目录名称，默认为空</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-16'>返回字段说明:</h3>
+<h3 id='7447e4874e-19'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8958,9 +9350,9 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-17'>请求参数:</h3>
+<h3 id='2eb6f47757-20'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8985,7 +9377,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-17'>返回字段说明:</h3>
+<h3 id='7447e4874e-20'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9078,9 +9470,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-18'>请求参数:</h3>
+<h3 id='2eb6f47757-21'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9112,7 +9504,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-18'>返回字段说明:</h3>
+<h3 id='7447e4874e-21'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9235,9 +9627,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-19'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-19'>请求参数:</h3>
+<h3 id='2eb6f47757-22'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9362,7 +9754,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
     </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-19'>返回字段说明:</h3>
+</span></code></pre></div><h3 id='7447e4874e-22'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9441,9 +9833,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-23'>HTTP 请求</h3>
 <p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
-<h3 id='2eb6f47757-20'>请求参数:</h3>
+<h3 id='2eb6f47757-23'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9575,7 +9967,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
     </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-20'>返回字段说明:</h3>
+</span></code></pre></div><h3 id='7447e4874e-23'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -9610,9 +10002,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
 <p><code>DELETE /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-21'>请求参数:</h3>
+<h3 id='2eb6f47757-24'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9644,7 +10036,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>webhook id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-21'>返回字段说明:</h3>
+<h3 id='7447e4874e-24'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -9665,9 +10057,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3/hooktasks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id/hooktasks.json</code></p>
-<h3 id='2eb6f47757-22'>请求参数:</h3>
+<h3 id='2eb6f47757-25'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9699,7 +10091,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-22'>返回字段说明:</h3>
+<h3 id='7447e4874e-25'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9936,9 +10328,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks/3/tests.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-23'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/webhooks/:id/tests.json</code></p>
-<h3 id='2eb6f47757-23'>请求参数:</h3>
+<h3 id='2eb6f47757-26'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9970,7 +10362,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-23'>返回字段说明:</h3>
+<h3 id='7447e4874e-26'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>

From fbbacfa9836fe12d34177fc3cdce7671bf8102d6 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 14 Jul 2022 09:36:52 +0800
Subject: [PATCH 098/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20apk=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=BA=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/repositories_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 998629c9..27ed6d12 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -10,7 +10,7 @@ module RepositoriesHelper
   end
 
   def download_type(str)
-    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv)
+    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv apk)
     default_type.include?(str&.downcase) || str.blank?
   end
 

From 4ed3a9d478f9c805eba1cb0438617cc7c10f1774 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 11 Jul 2022 18:50:13 +0800
Subject: [PATCH 099/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:cherry=20pick=20door?=
 =?UTF-8?q?keeper=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/base_controller.rb | 19 ++++++++++++++-----
 config/initializers/doorkeeper.rb         |  5 +++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index 9170975b..d97123f4 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -3,13 +3,22 @@ class Api::V1::BaseController < ApplicationController
   include Api::ProjectHelper
   include Api::UserHelper
 
-  before_action :doorkeeper_authorize!
-  skip_before_action :user_setup
+  # before_action :doorkeeper_authorize!
+  # skip_before_action :user_setup
 
   protected 
-  def current_user 
-    User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
-  end
+  # def current_user
+  #   #client方法对接，需要一直带着用户标识uid
+  #   Rails.logger.info doorkeeper_token
+  #   if doorkeeper_token && doorkeeper_token.resource_owner_id.blank?
+  #     # return User.anonymous if params[:uid].nil?
+  #     # tip_exception("2222")
+  #     # return render_error('缺少用户标识!')  if params[:uid].nil?
+  #     User.current = User.find(params[:uid])
+  #   else
+  #     User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
+  #   end
+  # end
 
   def require_manager_above
     @project = load_project
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index d80dcac6..512cb36a 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 Doorkeeper.configure do
+  base_controller 'ApplicationController'
   # Change the ORM that doorkeeper will use (requires ORM extensions installed).
   # Check the list of supported ORMs here: https://github.com/doorkeeper-gem/doorkeeper#orms
   orm :active_record
@@ -20,8 +21,8 @@ Doorkeeper.configure do
   access_token_generator '::Doorkeeper::JWT'
 
   admin_authenticator do
-    user = User.find_by_id(session[:www_user_id])
-    unless user #&& user.admin_or_business?
+    user = current_user
+    unless user && user.admin_or_business?
       redirect_to root_url
     end
   end

From 24d83133e7a3e562acdcd6556d89fa45d5529474 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 15 Jul 2022 14:02:48 +0800
Subject: [PATCH 100/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=88=86=E6=94=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  2 +-
 app/controllers/api/v1/base_controller.rb     | 13 +++
 .../api/v1/projects/branches_controller.rb    | 19 +++++
 app/controllers/application_controller.rb     | 83 +++++++++++--------
 .../concerns/api/project_helper.rb            |  2 +-
 .../v1/projects/branches/all_list_service.rb  | 27 ++++++
 .../v1/projects/branches/create_service.rb    | 47 +++++++++++
 .../branches/_simple_detail.json.jbuilder     |  4 +
 .../_simple_gitea_detail.json.jbuilder        | 23 +++++
 .../v1/projects/branches/all.json.jbuilder    |  3 +
 .../v1/projects/branches/create.json.jbuilder |  1 +
 .../api/v1/users/_commit_user.json.jbuilder   | 21 +++++
 config/routes/api.rb                          |  5 ++
 13 files changed, 213 insertions(+), 37 deletions(-)
 create mode 100644 app/controllers/api/v1/projects/branches_controller.rb
 create mode 100644 app/services/api/v1/projects/branches/all_list_service.rb
 create mode 100644 app/services/api/v1/projects/branches/create_service.rb
 create mode 100644 app/views/api/v1/projects/branches/_simple_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/branches/all.json.jbuilder
 create mode 100644 app/views/api/v1/projects/branches/create.json.jbuilder
 create mode 100644 app/views/api/v1/users/_commit_user.json.jbuilder

diff --git a/Gemfile b/Gemfile
index 175ca330..091716e5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.8.2'
\ No newline at end of file
+gem 'gitea-client', '~> 0.9.1'
\ No newline at end of file
diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index d97123f4..9832ee11 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -20,8 +20,21 @@ class Api::V1::BaseController < ApplicationController
   #   end
   # end
 
+  # 具有对仓库的管理权限
   def require_manager_above
     @project = load_project
     return render_forbidden unless current_user.admin? && @project.manager?(current_user)
   end
+
+  # 具有对仓库的操作权限
+  def require_operate_above 
+    @project = load_project
+    return render_forbidden unless current_user.admin? && @project.operator?(current_user)
+  end
+
+  # 具有对仓库的访问权限
+  def require_public_and_member_above
+    @project = load_project 
+    return render_forbidden unless @project.is_public || (current_user.admin? && @project.member?(current_user))
+  end
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb
new file mode 100644
index 00000000..d7f66d74
--- /dev/null
+++ b/app/controllers/api/v1/projects/branches_controller.rb
@@ -0,0 +1,19 @@
+class Api::V1::Projects::BranchesController < Api::V1::BaseController 
+  before_action :require_public_and_member_above, only: [:index] 
+
+  def all 
+    @result_object = Api::V1::Projects::Branches::AllListService.call(@project, current_user&.gitea_token)
+  end
+
+  before_action :require_operate_above, only: [:create] 
+
+  def create 
+    @result_object = Api::V1::Projects::Branches::CreateService.call(@project, branch_params, current_user&.gitea_token)
+    puts @result_object
+  end
+
+  private 
+  def branch_params 
+    params.require(:branch).permit(:new_branch_name, :old_branch_name)
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f71a7501..45a814a2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -248,44 +248,57 @@ class ApplicationController < ActionController::Base
 		#return if params[:controller] == "main"
 		# Find the current user
 		#Rails.logger.info("current_laboratory is #{current_laboratory} domain is #{request.subdomain}")
-		User.current = find_current_user
-		uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous"))
-
-		# 开放课程通过链接访问的用户
-		if !User.current.logged? && !params[:chinaoocTimestamp].blank? && !params[:websiteName].blank? && !params[:chinaoocKey].blank?
-			content = "#{OPENKEY}#{params[:websiteName]}#{params[:chinaoocTimestamp]}"
-
-			if Digest::MD5.hexdigest(content) == params[:chinaoocKey]
-				user = open_class_user
-				if user
-					start_user_session(user)
-					set_autologin_cookie(user)
+		if request.headers["Authorization"].present? && request.headers["Authorization"].start_with?('Bearer')
+			tip_exception(401, "请登录后再操作!") unless valid_doorkeeper_token?
+			if @doorkeeper_token.present?
+				# client方法对接，需要一直带着用户标识uid
+				if @doorkeeper_token.resource_owner_id.blank?
+					tip_exception(-1, "缺少用户标识!") if params[:uid].nil?
+					User.current = User.find(params[:uid])
+				else
+					User.current = User.find_by(id: @doorkeeper_token.resource_owner_id)
 				end
-				User.current = user
 			end
+		else 
+			User.current = find_current_user
+			uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous"))
+
+			# 开放课程通过链接访问的用户
+			if !User.current.logged? && !params[:chinaoocTimestamp].blank? && !params[:websiteName].blank? && !params[:chinaoocKey].blank?
+				content = "#{OPENKEY}#{params[:websiteName]}#{params[:chinaoocTimestamp]}"
+
+				if Digest::MD5.hexdigest(content) == params[:chinaoocKey]
+					user = open_class_user
+					if user
+						start_user_session(user)
+						set_autologin_cookie(user)
+					end
+					User.current = user
+				end
+			end
+
+			# if !User.current.logged? && Rails.env.development?
+			# 	user = User.find 1
+			# 	User.current = user
+			# 	start_user_session(user)
+			# end
+
+
+			# 测试版前端需求
+			# logger.info("subdomain:#{request.subdomain}")
+			# if request.subdomain != "www"
+			# 	if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
+			# 		User.current = User.find 81403
+			# 	elsif params[:debug] == 'student'
+			# 		User.current = User.find 8686
+			# 	elsif params[:debug] == 'admin'
+			# 		logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
+			# 		user =  User.find 36480
+			# 		User.current = user
+			# 		cookies.signed[:user_id] = user.id
+			# 	end
+			# end
 		end
-
-		if !User.current.logged? && Rails.env.development?
-			user = User.find 1
-			User.current = user
-			start_user_session(user)
-		end
-
-
-		# 测试版前端需求
-		logger.info("subdomain:#{request.subdomain}")
-		# if request.subdomain != "www"
-		# 	if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
-		# 		User.current = User.find 81403
-		# 	elsif params[:debug] == 'student'
-		# 		User.current = User.find 8686
-		# 	elsif params[:debug] == 'admin'
-		# 		logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
-		# 		user =  User.find 36480
-		# 		User.current = user
-		# 		cookies.signed[:user_id] = user.id
-		# 	end
-		# end
 		# User.current = User.find 81403
 	end
 
diff --git a/app/controllers/concerns/api/project_helper.rb b/app/controllers/concerns/api/project_helper.rb
index 0b444c48..52967e78 100644
--- a/app/controllers/concerns/api/project_helper.rb
+++ b/app/controllers/concerns/api/project_helper.rb
@@ -8,7 +8,7 @@ module Api::ProjectHelper
     @project, @owner = Project.find_with_namespace(namespace, repo)
 
     if @project
-      logger.info "###########：project not founded"
+      logger.info "###########：project founded"
 			@project
     else
 			logger.info "###########：project not found"
diff --git a/app/services/api/v1/projects/branches/all_list_service.rb b/app/services/api/v1/projects/branches/all_list_service.rb
new file mode 100644
index 00000000..fd942288
--- /dev/null
+++ b/app/services/api/v1/projects/branches/all_list_service.rb
@@ -0,0 +1,27 @@
+class Api::V1::Projects::Branches::AllListService < ApplicationService 
+
+  attr_accessor :project, :token, :owner, :repo 
+  attr_accessor :gitea_data
+
+  def initialize(project, token=nil)
+    @project = project 
+    @owner = project&.owner.login 
+    @repo = project&.identifier 
+    @token = token 
+  end
+
+  def call 
+    $gitea_client.token = token unless token.blank? 
+    load_gitea_data
+    
+    $gitea_client.token = nil unless token.blank?
+    gitea_data
+  rescue 
+    raise Error, "服务器错误，请联系系统管理员！"
+  end
+
+  private 
+  def load_gitea_data 
+    @gitea_data = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo)
+  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
new file mode 100644
index 00000000..a4d9f854
--- /dev/null
+++ b/app/services/api/v1/projects/branches/create_service.rb
@@ -0,0 +1,47 @@
+class Api::V1::Projects::Branches::CreateService < ApplicationService 
+  include ActiveModel::Model
+
+  attr_accessor :project, :token, :owner, :repo, :old_branch_name, :new_branch_name
+  attr_accessor :gitea_data
+
+  validates :new_branch_name, :old_branch_name, presence: :true
+
+  def initialize(project, params, token=nil)
+    @project = project 
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @new_branch_name = params[:new_branch_name]
+    @old_branch_name = params[:old_branch_name] 
+    @token = token 
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid?
+    $gitea_client.token = token unless token.blank? 
+
+    check_new_branch_exist
+    excute_data_to_gitea
+    
+    $gitea_client.token = nil unless token.blank?
+    gitea_data
+  end
+
+  private 
+  def request_body 
+    {
+      new_branch_name: new_branch_name,
+      old_branch_name: old_branch_name,
+    }
+  end
+
+  def excute_data_to_gitea 
+    @gitea_data = $gitea_client.post_repos_branches_by_owner_repo(owner, repo, {body: request_body.to_json})
+    raise Error, '创建分支失败！' unless @gitea_data.is_a?(Hash)
+  end
+
+  def check_new_branch_exist
+    result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo)
+    raise Error, '查询分支名称失败！' unless result.is_a?(Hash)
+    raise Error, '分支已存在！' if result['branch_name'].include?(@new_branch_name)
+  end
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/branches/_simple_detail.json.jbuilder b/app/views/api/v1/projects/branches/_simple_detail.json.jbuilder
new file mode 100644
index 00000000..b1e407a9
--- /dev/null
+++ b/app/views/api/v1/projects/branches/_simple_detail.json.jbuilder
@@ -0,0 +1,4 @@
+json.name branch
+json.http_url render_http_url(@project)
+json.zip_url render_zip_url(@owner, @project.repository, branch)
+json.tar_url render_tar_url(@owner, @project.repository, branch)
\ 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
new file mode 100644
index 00000000..9fee552d
--- /dev/null
+++ b/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
@@ -0,0 +1,23 @@
+json.name branch['name']
+json.commit do 
+  json.id branch['commit']['id']
+  json.message branch['commit']['message']
+  json.author do 
+  
+    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(branch['commit']['author']), name: branch['commit']['author']['name'] }
+  end
+  
+  json.committer do 
+    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name'] }
+  end
+  json.time_ago time_from_now(branch['commit']['timestamp'].to_time)
+  json.timestamp branch['commit']['timestamp']
+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_time_from_now branch['commit_time']
+json.commit_time branch['commit_time']
+json.default_branch branch['default_branch']
\ No newline at end of file
diff --git a/app/views/api/v1/projects/branches/all.json.jbuilder b/app/views/api/v1/projects/branches/all.json.jbuilder
new file mode 100644
index 00000000..d89b1ee1
--- /dev/null
+++ b/app/views/api/v1/projects/branches/all.json.jbuilder
@@ -0,0 +1,3 @@
+json.array! @result_object["branch_name"] do |branch|
+  json.partial! "api/v1/projects/branches/simple_detail", branch: branch
+end
\ 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
new file mode 100644
index 00000000..eed860b8
--- /dev/null
+++ b/app/views/api/v1/projects/branches/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: @result_object
diff --git a/app/views/api/v1/users/_commit_user.json.jbuilder b/app/views/api/v1/users/_commit_user.json.jbuilder
new file mode 100644
index 00000000..83935709
--- /dev/null
+++ b/app/views/api/v1/users/_commit_user.json.jbuilder
@@ -0,0 +1,21 @@
+if user.present?
+  if user.is_a?(Hash)
+    json.id user["id"]
+    json.login user["login"]
+    json.name user["name"]
+    json.type user["type"]
+    json.image_url user["avatar_url"]
+  else
+    json.id user.id
+    json.login user.login
+    json.name user.real_name
+    json.type user&.type
+    json.image_url url_to_avatar(user)
+  end 
+else
+  json.id nil
+  json.login name 
+  json.name name 
+  json.type nil
+  json.image_url User::Avatar.get_letter_avatar_url(name)
+end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 32acdabd..c969302b 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -23,6 +23,11 @@ defaults format: :json do
                 get :hooktasks 
               end
             end
+            resources :branches, only:[:index, :create] do 
+              collection do 
+                get :all 
+              end
+            end
           end
         end
 

From b8d4b15b40b98688715ab287c798017e6967c6fb Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 15 Jul 2022 14:40:35 +0800
Subject: [PATCH 101/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/branches_controller.rb    |  3 +-
 .../slate/source/includes/_repositories.md    | 99 ++++++++++++++++++-
 .../v1/projects/branches/all_list_service.rb  |  3 +-
 .../_simple_gitea_detail.json.jbuilder        |  7 +-
 4 files changed, 101 insertions(+), 11 deletions(-)

diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb
index d7f66d74..bc491961 100644
--- a/app/controllers/api/v1/projects/branches_controller.rb
+++ b/app/controllers/api/v1/projects/branches_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::Projects::BranchesController < Api::V1::BaseController 
-  before_action :require_public_and_member_above, only: [:index] 
+  before_action :require_public_and_member_above, only: [:all] 
 
   def all 
     @result_object = Api::V1::Projects::Branches::AllListService.call(@project, current_user&.gitea_token)
@@ -9,7 +9,6 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
 
   def create 
     @result_object = Api::V1::Projects::Branches::CreateService.call(@project, branch_params, current_user&.gitea_token)
-    puts @result_object
   end
 
   private 
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index f0a64a60..624afd5b 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -409,21 +409,21 @@ await octokit.request('GET /api/yystopf/csfjkkj/tags.json')
 ```
 
 
-## 仓库分支列表
-仓库分支列表
+## 仓库所有分支列表
+仓库所有分支列表
 
 > 示例:
 
 ```shell
-curl -X GET http://localhost:3000/api/yystopf/csfjkkj/branches.json
+curl -X GET http://localhost:3000/api/v1/yystopf/csfjkkj/branches/all.json
 ```
 
 ```javascript
-await octokit.request('GET /api/yystopf/csfjkkj/branches.json')
+await octokit.request('GET /api/v1/yystopf/csfjkkj/branches/all.json')
 ```
 
 ### HTTP 请求
-`GET /api/:owner/:repo/branches.json`
+`GET /api/v1/:owner/:repo/branches/all.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
@@ -466,6 +466,95 @@ await octokit.request('GET /api/yystopf/csfjkkj/branches.json')
 ]
 ```
 
+## 仓库创建分支
+为仓库创建一个新的分支
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/v1/yystopf/csfjkkj/branches.json
+```
+
+```javascript
+await octokit.request('POST /api/v1/yystopf/csfjkkj/branches.json')
+```
+
+### HTTP 请求
+`POST /api/v1/:owner/:repo/branches.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是| |string |用户登录名  |
+|repo             |是| |string |项目标识identifier  |
+|new_branch_name|是｜｜string| 新分支名称|
+|old_branch_name|否｜|string| 来源分支名称|
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|name                      |string|分支名称|
+|commit.id                 |string|提交ID|
+|commit.message            |string|提交信息|
+|commit.author.id          |string|提交作者ID|
+|commit.author.login       |string|提交作者标识|
+|commit.author.name        |string|提交作者名称|
+|commit.author.type        |string|提交作者类型|
+|commit.committer.id       |string|提交者ID|
+|commit.committer.login    |string|提交者标识|
+|commit.committer.name     |string|提交者名称|
+|commit.committer.type     |string|提交者类型|
+|commit.committer.image_url|string|提交者头像|
+|commit.time_ago           |string|分支最新提交时间距现在时间差|
+|commit.timestamp          |string|分支最新提交时间|
+|protected                 |bool  |是否为保护分支|
+|user_can_push             |bool  |当前用户是否能提交|
+|user_can_merge            |bool  |当前用户是否能合并|
+|commit_id                 |string|提交ID|
+|commit_time_from_now      |string|分支最新提交时间距现在时间差|
+|commit_time               |string|分支最新提交时间|
+|http_url                  |string|分支http地址|
+|zip_url                   |string|分支zip包下载地址|
+|tar_url                   |string|分支tar包下载地址|
+
+> 返回的JSON示例:
+
+```json
+{
+    "name": "new_branch_8",
+    "commit": {
+        "id": "80dd40214a58622312393b2ae693756a4781fab2",
+        "message": "x拟增\n\nSigned-off-by: yystopf <yystopf@163.com>",
+        "author": {
+            "id": "2",
+            "login": "yystopf",
+            "name": "heh",
+            "type": "User",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "committer": {
+            "id": "2",
+            "login": "yystopf",
+            "name": "heh",
+            "type": "User",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "time_ago": "1天前",
+        "timestamp": "2022-07-13T09:54:15Z"
+    },
+    "protected": false,
+    "user_can_push": true,
+    "user_can_merge": true,
+    "commit_id": "80dd40214a58622312393b2ae693756a4781fab2",
+    "commit_time_from_now": "1天前",
+    "commit_time": "2022-07-13T09:54:15Z",
+    "default_branch": "master",
+    "http_url": "http://127.0.0.1:10081/yystopf/ceshi_hook.git",
+    "zip_url": "http://localhost:3000/api/yystopf/ceshi_hook/archive/new_branch_8.zip",
+    "tar_url": "http://localhost:3000/api/yystopf/ceshi_hook/archive/new_branch_8.tar.gz"
+}
+```
+
 ## 仓库贡献者列表
 仓库贡献者列表
 
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 fd942288..9e97b6dd 100644
--- a/app/services/api/v1/projects/branches/all_list_service.rb
+++ b/app/services/api/v1/projects/branches/all_list_service.rb
@@ -16,12 +16,11 @@ class Api::V1::Projects::Branches::AllListService < ApplicationService
     
     $gitea_client.token = nil unless token.blank?
     gitea_data
-  rescue 
-    raise Error, "服务器错误，请联系系统管理员！"
   end
 
   private 
   def load_gitea_data 
     @gitea_data = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo)
+    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 9fee552d..70fac823 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
@@ -18,6 +18,9 @@ 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_time_from_now branch['commit_time']
+json.commit_time_from_now time_from_now(branch['commit_time'].to_time)
 json.commit_time branch['commit_time']
-json.default_branch branch['default_branch']
\ No newline at end of file
+json.default_branch branch['default_branch']
+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

From bd3cbf33fd76713ff46d78de1243273368e9233a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 15 Jul 2022 14:41:00 +0800
Subject: [PATCH 102/208] fix

---
 public/docs/api.html | 911 ++++++++++++++++++++++++++-----------------
 1 file changed, 562 insertions(+), 349 deletions(-)

diff --git a/public/docs/api.html b/public/docs/api.html
index 86560740..e9091591 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -503,7 +503,10 @@
                     <a href="#46a7ce7681" class="toc-h2 toc-link" data-title="仓库标签列表">仓库标签列表</a>
                   </li>
                   <li>
-                    <a href="#a43972f107" class="toc-h2 toc-link" data-title="仓库分支列表">仓库分支列表</a>
+                    <a href="#ab1acbbaa6" class="toc-h2 toc-link" data-title="仓库所有分支列表">仓库所有分支列表</a>
+                  </li>
+                  <li>
+                    <a href="#b3f2f2d91e" class="toc-h2 toc-link" data-title="仓库创建分支">仓库创建分支</a>
                   </li>
                   <li>
                     <a href="#636c36d314" class="toc-h2 toc-link" data-title="仓库贡献者列表">仓库贡献者列表</a>
@@ -7798,16 +7801,16 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
         </span><span class="p">}</span><span class="w">
     </span><span class="p">}</span><span class="w">
 </span><span class="p">]</span><span class="w">
-</span></code></pre></div><h2 id='a43972f107'>仓库分支列表</h2>
-<p>仓库分支列表</p>
+</span></code></pre></div><h2 id='ab1acbbaa6'>仓库所有分支列表</h2>
+<p>仓库所有分支列表</p>
 
 <blockquote>
 <p>示例:</p>
 </blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/yystopf/csfjkkj/branches.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/branches.json</span><span class="dl">'</span><span class="p">)</span>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/csfjkkj/branches/all.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/branches/all.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-5'>HTTP 请求</h3>
-<p><code>GET /api/:owner/:repo/branches.json</code></p>
+<p><code>GET /api/v1/:owner/:repo/branches/all.json</code></p>
 <h3 id='2eb6f47757-5'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -7886,16 +7889,16 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
         </span><span class="nl">"tar_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000/api/yystopf/hahahah/archive/touch-100.tar.gz"</span><span class="w">
     </span><span class="p">}</span><span class="w">
 </span><span class="p">]</span><span class="w">
-</span></code></pre></div><h2 id='636c36d314'>仓库贡献者列表</h2>
-<p>仓库贡献者列表</p>
+</span></code></pre></div><h2 id='b3f2f2d91e'>仓库创建分支</h2>
+<p>为仓库创建一个新的分支</p>
 
 <blockquote>
 <p>示例:</p>
 </blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/yystopf/csfjkkj/contributors.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/contributors.json</span><span class="dl">'</span><span class="p">)</span>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/v1/yystopf/csfjkkj/branches.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/csfjkkj/branches.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-6'>HTTP 请求</h3>
-<p><code>GET /api/:owner/:repo/contributors.json</code></p>
+<p><code>POST /api/v1/:owner/:repo/branches.json</code></p>
 <h3 id='2eb6f47757-6'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -7920,6 +7923,20 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>string</td>
 <td>项目标识identifier</td>
 </tr>
+<tr>
+<td>new_branch_name</td>
+<td>是｜｜string</td>
+<td>新分支名称</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>old_branch_name</td>
+<td>否｜</td>
+<td>string</td>
+<td>来源分支名称</td>
+<td></td>
+</tr>
 </tbody></table>
 <h3 id='7447e4874e-6'>返回字段说明:</h3>
 <table><thead>
@@ -7930,6 +7947,202 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </tr>
 </thead><tbody>
 <tr>
+<td>name</td>
+<td>string</td>
+<td>分支名称</td>
+</tr>
+<tr>
+<td>commit.id</td>
+<td>string</td>
+<td>提交ID</td>
+</tr>
+<tr>
+<td>commit.message</td>
+<td>string</td>
+<td>提交信息</td>
+</tr>
+<tr>
+<td>commit.author.id</td>
+<td>string</td>
+<td>提交作者ID</td>
+</tr>
+<tr>
+<td>commit.author.login</td>
+<td>string</td>
+<td>提交作者标识</td>
+</tr>
+<tr>
+<td>commit.author.name</td>
+<td>string</td>
+<td>提交作者名称</td>
+</tr>
+<tr>
+<td>commit.author.type</td>
+<td>string</td>
+<td>提交作者类型</td>
+</tr>
+<tr>
+<td>commit.committer.id</td>
+<td>string</td>
+<td>提交者ID</td>
+</tr>
+<tr>
+<td>commit.committer.login</td>
+<td>string</td>
+<td>提交者标识</td>
+</tr>
+<tr>
+<td>commit.committer.name</td>
+<td>string</td>
+<td>提交者名称</td>
+</tr>
+<tr>
+<td>commit.committer.type</td>
+<td>string</td>
+<td>提交者类型</td>
+</tr>
+<tr>
+<td>commit.committer.image_url</td>
+<td>string</td>
+<td>提交者头像</td>
+</tr>
+<tr>
+<td>commit.time_ago</td>
+<td>string</td>
+<td>分支最新提交时间距现在时间差</td>
+</tr>
+<tr>
+<td>commit.timestamp</td>
+<td>string</td>
+<td>分支最新提交时间</td>
+</tr>
+<tr>
+<td>protected</td>
+<td>bool</td>
+<td>是否为保护分支</td>
+</tr>
+<tr>
+<td>user_can_push</td>
+<td>bool</td>
+<td>当前用户是否能提交</td>
+</tr>
+<tr>
+<td>user_can_merge</td>
+<td>bool</td>
+<td>当前用户是否能合并</td>
+</tr>
+<tr>
+<td>commit_id</td>
+<td>string</td>
+<td>提交ID</td>
+</tr>
+<tr>
+<td>commit_time_from_now</td>
+<td>string</td>
+<td>分支最新提交时间距现在时间差</td>
+</tr>
+<tr>
+<td>commit_time</td>
+<td>string</td>
+<td>分支最新提交时间</td>
+</tr>
+<tr>
+<td>http_url</td>
+<td>string</td>
+<td>分支http地址</td>
+</tr>
+<tr>
+<td>zip_url</td>
+<td>string</td>
+<td>分支zip包下载地址</td>
+</tr>
+<tr>
+<td>tar_url</td>
+<td>string</td>
+<td>分支tar包下载地址</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"new_branch_8"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"80dd40214a58622312393b2ae693756a4781fab2"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"x拟增</span><span class="se">\n\n</span><span class="s2">Signed-off-by: yystopf &lt;yystopf@163.com&gt;"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"committer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1天前"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"timestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-13T09:54:15Z"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"user_can_push"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"user_can_merge"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"80dd40214a58622312393b2ae693756a4781fab2"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_time_from_now"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1天前"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-13T09:54:15Z"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"default_branch"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:10081/yystopf/ceshi_hook.git"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"zip_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000/api/yystopf/ceshi_hook/archive/new_branch_8.zip"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"tar_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:3000/api/yystopf/ceshi_hook/archive/new_branch_8.tar.gz"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='636c36d314'>仓库贡献者列表</h2>
+<p>仓库贡献者列表</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/yystopf/csfjkkj/contributors.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/contributors.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
+<p><code>GET /api/:owner/:repo/contributors.json</code></p>
+<h3 id='2eb6f47757-7'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-7'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
 <td>list.contributions</td>
 <td>int</td>
 <td>贡献者commit数量</td>
@@ -7986,9 +8199,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/yystopf/csfjkkj/languages.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/languages.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/languages.json</code></p>
-<h3 id='2eb6f47757-7'>请求参数:</h3>
+<h3 id='2eb6f47757-8'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8013,7 +8226,7 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-7'>返回字段说明:</h3>
+<h3 id='7447e4874e-8'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8050,9 +8263,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/jasder/jasder_test/edit.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/edit.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/edit.json</code></p>
-<h3 id='2eb6f47757-8'>请求参数:</h3>
+<h3 id='2eb6f47757-9'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8077,7 +8290,7 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-8'>返回字段说明:</h3>
+<h3 id='7447e4874e-9'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8154,9 +8367,9 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <span class="nt">-d</span> <span class="s2">"private=true"</span> <span class="se">\</span>
 http://localhost:3000/api/jasder/jasder_test.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/jasder/jasder_test.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
 <p><code>PATCH /api/:owner/:repo</code></p>
-<h3 id='2eb6f47757-9'>请求参数:</h3>
+<h3 id='2eb6f47757-10'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8216,7 +8429,7 @@ http://localhost:3000/api/jasder/jasder_test.json
 <td>项目是否私有, true：为私有，false: 公开，默认为公开</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-9'>返回字段说明:</h3>
+<h3 id='7447e4874e-10'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8281,9 +8494,9 @@ http://localhost:3000/api/jasder/jasder_test.json
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE http://localhost:3000/api/jasder/jasder_test.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/jasder/jasder_test.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
 <p><code>PATCH /api/:owner/:repo</code></p>
-<h3 id='2eb6f47757-10'>请求参数:</h3>
+<h3 id='2eb6f47757-11'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8308,7 +8521,7 @@ http://localhost:3000/api/jasder/jasder_test.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-10'>返回字段说明:</h3>
+<h3 id='7447e4874e-11'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8349,83 +8562,8 @@ http://localhost:3000/api/jasder/jasder_test.json
 <span class="nt">-d</span> <span class="s2">"user_id=12"</span> <span class="se">\</span>
 http://localhost:3000/api/jasder/jasder_test/collaborators.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/jasder/jasder_test/collaborators.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
-<p><code>POST /api/:owner/:repo/collaborators.json</code></p>
-<h3 id='2eb6f47757-11'>请求参数:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>必选</th>
-<th>默认</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>owner</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>用户登录名</td>
-</tr>
-<tr>
-<td>repo</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>项目标识identifier</td>
-</tr>
-<tr>
-<td>user_id</td>
-<td>是</td>
-<td>int</td>
-<td></td>
-<td>用户id</td>
-</tr>
-</tbody></table>
-<h3 id='7447e4874e-11'>返回字段说明:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>status</td>
-<td>int</td>
-<td>返回状态， 0: 表示操作成功</td>
-</tr>
-<tr>
-<td>message</td>
-<td>string</td>
-<td>返回信息说明</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>返回的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-  </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div>
-<aside class="warning">
-  只有平台管理员和项目管理员才能添加仓库成员.
-</aside>
-<h2 id='c25af9423c'>删除仓库成员</h2>
-<p>仓库中删除成员操作</p>
-
-<blockquote>
-<p>示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
-<span class="nt">-d</span> <span class="s2">"user_id=12"</span> <span class="se">\</span>
-http://localhost:3000/api/jasder/jasder_test/collaborators.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/jasder/jasder_test/collaborators.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-12'>HTTP 请求</h3>
-<p><code>DELETE /api/:owner/:repo/collaborators.json</code></p>
+<p><code>POST /api/:owner/:repo/collaborators.json</code></p>
 <h3 id='2eb6f47757-12'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -8478,6 +8616,81 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 </tr>
 </tbody></table>
 
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+  </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="warning">
+  只有平台管理员和项目管理员才能添加仓库成员.
+</aside>
+<h2 id='c25af9423c'>删除仓库成员</h2>
+<p>仓库中删除成员操作</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"user_id=12"</span> <span class="se">\</span>
+http://localhost:3000/api/jasder/jasder_test/collaborators.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/jasder/jasder_test/collaborators.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
+<p><code>DELETE /api/:owner/:repo/collaborators.json</code></p>
+<h3 id='2eb6f47757-13'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>user_id</td>
+<td>是</td>
+<td>int</td>
+<td></td>
+<td>用户id</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-13'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>status</td>
+<td>int</td>
+<td>返回状态， 0: 表示操作成功</td>
+</tr>
+<tr>
+<td>message</td>
+<td>string</td>
+<td>返回信息说明</td>
+</tr>
+</tbody></table>
+
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -8500,9 +8713,9 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 <span class="nt">-d</span> <span class="s2">"role=Developer"</span> <span class="se">\</span>
 http://localhost:3000/api/jasder/jasder_test/change_role.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PUT /api/jasder/jasder_test/change_role.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
 <p><code>PUT /api/:owner/:repo/change_role.json</code></p>
-<h3 id='2eb6f47757-13'>请求参数:</h3>
+<h3 id='2eb6f47757-14'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8541,7 +8754,7 @@ http://localhost:3000/api/jasder/jasder_test/change_role.json
 <td>取值范围：&quot;Manager&quot;, &quot;Developer&quot;, &quot;Reporter&quot;；分别为项目管理人员(拥有所有操作权限)、项目开发人员(只拥有读写权限)、项目报告人员(只拥有读权限)</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-13'>返回字段说明:</h3>
+<h3 id='7447e4874e-14'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8583,9 +8796,9 @@ http://localhost:3000/api/jasder/jasder_test/change_role.json
 <span class="nt">-d</span> <span class="s2">"limit=5"</span> <span class="se">\</span>
 http://localhost:3000/api/jasder/jasder_test/collaborators.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/collaborators.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/collaborators.json</code></p>
-<h3 id='2eb6f47757-14'>请求参数:</h3>
+<h3 id='2eb6f47757-15'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8624,7 +8837,7 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 <td>每页多少条数据，默认15条</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-14'>返回字段说明:</h3>
+<h3 id='7447e4874e-15'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8712,9 +8925,9 @@ http://localhost:3000/api/jasder/jasder_test/collaborators.json
 <span class="nt">-d</span> <span class="s2">"ref=develop"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/ceshi/files.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/ceshi/files.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-16'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/files</code></p>
-<h3 id='2eb6f47757-15'>请求参数:</h3>
+<h3 id='2eb6f47757-16'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8753,7 +8966,7 @@ http://localhost:3000/api/yystopf/ceshi/files.json
 <td>分支名，默认为仓库默认分支</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-15'>返回字段说明:</h3>
+<h3 id='7447e4874e-16'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8835,9 +9048,9 @@ http://localhost:3000/api/yystopf/ceshi/files.json
 <span class="nt">-d</span> <span class="s2">"ref=develop"</span> <span class="se">\</span>
 http://localhost:3000//api/jasder/jasder_test/entries.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/entries.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-16'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/entries.json</code></p>
-<h3 id='2eb6f47757-16'>请求参数:</h3>
+<h3 id='2eb6f47757-17'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8869,7 +9082,7 @@ http://localhost:3000//api/jasder/jasder_test/entries.json
 <td>分支名称、tag名称或是提交记录id，默认为master分支</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-16'>返回字段说明:</h3>
+<h3 id='7447e4874e-17'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -8983,9 +9196,9 @@ http://localhost:3000//api/jasder/jasder_test/entries.json
 <span class="nt">-d</span> <span class="s2">"filepath=file"</span> <span class="se">\</span>
 http://localhost:3000//api/jasder/jasder_test/sub_entries.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/sub_entries.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/sub_entries.json</code></p>
-<h3 id='2eb6f47757-17'>请求参数:</h3>
+<h3 id='2eb6f47757-18'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9024,7 +9237,7 @@ http://localhost:3000//api/jasder/jasder_test/sub_entries.json
 <td>分支名称、tag名称或是提交记录id，默认为master分支</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-17'>返回字段说明:</h3>
+<h3 id='7447e4874e-18'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9121,9 +9334,9 @@ http://localhost:3000//api/jasder/jasder_test/sub_entries.json
 <span class="nt">-d</span> <span class="s2">"filepath=lib"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/csfjkkj/readme.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/readme.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-19'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/readme.json</code></p>
-<h3 id='2eb6f47757-18'>请求参数:</h3>
+<h3 id='2eb6f47757-19'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9162,7 +9375,7 @@ http://localhost:3000/api/yystopf/csfjkkj/readme.json
 <td>子目录名称，默认为空</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-18'>返回字段说明:</h3>
+<h3 id='7447e4874e-19'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9234,9 +9447,9 @@ http://localhost:3000/api/yystopf/csfjkkj/readme.json
 <span class="nt">-d</span> <span class="s2">"filepath=lib"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/contributors.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-19'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/contributors.json</code></p>
-<h3 id='2eb6f47757-19'>请求参数:</h3>
+<h3 id='2eb6f47757-20'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9275,7 +9488,7 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 <td>子目录名称，默认为空</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-19'>返回字段说明:</h3>
+<h3 id='7447e4874e-20'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9350,9 +9563,9 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-20'>请求参数:</h3>
+<h3 id='2eb6f47757-21'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9377,7 +9590,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-20'>返回字段说明:</h3>
+<h3 id='7447e4874e-21'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9470,9 +9683,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-21'>请求参数:</h3>
+<h3 id='2eb6f47757-22'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9504,7 +9717,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-21'>返回字段说明:</h3>
+<h3 id='7447e4874e-22'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9627,214 +9840,8 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
-<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-22'>请求参数:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>必选</th>
-<th>默认</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>owner</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>用户登录名</td>
-</tr>
-<tr>
-<td>repo</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>项目标识identifier</td>
-</tr>
-<tr>
-<td>webhook.url</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>目标url</td>
-</tr>
-<tr>
-<td>webhook.http_method</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>http方法, POST和GET</td>
-</tr>
-<tr>
-<td>webhook.content_type</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>webhook.secret</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>密钥文本</td>
-</tr>
-<tr>
-<td>webhook.active</td>
-<td>是</td>
-<td></td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>webhook.branch_filter</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>分支过滤</td>
-</tr>
-<tr>
-<td>webhook.events</td>
-<td>否</td>
-<td></td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-</tbody></table>
-
-<p>触发事件字段说明 </p>
-
-<table><thead>
-<tr>
-<th>参数</th>
-<th>含义</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>create</td>
-<td>创建分支或标签</td>
-</tr>
-<tr>
-<td>delete</td>
-<td>分支或标签删除</td>
-</tr>
-<tr>
-<td>push</td>
-<td>git仓库推送</td>
-</tr>
-<tr>
-<td>pull_request</td>
-<td>合并请求</td>
-</tr>
-<tr>
-<td>pull_request_assign</td>
-<td>合并请求被指派</td>
-</tr>
-<tr>
-<td>pull_request_review_approved</td>
-<td>合并请求被批准</td>
-</tr>
-<tr>
-<td>pull_request_review_rejected</td>
-<td>合并请求被拒绝</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>请求的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-22'>返回字段说明:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>id</td>
-<td>int</td>
-<td>id</td>
-</tr>
-<tr>
-<td>url</td>
-<td>string</td>
-<td>地址</td>
-</tr>
-<tr>
-<td>content_type</td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>is_active</td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>type</td>
-<td>string</td>
-<td>类型</td>
-</tr>
-<tr>
-<td>events</td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-<tr>
-<td>create_time</td>
-<td>string</td>
-<td>创建时间</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>返回的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
-    </span><span class="p">],</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div>
-<aside class="success">
-  Success Data.
-</aside>
-<h2 id='webhook-3'>更新仓库webhook</h2>
-<p>更新仓库webhook</p>
-
-<blockquote>
-<p>示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
-http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-23'>HTTP 请求</h3>
-<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
 <h3 id='2eb6f47757-23'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -9860,13 +9867,6 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>项目标识identifier</td>
 </tr>
 <tr>
-<td>id</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>webhook id</td>
-</tr>
-<tr>
 <td>webhook.url</td>
 <td>是</td>
 <td></td>
@@ -9968,6 +9968,219 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h3 id='7447e4874e-23'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>id</td>
+</tr>
+<tr>
+<td>url</td>
+<td>string</td>
+<td>地址</td>
+</tr>
+<tr>
+<td>content_type</td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>is_active</td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>type</td>
+<td>string</td>
+<td>类型</td>
+</tr>
+<tr>
+<td>events</td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+<tr>
+<td>create_time</td>
+<td>string</td>
+<td>创建时间</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='webhook-3'>更新仓库webhook</h2>
+<p>更新仓库webhook</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
+<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<h3 id='2eb6f47757-24'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>id</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>webhook id</td>
+</tr>
+<tr>
+<td>webhook.url</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>目标url</td>
+</tr>
+<tr>
+<td>webhook.http_method</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>http方法, POST和GET</td>
+</tr>
+<tr>
+<td>webhook.content_type</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>webhook.secret</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>密钥文本</td>
+</tr>
+<tr>
+<td>webhook.active</td>
+<td>是</td>
+<td></td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>webhook.branch_filter</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>分支过滤</td>
+</tr>
+<tr>
+<td>webhook.events</td>
+<td>否</td>
+<td></td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+</tbody></table>
+
+<p>触发事件字段说明 </p>
+
+<table><thead>
+<tr>
+<th>参数</th>
+<th>含义</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>create</td>
+<td>创建分支或标签</td>
+</tr>
+<tr>
+<td>delete</td>
+<td>分支或标签删除</td>
+</tr>
+<tr>
+<td>push</td>
+<td>git仓库推送</td>
+</tr>
+<tr>
+<td>pull_request</td>
+<td>合并请求</td>
+</tr>
+<tr>
+<td>pull_request_assign</td>
+<td>合并请求被指派</td>
+</tr>
+<tr>
+<td>pull_request_review_approved</td>
+<td>合并请求被批准</td>
+</tr>
+<tr>
+<td>pull_request_review_rejected</td>
+<td>合并请求被拒绝</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h3 id='7447e4874e-24'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -10002,9 +10215,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
 <p><code>DELETE /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-24'>请求参数:</h3>
+<h3 id='2eb6f47757-25'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10036,7 +10249,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>webhook id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-24'>返回字段说明:</h3>
+<h3 id='7447e4874e-25'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -10057,9 +10270,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3/hooktasks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id/hooktasks.json</code></p>
-<h3 id='2eb6f47757-25'>请求参数:</h3>
+<h3 id='2eb6f47757-26'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10091,7 +10304,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-25'>返回字段说明:</h3>
+<h3 id='7447e4874e-26'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10328,9 +10541,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks/3/tests.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/webhooks/:id/tests.json</code></p>
-<h3 id='2eb6f47757-26'>请求参数:</h3>
+<h3 id='2eb6f47757-27'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10362,7 +10575,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-26'>返回字段说明:</h3>
+<h3 id='7447e4874e-27'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>

From 0dd062ce1c294f34b653bd0ebe971b3aad728481 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 15 Jul 2022 17:03:18 +0800
Subject: [PATCH 103/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20blobs=E5=92=8C?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=A0=91=E6=8E=A5=E5=8F=A3=E5=8F=8A=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/base_controller.rb     |   7 +
 .../api/v1/projects/git_controller.rb         |  12 +
 .../slate/source/includes/_repositories.md    | 116 ++++++-
 .../api/v1/projects/git/blobs_service.rb      |  30 ++
 .../api/v1/projects/git/trees_service.rb      |  50 +++
 .../api/v1/projects/git/blobs.json.jbuilder   |   4 +
 .../api/v1/projects/git/trees.json.jbuilder   |   9 +
 config/routes/api.rb                          |   2 +
 public/docs/api.html                          | 286 ++++++++++++++++--
 9 files changed, 483 insertions(+), 33 deletions(-)
 create mode 100644 app/controllers/api/v1/projects/git_controller.rb
 create mode 100644 app/services/api/v1/projects/git/blobs_service.rb
 create mode 100644 app/services/api/v1/projects/git/trees_service.rb
 create mode 100644 app/views/api/v1/projects/git/blobs.json.jbuilder
 create mode 100644 app/views/api/v1/projects/git/trees.json.jbuilder

diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index 9832ee11..a66bfc52 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -19,6 +19,13 @@ class Api::V1::BaseController < ApplicationController
   #     User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
   #   end
   # end
+  
+  def limit
+    params.fetch(:limit, 15) 
+  end
+  def page 
+    params.fetch(:page, 1)
+  end
 
   # 具有对仓库的管理权限
   def require_manager_above
diff --git a/app/controllers/api/v1/projects/git_controller.rb b/app/controllers/api/v1/projects/git_controller.rb
new file mode 100644
index 00000000..f30dce1a
--- /dev/null
+++ b/app/controllers/api/v1/projects/git_controller.rb
@@ -0,0 +1,12 @@
+class Api::V1::Projects::GitController < Api::V1::BaseController 
+  before_action :require_public_and_member_above, only: [:trees, :blobs] 
+
+  def trees 
+    @result_object = Api::V1::Projects::Git::TreesService.call(@project, params[:sha], {recursive: params[:recursive], page: page, limit: limit}, current_user&.gitea_token)
+  end
+
+  def blobs 
+    @result_object = Api::V1::Projects::Git::BlobsService.call(@project, params[:sha], current_user&.gitea_token)
+  end
+
+end
\ No newline at end of file
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index 624afd5b..7da740ef 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -472,7 +472,10 @@ await octokit.request('GET /api/v1/yystopf/csfjkkj/branches/all.json')
 > 示例:
 
 ```shell
-curl -X POST http://localhost:3000/api/v1/yystopf/csfjkkj/branches.json
+curl -X POST \
+-d "new_branch_name=ceshi_branch_1" \
+-d "old_branch_name=master" \
+http://localhost:3000/api/v1/yystopf/csfjkkj/branches.json
 ```
 
 ```javascript
@@ -487,8 +490,8 @@ await octokit.request('POST /api/v1/yystopf/csfjkkj/branches.json')
 --------- | ------- | ------- | -------- | ----------
 |owner             |是| |string |用户登录名  |
 |repo             |是| |string |项目标识identifier  |
-|new_branch_name|是｜｜string| 新分支名称|
-|old_branch_name|否｜|string| 来源分支名称|
+|new_branch_name|是||string| 新分支名称|
+|old_branch_name|否||string| 来源分支名称|
 
 ### 返回字段说明:
 参数  | 类型 | 字段说明
@@ -1303,6 +1306,113 @@ await octokit.request('GET /api/yystopf/csfjkkj/readme.json')
   Success Data.
 </aside>
 
+
+## 获取文件树列表
+根据分支、标签、commit ID获取仓库文件树列表
+
+> 示例:
+
+```shell
+curl -X GET \
+-d "recursive=true" \
+-d "page=1" \
+-d "limit=1" \
+http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae693756a4781fab2.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae693756a4781fab2.json')
+```
+
+### HTTP 请求
+`GET /api/v1/:owner/:repo/git/trees/:sha.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner    |是|  | string |用户登录名  |
+|repo     |是|  | string |项目标识identifier  |
+|sha      |是|  | string |分支名称、tag名称或是提交记录id  |
+|recursive|否|  | bool   |是否显示目录|
+|page     |否|1 | int    |页码|
+|limit    |否|15| int    |分页个数|
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|total_count    |int      |文件树数量|
+|sha            |string   |查询分支、标签、commit_id最后一次提交的ID |
+|entries.name   |string   |文件树名称|
+|entries.mode   |string   |文件树权限|
+|entries.type   |string   |文件树类型， file：文件，dir: 文件夹|
+|entries.size   |int      |文件树大小|
+|entries.sha    |string   |文件树commit_ID|
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 13,
+    "sha": "80dd40214a58622312393b2ae693756a4781fab2",
+    "entries": [
+        {
+            "name": "README.md",
+            "mode": "100644",
+            "type": "file",
+            "size": 14,
+            "sha": "b2f7b457fd8ca55f2274032cbb2abcb7dd8cd57e"
+        }
+    ]
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
+
+## 获取仓库blobs内容
+根据commit ID获取仓库blobs内容
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/v1/yystopf/csfjkkj/git/blobs/80dd40214a58622312393b2ae693756a4781fab2.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/yystopf/csfjkkj/git/blobs/80dd40214a58622312393b2ae693756a4781fab2.json')
+```
+
+### HTTP 请求
+`GET /api/v1/:owner/:repo/git/blobs/:sha.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner|是|  | string |用户登录名  |
+|repo |是|  | string |项目标识identifier  |
+|sha  |是|  | string |提交记录id  |
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|sha            |string   |提交ID |
+|size           |int      |blobs大小|
+|encoding       |string   |内容编码模式|
+|content        |string   |blobs内容|
+
+> 返回的JSON示例:
+
+```json
+{
+    "sha": "80dd40214a58622312393b2ae693756a4781fab2",
+    "size": 247,
+    "encoding": "base64",
+    "content": "dHJlZSAyN2JjYjI2ZDQ5YmU1M2RmOGZmYTk5NDc3MjRkYmI3YzIzZWI4MjY4CnBhcmVudCA3ZTRkOGJiM2MyOGUyNGQ0Y2Q2YjIwNWYyZWVkMzI1MTNlOTM3NTI0CmF1dGhvciB5eXN0b3BmIDx5eXN0b3BmQDE2My5jb20+IDE2NTc3MDYwNTUgKzAwMDAKY29tbWl0dGVyIHl5c3RvcGYgPHl5c3RvcGZAMTYzLmNvbT4gMTY1NzcwNjA1NSArMDAwMAoKeOaLn+WingoKU2lnbmVkLW9mZi1ieTogeXlzdG9wZiA8eXlzdG9wZkAxNjMuY29tPg=="
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
+
 ## 获取仓库贡献者
 获取仓库贡献者
 
diff --git a/app/services/api/v1/projects/git/blobs_service.rb b/app/services/api/v1/projects/git/blobs_service.rb
new file mode 100644
index 00000000..0b197c10
--- /dev/null
+++ b/app/services/api/v1/projects/git/blobs_service.rb
@@ -0,0 +1,30 @@
+class Api::V1::Projects::Git::BlobsService < ApplicationService 
+  include ActiveModel::Model
+
+  attr_accessor :project, :sha, :token, :owner, :repo 
+  attr_accessor :gitea_data 
+
+  validates :sha, presence: :true
+
+
+  def initialize(project, sha, token=nil) 
+    @project = project 
+    @owner = project&.owner.login 
+    @repo = project&.identifier 
+    @sha = sha
+    @token = token
+  end
+
+  def call 
+    $gitea_client.token = token unless token.blank? 
+    load_gitea_data 
+
+    $gitea_client.token = nil unless token.blank? 
+    gitea_data
+  end
+
+  private 
+  def load_gitea_data
+    @gitea_data = $gitea_client.get_repos_git_blobs_by_owner_repo_sha(owner, repo, sha)
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/git/trees_service.rb b/app/services/api/v1/projects/git/trees_service.rb
new file mode 100644
index 00000000..2a72c11a
--- /dev/null
+++ b/app/services/api/v1/projects/git/trees_service.rb
@@ -0,0 +1,50 @@
+class Api::V1::Projects::Git::TreesService < ApplicationService 
+  include ActiveModel::Model
+
+  attr_accessor :project, :token, :sha, :recursive, :page, :limit, :owner, :repo 
+  attr_accessor :gitea_data 
+  
+  validates :sha, presence: :true
+  validates :recursive, inclusion: {in: [nil, '', true, false]}
+
+  def initialize(project, sha, params, token=nil) 
+    @project = project 
+    @owner = project&.owner.login 
+    @repo = project&.identifier 
+    @token = token
+    @sha = sha
+    @recursive = params[:recursive]
+    @page = params[:page] || 1
+    @limit = params[:limit] || 15
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(", ") unless valid?
+    $gitea_client.token = token unless token.blank? 
+    load_gitea_data 
+
+    $gitea_client.token = nil unless token.blank? 
+    gitea_data
+  end
+
+  private 
+  def request_query 
+    if recursive.present? 
+      {
+        recursive: recursive,
+        page: page,
+        per_page: limit
+      }
+    else 
+      {
+        page: page,
+        per_page: limit
+      }
+    end
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_client.get_repos_git_trees_by_owner_repo_sha(owner, repo, sha, {query: request_query})
+    raise Error, '获取文件树列表失败！' unless @gitea_data.is_a?(Hash)
+  end
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/git/blobs.json.jbuilder b/app/views/api/v1/projects/git/blobs.json.jbuilder
new file mode 100644
index 00000000..e5397e92
--- /dev/null
+++ b/app/views/api/v1/projects/git/blobs.json.jbuilder
@@ -0,0 +1,4 @@
+json.sha @result_object['sha']
+json.size @result_object['size']
+json.encoding @result_object['encoding']
+json.content @result_object['content']
\ No newline at end of file
diff --git a/app/views/api/v1/projects/git/trees.json.jbuilder b/app/views/api/v1/projects/git/trees.json.jbuilder
new file mode 100644
index 00000000..0eb08f04
--- /dev/null
+++ b/app/views/api/v1/projects/git/trees.json.jbuilder
@@ -0,0 +1,9 @@
+json.total_count @result_object['total_count']
+json.sha @result_object['sha']
+json.entries @result_object['tree'].each do |entry|
+  json.name entry['path']
+  json.mode entry['mode']
+  json.type entry['type'] === 'blob' ? 'file' : 'dir'
+  json.size entry['size']
+  json.sha entry['sha']
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index c969302b..99684e6d 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -28,6 +28,8 @@ defaults format: :json do
                 get :all 
               end
             end
+            get '/git/blobs/:sha', to: 'git#blobs'
+            get '/git/trees/:sha', to: 'git#trees'
           end
         end
 
diff --git a/public/docs/api.html b/public/docs/api.html
index e9091591..6fedc946 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -547,6 +547,12 @@
                   <li>
                     <a href="#readme" class="toc-h2 toc-link" data-title="获取仓库README文件">获取仓库README文件</a>
                   </li>
+                  <li>
+                    <a href="#5d5002b291" class="toc-h2 toc-link" data-title="获取文件树列表">获取文件树列表</a>
+                  </li>
+                  <li>
+                    <a href="#blobs" class="toc-h2 toc-link" data-title="获取仓库blobs内容">获取仓库blobs内容</a>
+                  </li>
                   <li>
                     <a href="#28d27a81d5" class="toc-h2 toc-link" data-title="获取仓库贡献者">获取仓库贡献者</a>
                   </li>
@@ -7895,7 +7901,10 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 <blockquote>
 <p>示例:</p>
 </blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/v1/yystopf/csfjkkj/branches.json
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"new_branch_name=ceshi_branch_1"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"old_branch_name=master"</span> <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/csfjkkj/branches.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/csfjkkj/branches.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-6'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/branches.json</code></p>
@@ -7925,17 +7934,17 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
 </tr>
 <tr>
 <td>new_branch_name</td>
-<td>是｜｜string</td>
+<td>是</td>
+<td></td>
+<td>string</td>
 <td>新分支名称</td>
-<td></td>
-<td></td>
 </tr>
 <tr>
 <td>old_branch_name</td>
-<td>否｜</td>
+<td>否</td>
+<td></td>
 <td>string</td>
 <td>来源分支名称</td>
-<td></td>
 </tr>
 </tbody></table>
 <h3 id='7447e4874e-6'>返回字段说明:</h3>
@@ -9436,6 +9445,223 @@ http://localhost:3000/api/yystopf/csfjkkj/readme.json
 <aside class="success">
   Success Data.
 </aside>
+<h2 id='5d5002b291'>获取文件树列表</h2>
+<p>根据分支、标签、commit ID获取仓库文件树列表</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"recursive=true"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"page=1"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"limit=1"</span> <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae693756a4781fab2.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae693756a4781fab2.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
+<p><code>GET /api/v1/:owner/:repo/git/trees/:sha.json</code></p>
+<h3 id='2eb6f47757-20'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>sha</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>分支名称、tag名称或是提交记录id</td>
+</tr>
+<tr>
+<td>recursive</td>
+<td>否</td>
+<td></td>
+<td>bool</td>
+<td>是否显示目录</td>
+</tr>
+<tr>
+<td>page</td>
+<td>否</td>
+<td>1</td>
+<td>int</td>
+<td>页码</td>
+</tr>
+<tr>
+<td>limit</td>
+<td>否</td>
+<td>15</td>
+<td>int</td>
+<td>分页个数</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-20'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>total_count</td>
+<td>int</td>
+<td>文件树数量</td>
+</tr>
+<tr>
+<td>sha</td>
+<td>string</td>
+<td>查询分支、标签、commit_id最后一次提交的ID</td>
+</tr>
+<tr>
+<td>entries.name</td>
+<td>string</td>
+<td>文件树名称</td>
+</tr>
+<tr>
+<td>entries.mode</td>
+<td>string</td>
+<td>文件树权限</td>
+</tr>
+<tr>
+<td>entries.type</td>
+<td>string</td>
+<td>文件树类型， file：文件，dir: 文件夹</td>
+</tr>
+<tr>
+<td>entries.size</td>
+<td>int</td>
+<td>文件树大小</td>
+</tr>
+<tr>
+<td>entries.sha</td>
+<td>string</td>
+<td>文件树commit_ID</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">13</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"80dd40214a58622312393b2ae693756a4781fab2"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"entries"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"100644"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"file"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">14</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"b2f7b457fd8ca55f2274032cbb2abcb7dd8cd57e"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='blobs'>获取仓库blobs内容</h2>
+<p>根据commit ID获取仓库blobs内容</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/csfjkkj/git/blobs/80dd40214a58622312393b2ae693756a4781fab2.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/git/blobs/80dd40214a58622312393b2ae693756a4781fab2.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
+<p><code>GET /api/v1/:owner/:repo/git/blobs/:sha.json</code></p>
+<h3 id='2eb6f47757-21'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>sha</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>提交记录id</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-21'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>sha</td>
+<td>string</td>
+<td>提交ID</td>
+</tr>
+<tr>
+<td>size</td>
+<td>int</td>
+<td>blobs大小</td>
+</tr>
+<tr>
+<td>encoding</td>
+<td>string</td>
+<td>内容编码模式</td>
+</tr>
+<tr>
+<td>content</td>
+<td>string</td>
+<td>blobs内容</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"80dd40214a58622312393b2ae693756a4781fab2"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">247</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"encoding"</span><span class="p">:</span><span class="w"> </span><span class="s2">"base64"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"dHJlZSAyN2JjYjI2ZDQ5YmU1M2RmOGZmYTk5NDc3MjRkYmI3YzIzZWI4MjY4CnBhcmVudCA3ZTRkOGJiM2MyOGUyNGQ0Y2Q2YjIwNWYyZWVkMzI1MTNlOTM3NTI0CmF1dGhvciB5eXN0b3BmIDx5eXN0b3BmQDE2My5jb20+IDE2NTc3MDYwNTUgKzAwMDAKY29tbWl0dGVyIHl5c3RvcGYgPHl5c3RvcGZAMTYzLmNvbT4gMTY1NzcwNjA1NSArMDAwMAoKeOaLn+WingoKU2lnbmVkLW9mZi1ieTogeXlzdG9wZiA8eXlzdG9wZkAxNjMuY29tPg=="</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
 <h2 id='28d27a81d5'>获取仓库贡献者</h2>
 <p>获取仓库贡献者</p>
 
@@ -9447,9 +9673,9 @@ http://localhost:3000/api/yystopf/csfjkkj/readme.json
 <span class="nt">-d</span> <span class="s2">"filepath=lib"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/contributors.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/contributors.json</code></p>
-<h3 id='2eb6f47757-20'>请求参数:</h3>
+<h3 id='2eb6f47757-22'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9488,7 +9714,7 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 <td>子目录名称，默认为空</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-20'>返回字段说明:</h3>
+<h3 id='7447e4874e-22'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9563,9 +9789,9 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-23'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-21'>请求参数:</h3>
+<h3 id='2eb6f47757-23'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9590,7 +9816,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-21'>返回字段说明:</h3>
+<h3 id='7447e4874e-23'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9683,9 +9909,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-22'>请求参数:</h3>
+<h3 id='2eb6f47757-24'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9717,7 +9943,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-22'>返回字段说明:</h3>
+<h3 id='7447e4874e-24'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9840,9 +10066,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-23'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-23'>请求参数:</h3>
+<h3 id='2eb6f47757-25'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9967,7 +10193,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
     </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-23'>返回字段说明:</h3>
+</span></code></pre></div><h3 id='7447e4874e-25'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10046,9 +10272,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
 <p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
-<h3 id='2eb6f47757-24'>请求参数:</h3>
+<h3 id='2eb6f47757-26'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10180,7 +10406,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
     </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-24'>返回字段说明:</h3>
+</span></code></pre></div><h3 id='7447e4874e-26'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -10215,9 +10441,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
 <p><code>DELETE /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-25'>请求参数:</h3>
+<h3 id='2eb6f47757-27'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10249,7 +10475,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>webhook id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-25'>返回字段说明:</h3>
+<h3 id='7447e4874e-27'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -10270,9 +10496,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3/hooktasks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-28'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id/hooktasks.json</code></p>
-<h3 id='2eb6f47757-26'>请求参数:</h3>
+<h3 id='2eb6f47757-28'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10304,7 +10530,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-26'>返回字段说明:</h3>
+<h3 id='7447e4874e-28'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10541,9 +10767,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks/3/tests.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-29'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/webhooks/:id/tests.json</code></p>
-<h3 id='2eb6f47757-27'>请求参数:</h3>
+<h3 id='2eb6f47757-29'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10575,7 +10801,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-27'>返回字段说明:</h3>
+<h3 id='7447e4874e-29'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>

From ed0655452c1a00611cd95fd162d732e2e8902f32 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 11 Jul 2022 15:52:38 +0800
Subject: [PATCH 104/208] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=8Ewebhook?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E4=BB=93=E5=BA=93=E6=97=A5=E5=BF=97=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/commit_logs_controller.rb     | 23 +++++++++++++++++++
 app/models/commit_log.rb                      |  6 +++++
 config/routes.rb                              |  2 ++
 .../20220711061848_create_commit_logs.rb      | 17 ++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 app/controllers/commit_logs_controller.rb
 create mode 100644 app/models/commit_log.rb
 create mode 100644 db/migrate/20220711061848_create_commit_logs.rb

diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb
new file mode 100644
index 00000000..71eada87
--- /dev/null
+++ b/app/controllers/commit_logs_controller.rb
@@ -0,0 +1,23 @@
+class CommitLogsController < ApplicationController
+
+  def create
+    tip_exception "未认证" unless params[:token].to_s == "7917908927b6f1b792f2027a08a8b24a2de42c1692c2fd45da0dee5cf90a5af5"
+    ref = params[:ref]
+    commit_id = params[:commits][0][:id]
+    message = params[:commits][0][:message]
+    user_name = params[:message][0][:committer][:username]
+    user_mail = params[:message][0][:committer][:email]
+    user = User.find_by(mail: user_mail)
+    user = User.find_by(login: user_name) if user.blank?
+
+    repository_id = params[:repository][:id]
+    repository_name = params[:repository][:name]
+    repository_full_name = params[:repository][:full_name]
+    project = Project.where(identifier: repository_name).where(user_id: user.id)&.first
+    project = Project.where(identifier: repository_name).where(gpid: repository_id)&.first if project.blank?
+    CommitLog.create(user: user, project: project, repository_id: repository_id,
+                     name: repository_name, full_name: repository_full_name,
+                     ref: ref, commit_id: commit_id, message: message)
+
+  end
+end
diff --git a/app/models/commit_log.rb b/app/models/commit_log.rb
new file mode 100644
index 00000000..9b51b063
--- /dev/null
+++ b/app/models/commit_log.rb
@@ -0,0 +1,6 @@
+class CommitLog < ApplicationRecord
+  belongs_to :user
+  belongs_to :project
+  belongs_to :repository
+
+end
diff --git a/config/routes.rb b/config/routes.rb
index 79b937b0..73e06ea5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -973,6 +973,8 @@ Rails.application.routes.draw do
   get 'oauth/get_code', to: 'oauth#get_code'
   get 'oauth/get_token_callback', to: 'oauth#get_token_callback'
 
+  resources :commit_logs, :only => [:create]
+
   root 'main#index'
 
 
diff --git a/db/migrate/20220711061848_create_commit_logs.rb b/db/migrate/20220711061848_create_commit_logs.rb
new file mode 100644
index 00000000..e0ef451a
--- /dev/null
+++ b/db/migrate/20220711061848_create_commit_logs.rb
@@ -0,0 +1,17 @@
+class CreateCommitLogs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :commit_logs do |t|
+      t.references :user
+      t.references :project
+      t.integer :repository_id
+      t.string :name
+      t.string :full_name
+      t.string :commit_id
+      t.string :ref
+      t.string :message
+      t.timestamps
+    end
+
+    add_index :commit_logs, :commit_id
+  end
+end

From 5fcf789e63c544eabd364f6976e570489cd39d0c Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Thu, 14 Jul 2022 15:21:42 +0800
Subject: [PATCH 105/208] =?UTF-8?q?fixed=20=E6=8F=90=E4=BA=A4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=AE=B0=E5=BD=95=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?,=E4=BB=93=E5=BA=93=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/commit_logs_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb
index 71eada87..1708b162 100644
--- a/app/controllers/commit_logs_controller.rb
+++ b/app/controllers/commit_logs_controller.rb
@@ -13,7 +13,9 @@ class CommitLogsController < ApplicationController
     repository_id = params[:repository][:id]
     repository_name = params[:repository][:name]
     repository_full_name = params[:repository][:full_name]
-    project = Project.where(identifier: repository_name).where(user_id: user.id)&.first
+    owner_name = repository_full_name.split("/")[0]
+    owner = User.find_by(login: owner_name)
+    project = Project.where(identifier: repository_name).where(user_id: owner&.id)&.first
     project = Project.where(identifier: repository_name).where(gpid: repository_id)&.first if project.blank?
     CommitLog.create(user: user, project: project, repository_id: repository_id,
                      name: repository_name, full_name: repository_full_name,

From 8dae15225e0cc5263516238d071ec0474aca1b10 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 11 Jul 2022 15:52:38 +0800
Subject: [PATCH 106/208] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile.lock                                  | 354 ++++++++++--------
 .../admins/dashboards_controller.rb           |  35 +-
 app/views/admins/dashboards/index.html.erb    | 266 +++----------
 3 files changed, 272 insertions(+), 383 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e27c504a..d675a072 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,69 +1,69 @@
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    aasm (5.0.6)
+    aasm (5.2.0)
       concurrent-ruby (~> 1.0)
-    actioncable (5.2.4.1)
-      actionpack (= 5.2.4.1)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.1)
-      actionview (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.1)
-      activesupport (= 5.2.4.1)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_decorator (1.3.2)
+    active_decorator (1.4.0)
       activesupport
-    activejob (5.2.4.1)
-      activesupport (= 5.2.4.1)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
       arel (>= 9.0)
-    activestorage (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.1)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     acts-as-taggable-on (6.5.0)
       activerecord (>= 5.0, < 6.1)
-    acts_as_list (0.9.19)
-      activerecord (>= 3.0)
-    addressable (2.7.0)
+    acts_as_list (1.0.4)
+      activerecord (>= 4.2)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ancestry (3.0.7)
-      activerecord (>= 3.2.0)
-    annotate (2.6.5)
+    ancestry (4.1.0)
+      activerecord (>= 5.2.6)
+    annotate (2.6.7)
       activerecord (>= 2.3.0)
-      rake (>= 0.8.7)
+      rake (~> 10.4.2, >= 10.4.2)
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
-    ast (2.4.0)
-    autoprefixer-rails (9.7.4)
-      execjs
-    awesome_print (1.8.0)
+    ast (2.4.2)
+    autoprefixer-rails (10.3.3.0)
+      execjs (~> 2)
+    awesome_print (1.9.2)
     axlsx (3.0.0.pre)
       htmlentities (~> 4.3, >= 4.3.4)
       mimemagic (~> 0.3)
@@ -72,40 +72,43 @@ GEM
     axlsx_rails (0.5.2)
       actionpack (>= 3.1)
       axlsx (>= 2.0.1)
-    backport (1.1.2)
-    benchmark (0.1.0)
+    backport (1.2.0)
+    benchmark (0.2.0)
     bindex (0.8.1)
-    bootsnap (1.4.6)
+    bootsnap (1.9.3)
       msgpack (~> 1.0)
     bootstrap (4.3.1)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
     builder (3.2.4)
-    bulk_insert (1.7.0)
+    bulk_insert (1.9.0)
       activerecord (>= 3.2.0)
-    capybara (3.15.1)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (3.3.1)
-    childprocess (3.0.0)
-    chinese_pinyin (1.0.2)
+    chartkick (4.1.2)
+    childprocess (4.1.0)
+    chinese_pinyin (1.1.0)
     chromedriver-helper (2.1.1)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
-    chunky_png (1.3.11)
-    concurrent-ruby (1.1.6)
-    connection_pool (2.2.2)
+    chunky_png (1.4.0)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     crass (1.0.6)
     deep_cloneable (3.0.0)
       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)
@@ -119,93 +122,103 @@ GEM
     elasticsearch-transport (7.5.0)
       faraday (>= 0.14, < 1)
       multi_json
-    enumerize (2.3.1)
+    enumerize (2.4.0)
       activesupport (>= 3.2)
-    erubi (1.9.0)
-    et-orbi (1.2.4)
+    erubi (1.10.0)
+    et-orbi (1.2.6)
       tzinfo
-    execjs (2.7.0)
+    execjs (2.8.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+    ffi (1.15.4)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
-    fugit (1.4.1)
+    fugit (1.5.2)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    gitea-client (0.9.2)
+      rest-client (~> 2.1.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
     grape-entity (0.7.1)
       activesupport (>= 4.0)
       multi_json (>= 1.3.2)
     groupdate (4.1.2)
       activesupport (>= 4.2)
     harmonious_dictionary (0.0.1)
-    hashie (3.6.0)
+    hashie (5.0.0)
     htmlentities (4.3.4)
-    i18n (1.8.2)
+    http-accept (1.7.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
     jaro_winkler (1.5.4)
-    jbuilder (2.10.0)
+    jbuilder (2.11.3)
       activesupport (>= 5.0.0)
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jwt (2.2.1)
-    kaminari (1.2.0)
+    jwt (2.3.0)
+    kaminari (1.2.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.0)
-      kaminari-activerecord (= 1.2.0)
-      kaminari-core (= 1.2.0)
-    kaminari-actionview (1.2.0)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
       actionview
-      kaminari-core (= 1.2.0)
-    kaminari-activerecord (1.2.0)
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
       activerecord
-      kaminari-core (= 1.2.0)
-    kaminari-core (1.2.0)
-    letter_avatar (0.3.8)
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
+    letter_avatar (0.3.9)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.4.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.2)
     maruku (0.7.3)
-    method_source (0.9.2)
-    mimemagic (0.3.10)
+    matrix (0.4.2)
+    method_source (1.0.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    msgpack (1.3.3)
-    multi_json (1.14.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    msgpack (1.4.2)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     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)
-    oauth2 (1.4.4)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-cas (1.1.1)
+    omniauth-cas (2.0.0)
       addressable (~> 2.3)
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
@@ -213,108 +226,112 @@ GEM
       oauth2 (~> 1.1)
       omniauth (~> 1.9)
     parallel (1.19.1)
-    parser (2.7.1.1)
-      ast (~> 2.4.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     pdfkit (0.8.4.1)
-    polyamorous (2.3.2)
-      activerecord (>= 5.2.1)
     popper_js (1.16.0)
-    powerpack (0.1.2)
-    prettier (0.18.2)
-    public_suffix (4.0.3)
-    puma (3.12.2)
+    powerpack (0.1.3)
+    prettier (2.0.0)
+    public_suffix (4.0.6)
+    puma (3.12.6)
     raabro (1.4.0)
-    rack (2.0.9)
+    racc (1.6.0)
+    rack (2.2.3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-mini-profiler (2.0.1)
+    rack-mini-profiler (2.3.3)
       rack (>= 1.2.0)
-    rack-protection (2.0.8.1)
+    rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.1)
-      actioncable (= 5.2.4.1)
-      actionmailer (= 5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
-      activestorage (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.1)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
-    railties (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    ransack (2.3.2)
-      activerecord (>= 5.2.1)
-      activesupport (>= 5.2.1)
+    rake (10.4.2)
+    ransack (2.4.2)
+      activerecord (>= 5.2.4)
+      activesupport (>= 5.2.4)
       i18n
-      polyamorous (= 2.3.2)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    redcarpet (3.5.0)
-    redis (4.1.3)
+    redcarpet (3.5.1)
+    redis (4.5.1)
     redis-actionpack (5.2.0)
       actionpack (>= 5, < 7)
       redis-rack (>= 2.1.0, < 3)
       redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.2.0)
+    redis-activesupport (5.2.1)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
-    redis-rack (2.1.2)
+    redis-rack (2.1.3)
       rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
       redis-activesupport (>= 5.0, < 6)
       redis-store (>= 1.2, < 2)
-    redis-store (1.8.2)
+    redis-store (1.9.0)
       redis (>= 4, < 5)
-    regexp_parser (1.7.0)
+    regexp_parser (2.2.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
+    rexml (3.2.5)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
     roo-xls (1.2.0)
       nokogiri
-      roo (>= 2.0.0, < 3)
+      roo (= 2.8.3)
       spreadsheet (> 0.9.0)
     rqrcode (0.10.1)
       chunky_png (~> 1.0)
     rqrcode_png (0.1.5)
       chunky_png
       rqrcode
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
+    rspec-rails (3.9.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -322,7 +339,7 @@ GEM
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.4)
     rubocop (0.52.1)
       parallel (~> 1.10)
       parser (>= 2.4.0.2, < 3.0)
@@ -331,8 +348,8 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-ole (1.2.12.2)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     ruby_dep (1.5.0)
     rubyzip (1.3.0)
     sass (3.7.4)
@@ -340,13 +357,13 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
+    sass-rails (5.1.0)
+      railties (>= 5.2.0)
       sass (~> 3.1)
       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)
@@ -354,31 +371,31 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    searchkick (3.1.3)
-      activemodel (>= 4.2)
-      elasticsearch (>= 5)
+    searchkick (4.6.3)
+      activemodel (>= 5)
+      elasticsearch (>= 6, < 7.14)
       hashie
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
-    sidekiq (5.2.8)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (< 2.1.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+    sidekiq (6.3.1)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
     sidekiq-cron (1.2.0)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
-    simple_form (5.0.2)
-      actionpack (>= 5.0)
-      activemodel (>= 5.0)
+    simple_form (5.1.0)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
     simple_xlsx_reader (1.0.4)
       nokogiri
       rubyzip
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
     solargraph (0.38.6)
       backport (~> 1.1)
@@ -394,43 +411,47 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9)
-    spreadsheet (1.2.6)
-      ruby-ole (>= 1.0)
-    spring (2.0.2)
-      activesupport (>= 4.2)
+    spreadsheet (1.3.0)
+      ruby-ole
+    spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    unicode-display_width (1.8.0)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    websocket-driver (0.7.1)
+    webrick (1.7.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    wkhtmltopdf-binary (0.12.5.4)
+    websocket-extensions (0.1.5)
+    wkhtmltopdf-binary (0.12.6.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.24)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
@@ -459,6 +480,7 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
+  gitea-client (~> 0.9.1)
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)
diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb
index 3971971f..0d88d044 100644
--- a/app/controllers/admins/dashboards_controller.rb
+++ b/app/controllers/admins/dashboards_controller.rb
@@ -1,10 +1,33 @@
 class Admins::DashboardsController < Admins::BaseController
   def index
-    @active_user_count = User.where(last_login_on: today).count
-    @weekly_active_user_count = User.where(last_login_on: current_week).count
-    @month_active_user_count = User.where(last_login_on: current_month).count
+    # 用户活跃数
+    day_user_ids = CommitLog.where(created_at: today).pluck(:project_id).uniq
+    weekly_user_ids = CommitLog.where(created_at: current_week).pluck(:project_id).uniq
+    month_user_ids = CommitLog.where(created_at: current_month).pluck(:project_id).uniq
+    @active_user_count = User.where(last_login_on: today).or(User.where(id: day_user_ids)).count
+    @weekly_active_user_count = User.where(last_login_on: current_week).or(User.where(id: weekly_user_ids)).count
+    @month_active_user_count = User.where(last_login_on: current_month).or(User.where(id: month_user_ids)).count
+    user_ids = User.where(created_on: pre_week).pluck(:id).uniq
+    weekly_keep_user_count = User.where(id: user_ids).where(last_login_on: current_week).count
+    @weekly_keep_rate = format("%.2f", weekly_keep_user_count > 0 ? weekly_keep_user_count / weekly_keep_user_count : 0)
 
-    @new_user_count = User.where(created_on: current_month).count
+    # 新用户注册数
+    @day_new_user_count = User.where(created_on: today).count
+    @weekly_new_user_count = User.where(created_on: current_week).count
+    @month_new_user_count = User.where(created_on: current_month).count
+
+    # 活跃项目数
+    day_project_ids = CommitLog.where(created_at: today).pluck(:project_id).uniq
+    weekly_project_ids = CommitLog.where(created_at: current_week).pluck(:project_id).uniq
+    month_project_ids = CommitLog.where(created_at: current_month).pluck(:project_id).uniq
+    @day_active_project_count = Project.where(updated_on: today).or(Project.where(id: day_project_ids)).count
+    @weekly_active_project_count = Project.where(updated_on: current_week).or(Project.where(id: weekly_project_ids)).count
+    @month_active_project_count = Project.where(updated_on: current_month).or(Project.where(id: month_project_ids)).count
+
+    # 新增项目数
+    @day_new_project_count = User.where(created_on: today).count
+    @weekly_new_project_count = User.where(created_on: current_week).count
+    @month_new_project_count = User.where(created_on: current_month).count
   end
 
   def month_active_user
@@ -48,4 +71,8 @@ class Admins::DashboardsController < Admins::BaseController
   def current_month
     30.days.ago.beginning_of_day..Time.now.end_of_day
   end
+
+  def pre_week
+    14.days.ago.beginning_of_day..7.days.ago.beginning_of_day
+  end
 end
\ No newline at end of file
diff --git a/app/views/admins/dashboards/index.html.erb b/app/views/admins/dashboards/index.html.erb
index e02c307a..649c0090 100644
--- a/app/views/admins/dashboards/index.html.erb
+++ b/app/views/admins/dashboards/index.html.erb
@@ -2,217 +2,57 @@
   <% add_admin_breadcrumb('概览', admins_path) %>
 <% end %>
 
-<div class="header bg-gradient-primary pb-8 pt-md-8">
-  <div class="container-fluid">
-    <div class="header-body">
-      <!-- Card stats -->
-      <div class="row">
-        <div class="col-xl-3 col-lg-6">
-          <div class="card card-stats mb-4 mb-xl-0">
-            <div class="card-body">
-              <div class="row">
-                <div class="col">
-                  <h5 class="card-title text-uppercase text-muted mb-0">当日活跃用户</h5>
-                  <span class="h2 font-weight-bold mb-0"><%= @active_user_count %></span>
-                </div>
-                <div class="col-auto">
-                  <div class="icon icon-shape rounded-circle shadow">
-                    <i class="fa fa-users"></i>
-                  </div>
-                </div>
-              </div>
-<!--              <p class="mt-3 mb-0 text-muted text-sm">-->
-<!--                <span class="text-success mr-2"><i class="fa fa-arrow-up"></i> 3.48%</span>-->
-<!--                <span class="text-nowrap">Since last month</span>-->
-<!--              </p>-->
-            </div>
-          </div>
-        </div>
-        <div class="col-xl-3 col-lg-6">
-          <div class="card card-stats mb-4 mb-xl-0">
-            <div class="card-body">
-              <div class="row">
-                <div class="col">
-                  <h5 class="card-title text-uppercase text-muted mb-0">7天内活跃用户数</h5>
-                  <span class="h2 font-weight-bold mb-0"><%= @weekly_active_user_count %></span>
-                </div>
-                <div class="col-auto">
-                  <div class="icon icon-shape rounded-circle shadow">
-                    <i class="fa fa-users"></i>
-                  </div>
-                </div>
-              </div>
-<!--              <p class="mt-3 mb-0 text-muted text-sm">-->
-<!--                <span class="text-danger mr-2"><i class="fas fa-arrow-down"></i> 3.48%</span>-->
-<!--                <span class="text-nowrap">Since last week</span>-->
-<!--              </p>-->
-            </div>
-          </div>
-        </div>
-        <div class="col-xl-3 col-lg-6">
-          <div class="card card-stats mb-4 mb-xl-0">
-            <div class="card-body">
-              <div class="row">
-                <div class="col">
-                  <h5 class="card-title text-uppercase text-muted mb-0">30天内活跃用户数</h5>
-                  <span class="h2 font-weight-bold mb-0"><%= @month_active_user_count %></span>
-                </div>
-                <div class="col-auto">
-                  <div class="icon icon-shape rounded-circle shadow">
-                    <i class="fa fa-users"></i>
-                  </div>
-                </div>
-              </div>
-<!--              <p class="mt-3 mb-0 text-muted text-sm">-->
-<!--                <span class="text-warning mr-2"><i class="fas fa-arrow-down"></i> 1.10%</span>-->
-<!--                <span class="text-nowrap">Since yesterday</span>-->
-<!--              </p>-->
-            </div>
-          </div>
-        </div>
-        <div class="col-xl-3 col-lg-6">
-          <div class="card card-stats mb-4 mb-xl-0">
-            <div class="card-body">
-              <div class="row">
-                <div class="col">
-                  <h5 class="card-title text-uppercase text-muted mb-0">30天内新增用户数</h5>
-                  <span class="h2 font-weight-bold mb-0"><%= @new_user_count %></span>
-                </div>
-                <div class="col-auto">
-                  <div class="icon icon-shape rounded-circle shadow">
-                    <i class="fa fa-user-plus"></i>
-                  </div>
-                </div>
-              </div>
-<!--              <p class="mt-3 mb-0 text-muted text-sm">-->
-<!--                <span class="text-success mr-2"><i class="fas fa-arrow-up"></i> 12%</span>-->
-<!--                <span class="text-nowrap">Since last month</span>-->
-<!--              </p>-->
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+<div class="box admin-list-container project-language-list-container">
+  <table class="table table-hover text-center subject-list-table">
+    <thead class="thead-light">
+    <tr>
+      <th width="20%">指标名称</th>
+      <th width="20%">当日数</th>
+      <th width="20%">七日内</th>
+      <th width="20%">30日内</th>
+      <th width="20%">周用户留存率</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr class="">
+      <td>
+        <button type="button" class="btn btn-primary" style="font-size:14px;width:85px;padding: 0; height:36px;background-color:#5475fb;border-radius:4px;border-color: #5475fb;">活跃用户</button>
+      </td>
+      <td><%=@active_user_count %></td>
+      <td><%=@weekly_active_user_count %></td>
+      <td><%=@month_active_user_count %></td>
+      <td><%="#{@weekly_keep_rate.to_f * 100 }%" %></td>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <button type="button" class="btn btn-primary" style="font-size:14px;width:85px;padding: 0; height:36px;background-color:#36cfc9;border-radius:4px; border-color: #36cfc9;">新注册用户</button>
+      </td>
+      <td><%=@day_new_user_count %></td>
+      <td><%=@weekly_new_user_count %></td>
+      <td><%=@month_new_user_count %></td>
+      <td><%="--" %></td>
+    </tr>
+    <tr>
+      <td>
+        <button type="button" class="btn btn-primary" style="font-size:14px;width:85px;padding: 0; height:36px;background-color:#f89422;border-radius:4px; border-color: #f89422;">活跃项目</button>
+      </td>
+      <td><%=@day_active_project_count %></td>
+      <td><%=@weekly_new_project_count %></td>
+      <td><%=@month_new_project_count %></td>
+      <td><%="--" %></td>
+    </tr>
+    <tr>
+      <td>
+        <button type="button" class="btn btn-primary" style="font-size:14px;width:85px;padding: 0; height:36px;background-color:#9d74ff;border-radius:4px; border-color: #9d74ff;">新注册项目</button>
+      </td>
+      <td><%=@day_new_project_count %></td>
+      <td><%=@weekly_new_user_count %></td>
+      <td><%=@month_new_user_count %></td>
+      <td><%="--" %></td>
+    </tr>
+    </tbody>
+  </table>
 </div>
-
-<div class="container-fluid mt--7 pie-statistic">
-  <div class="row mt-5">
-    <div class="col-xl-8 mb-5 mb-xl-0">
-      <div class="card shadow">
-<!--        <div class="card-header border-0">-->
-<!--          <div class="row align-items-center">-->
-<!--            <h5 class="mb-0">近7天评测次数</h5>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <div class="table-responsive">-->
-<!--          <div id="evaluate-pie" class="pie"></div>-->
-<!--        </div>-->
-      </div>
-    </div>
-
-    <div class="col-xl-4">
-      <div class="card shadow">
-        <div class="card-header border-0">
-          <div class="row align-items-center">
-            <h5 class="mb-0">30天内新增用户</h5>
-          </div>
-        </div>
-        <div class="table-responsive">
-          <div id="month-active-user" class="pie"></div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<!--<div class="container-fluid mt--7">-->
-<!--  <div class="row mt-5">-->
-<!--    <div class="col-xl-8 mb-5 mb-xl-0">-->
-<!--      <div class="card shadow">-->
-<!--        <div class="card-header border-0">-->
-<!--          <div class="row align-items-center">-->
-<!--            <div class="col">-->
-<!--              <h3 class="mb-0">Page visits</h3>-->
-<!--            </div>-->
-<!--            <div class="col text-right">-->
-<!--              <a href="#!" class="btn btn-sm btn-primary">Test</a>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <div class="table-responsive">-->
-<!--          <table class="table align-items-center table-flush">-->
-<!--            <thead class="thead-light">-->
-<!--            <tr>-->
-<!--              <th scope="col">Test</th>-->
-<!--              <th scope="col">Test</th>-->
-<!--              <th scope="col">Test</th>-->
-<!--              <th scope="col">Test</th>-->
-<!--            </tr>-->
-<!--            </thead>-->
-<!--            <tbody>-->
-              <%# 5.times do %>
-<!--                <tr>-->
-<!--                  <th scope="row">/test/</th>-->
-<!--                  <td>4,569</td>-->
-<!--                  <td>340</td>-->
-<!--                  <td>-->
-<!--                    <i class="fas fa-arrow-up text-success mr-3"></i> 46,53%-->
-<!--                  </td>-->
-<!--                </tr>-->
-              <%# end %>
-<!--            </tbody>-->
-<!--          </table>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
-<!--    <div class="col-xl-4">-->
-<!--      <div class="card shadow">-->
-<!--        <div class="card-header border-0">-->
-<!--          <div class="row align-items-center">-->
-<!--            <div class="col">-->
-<!--              <h3 class="mb-0">Test</h3>-->
-<!--            </div>-->
-<!--            <div class="col text-right">-->
-<!--              <a href="#!" class="btn btn-sm btn-primary">Test</a>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <div class="table-responsive">-->
-<!--          <table class="table align-items-center table-flush">-->
-<!--            <thead class="thead-light">-->
-<!--            <tr>-->
-<!--              <th scope="col">Test</th>-->
-<!--              <th scope="col">Test</th>-->
-<!--              <th scope="col"></th>-->
-<!--            </tr>-->
-<!--            </thead>-->
-<!--            <tbody>-->
-              <%# 5.times do %>
-<!--                <tr>-->
-<!--                  <th scope="row">-->
-<!--                    Test-->
-<!--                  </th>-->
-<!--                  <td>-->
-<!--                    1,480-->
-<!--                  </td>-->
-<!--                  <td>-->
-<!--                    <div class="d-flex align-items-center">-->
-<!--                      <span class="mr-2">60%</span>-->
-<!--                      <div>-->
-<!--                        <div class="progress">-->
-<!--                          <div class="progress-bar bg-gradient-danger" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"></div>-->
-<!--                        </div>-->
-<!--                      </div>-->
-<!--                    </div>-->
-<!--                  </td>-->
-<!--                </tr>-->
-              <%# end %>
-<!--            </tbody>-->
-<!--          </table>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
-<!--  </div>-->
-<!--</div>-->
\ No newline at end of file
+<div id="project-language-modals">
+</div>
\ No newline at end of file

From df7b91a8ba19fb09f7c0b2dc0871ad7acfe110b8 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 18 Jul 2022 10:38:45 +0800
Subject: [PATCH 107/208] gemfile.lock reset

---
 Gemfile.lock | 354 ++++++++++++++++++++++++---------------------------
 1 file changed, 166 insertions(+), 188 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d675a072..e27c504a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,69 +1,69 @@
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    aasm (5.2.0)
+    aasm (5.0.6)
       concurrent-ruby (~> 1.0)
-    actioncable (5.2.6)
-      actionpack (= 5.2.6)
+    actioncable (5.2.4.1)
+      actionpack (= 5.2.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
+    actionmailer (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
+    actionpack (5.2.4.1)
+      actionview (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
+    actionview (5.2.4.1)
+      activesupport (= 5.2.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_decorator (1.4.0)
+    active_decorator (1.3.2)
       activesupport
-    activejob (5.2.6)
-      activesupport (= 5.2.6)
+    activejob (5.2.4.1)
+      activesupport (= 5.2.4.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
+    activemodel (5.2.4.1)
+      activesupport (= 5.2.4.1)
+    activerecord (5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       arel (>= 9.0)
-    activestorage (5.2.6)
-      actionpack (= 5.2.6)
-      activerecord (= 5.2.6)
-      marcel (~> 1.0.0)
-    activesupport (5.2.6)
+    activestorage (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     acts-as-taggable-on (6.5.0)
       activerecord (>= 5.0, < 6.1)
-    acts_as_list (1.0.4)
-      activerecord (>= 4.2)
-    addressable (2.8.0)
+    acts_as_list (0.9.19)
+      activerecord (>= 3.0)
+    addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ancestry (4.1.0)
-      activerecord (>= 5.2.6)
-    annotate (2.6.7)
+    ancestry (3.0.7)
+      activerecord (>= 3.2.0)
+    annotate (2.6.5)
       activerecord (>= 2.3.0)
-      rake (~> 10.4.2, >= 10.4.2)
+      rake (>= 0.8.7)
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
-    ast (2.4.2)
-    autoprefixer-rails (10.3.3.0)
-      execjs (~> 2)
-    awesome_print (1.9.2)
+    ast (2.4.0)
+    autoprefixer-rails (9.7.4)
+      execjs
+    awesome_print (1.8.0)
     axlsx (3.0.0.pre)
       htmlentities (~> 4.3, >= 4.3.4)
       mimemagic (~> 0.3)
@@ -72,43 +72,40 @@ GEM
     axlsx_rails (0.5.2)
       actionpack (>= 3.1)
       axlsx (>= 2.0.1)
-    backport (1.2.0)
-    benchmark (0.2.0)
+    backport (1.1.2)
+    benchmark (0.1.0)
     bindex (0.8.1)
-    bootsnap (1.9.3)
+    bootsnap (1.4.6)
       msgpack (~> 1.0)
     bootstrap (4.3.1)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
     builder (3.2.4)
-    bulk_insert (1.9.0)
+    bulk_insert (1.7.0)
       activerecord (>= 3.2.0)
-    capybara (3.36.0)
+    capybara (3.15.1)
       addressable
-      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (>= 1.5, < 3.0)
+      regexp_parser (~> 1.2)
       xpath (~> 3.2)
-    chartkick (4.1.2)
-    childprocess (4.1.0)
-    chinese_pinyin (1.1.0)
+    chartkick (3.3.1)
+    childprocess (3.0.0)
+    chinese_pinyin (1.0.2)
     chromedriver-helper (2.1.1)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
-    chunky_png (1.4.0)
-    concurrent-ruby (1.1.9)
-    connection_pool (2.2.5)
+    chunky_png (1.3.11)
+    concurrent-ruby (1.1.6)
+    connection_pool (2.2.2)
     crass (1.0.6)
     deep_cloneable (3.0.0)
       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)
@@ -122,103 +119,93 @@ GEM
     elasticsearch-transport (7.5.0)
       faraday (>= 0.14, < 1)
       multi_json
-    enumerize (2.4.0)
+    enumerize (2.3.1)
       activesupport (>= 3.2)
-    erubi (1.10.0)
-    et-orbi (1.2.6)
+    erubi (1.9.0)
+    et-orbi (1.2.4)
       tzinfo
-    execjs (2.8.1)
+    execjs (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.15.4)
+    ffi (1.12.2)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
-    fugit (1.5.2)
+    fugit (1.4.1)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    gitea-client (0.9.2)
-      rest-client (~> 2.1.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
     grape-entity (0.7.1)
       activesupport (>= 4.0)
       multi_json (>= 1.3.2)
     groupdate (4.1.2)
       activesupport (>= 4.2)
     harmonious_dictionary (0.0.1)
-    hashie (5.0.0)
+    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.11)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
     jaro_winkler (1.5.4)
-    jbuilder (2.11.3)
+    jbuilder (2.10.0)
       activesupport (>= 5.0.0)
-    jquery-rails (4.4.0)
+    jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jwt (2.3.0)
-    kaminari (1.2.1)
+    jwt (2.2.1)
+    kaminari (1.2.0)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.1)
-      kaminari-activerecord (= 1.2.1)
-      kaminari-core (= 1.2.1)
-    kaminari-actionview (1.2.1)
+      kaminari-actionview (= 1.2.0)
+      kaminari-activerecord (= 1.2.0)
+      kaminari-core (= 1.2.0)
+    kaminari-actionview (1.2.0)
       actionview
-      kaminari-core (= 1.2.1)
-    kaminari-activerecord (1.2.1)
+      kaminari-core (= 1.2.0)
+    kaminari-activerecord (1.2.0)
       activerecord
-      kaminari-core (= 1.2.1)
-    kaminari-core (1.2.1)
-    letter_avatar (0.3.9)
+      kaminari-core (= 1.2.0)
+    kaminari-core (1.2.0)
+    letter_avatar (0.3.8)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.13.0)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.2)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     maruku (0.7.3)
-    matrix (0.4.2)
-    method_source (1.0.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mimemagic (0.4.3)
+    method_source (0.9.2)
+    mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
-    mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
-    msgpack (1.4.2)
-    multi_json (1.15.0)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    msgpack (1.3.3)
+    multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mysql2 (0.5.3)
-    netrc (0.11.0)
     nio4r (2.5.2)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
-      racc (~> 1.4)
-    oauth2 (1.4.7)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.1)
-      hashie (>= 3.4.6)
+    omniauth (1.9.0)
+      hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)
-    omniauth-cas (2.0.0)
+    omniauth-cas (1.1.1)
       addressable (~> 2.3)
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
@@ -226,112 +213,108 @@ GEM
       oauth2 (~> 1.1)
       omniauth (~> 1.9)
     parallel (1.19.1)
-    parser (2.7.2.0)
-      ast (~> 2.4.1)
+    parser (2.7.1.1)
+      ast (~> 2.4.0)
     pdfkit (0.8.4.1)
+    polyamorous (2.3.2)
+      activerecord (>= 5.2.1)
     popper_js (1.16.0)
-    powerpack (0.1.3)
-    prettier (2.0.0)
-    public_suffix (4.0.6)
-    puma (3.12.6)
+    powerpack (0.1.2)
+    prettier (0.18.2)
+    public_suffix (4.0.3)
+    puma (3.12.2)
     raabro (1.4.0)
-    racc (1.6.0)
-    rack (2.2.3)
+    rack (2.0.9)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-mini-profiler (2.3.3)
+    rack-mini-profiler (2.0.1)
       rack (>= 1.2.0)
-    rack-protection (2.1.0)
+    rack-protection (2.0.8.1)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.6)
-      actioncable (= 5.2.6)
-      actionmailer (= 5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
-      activemodel (= 5.2.6)
-      activerecord (= 5.2.6)
-      activestorage (= 5.2.6)
-      activesupport (= 5.2.6)
+    rails (5.2.4.1)
+      actioncable (= 5.2.4.1)
+      actionmailer (= 5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
+      activestorage (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.6)
+      railties (= 5.2.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
-    railties (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
+    railties (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (10.4.2)
-    ransack (2.4.2)
-      activerecord (>= 5.2.4)
-      activesupport (>= 5.2.4)
+    rake (13.0.1)
+    ransack (2.3.2)
+      activerecord (>= 5.2.1)
+      activesupport (>= 5.2.1)
       i18n
-    rb-fsevent (0.11.0)
+      polyamorous (= 2.3.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    redcarpet (3.5.1)
-    redis (4.5.1)
+    redcarpet (3.5.0)
+    redis (4.1.3)
     redis-actionpack (5.2.0)
       actionpack (>= 5, < 7)
       redis-rack (>= 2.1.0, < 3)
       redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.2.1)
+    redis-activesupport (5.2.0)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
-    redis-rack (2.1.3)
+    redis-rack (2.1.2)
       rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
       redis-activesupport (>= 5.0, < 6)
       redis-store (>= 1.2, < 2)
-    redis-store (1.9.0)
+    redis-store (1.8.2)
       redis (>= 4, < 5)
-    regexp_parser (2.2.0)
+    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
-    rexml (3.2.5)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
     roo-xls (1.2.0)
       nokogiri
-      roo (= 2.8.3)
+      roo (>= 2.0.0, < 3)
       spreadsheet (> 0.9.0)
     rqrcode (0.10.1)
       chunky_png (~> 1.0)
     rqrcode_png (0.1.5)
       chunky_png
       rqrcode
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.4)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (3.9.1)
+    rspec-rails (3.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -339,7 +322,7 @@ GEM
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
+    rspec-support (3.9.2)
     rubocop (0.52.1)
       parallel (~> 1.10)
       parser (>= 2.4.0.2, < 3.0)
@@ -348,8 +331,8 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-ole (1.2.12.2)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     ruby_dep (1.5.0)
     rubyzip (1.3.0)
     sass (3.7.4)
@@ -357,13 +340,13 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       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)
@@ -371,31 +354,31 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    searchkick (4.6.3)
-      activemodel (>= 5)
-      elasticsearch (>= 6, < 7.14)
+    searchkick (3.1.3)
+      activemodel (>= 4.2)
+      elasticsearch (>= 5)
       hashie
-    selenium-webdriver (4.1.0)
-      childprocess (>= 0.5, < 5.0)
-      rexml (~> 3.2, >= 3.2.5)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sidekiq (6.3.1)
-      connection_pool (>= 2.2.2)
-      rack (~> 2.0)
-      redis (>= 4.2.0)
+    sidekiq (5.2.8)
+      connection_pool (~> 2.2, >= 2.2.2)
+      rack (< 2.1.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.5, < 5)
     sidekiq-cron (1.2.0)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
-    simple_form (5.1.0)
-      actionpack (>= 5.2)
-      activemodel (>= 5.2)
+    simple_form (5.0.2)
+      actionpack (>= 5.0)
+      activemodel (>= 5.0)
     simple_xlsx_reader (1.0.4)
       nokogiri
       rubyzip
-    sinatra (2.1.0)
+    sinatra (2.0.8.1)
       mustermann (~> 1.0)
-      rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
     solargraph (0.38.6)
       backport (~> 1.1)
@@ -411,47 +394,43 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9)
-    spreadsheet (1.3.0)
-      ruby-ole
-    spring (2.1.1)
+    spreadsheet (1.2.6)
+      ruby-ole (>= 1.0)
+    spring (2.0.2)
+      activesupport (>= 4.2)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (1.1.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.9)
+    tzinfo (1.2.6)
       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.8.0)
+    unicode-display_width (1.6.1)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webrick (1.7.0)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    wkhtmltopdf-binary (0.12.6.5)
+    websocket-extensions (0.1.4)
+    wkhtmltopdf-binary (0.12.5.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.27)
-      webrick (~> 1.7.0)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -480,7 +459,6 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
-  gitea-client (~> 0.9.1)
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)

From b5dfd83527a6113bfea2e134bdd540775cbc5d31 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 18 Jul 2022 10:43:57 +0800
Subject: [PATCH 108/208] =?UTF-8?q?fix=20=E6=8F=90=E4=BA=A4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8F=90=E4=BA=A4=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/commit_logs_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb
index 1708b162..c02d199b 100644
--- a/app/controllers/commit_logs_controller.rb
+++ b/app/controllers/commit_logs_controller.rb
@@ -5,8 +5,8 @@ class CommitLogsController < ApplicationController
     ref = params[:ref]
     commit_id = params[:commits][0][:id]
     message = params[:commits][0][:message]
-    user_name = params[:message][0][:committer][:username]
-    user_mail = params[:message][0][:committer][:email]
+    user_name = params[:pusher][:login]
+    user_mail = params[:pusher][:email]
     user = User.find_by(mail: user_mail)
     user = User.find_by(login: user_name) if user.blank?
 

From d9a1d32ec8b63759d0e12d9a9706d514794e4a03 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 18 Jul 2022 10:55:41 +0800
Subject: [PATCH 109/208] =?UTF-8?q?fixed=20=E5=90=8E=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BC=98=E5=8C=96,=E5=91=A8=E5=AD=98=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb
index 0d88d044..3d86f161 100644
--- a/app/controllers/admins/dashboards_controller.rb
+++ b/app/controllers/admins/dashboards_controller.rb
@@ -9,7 +9,7 @@ class Admins::DashboardsController < Admins::BaseController
     @month_active_user_count = User.where(last_login_on: current_month).or(User.where(id: month_user_ids)).count
     user_ids = User.where(created_on: pre_week).pluck(:id).uniq
     weekly_keep_user_count = User.where(id: user_ids).where(last_login_on: current_week).count
-    @weekly_keep_rate = format("%.2f", weekly_keep_user_count > 0 ? weekly_keep_user_count / weekly_keep_user_count : 0)
+    @weekly_keep_rate = format("%.2f", user_ids.size > 0 ? weekly_keep_user_count / user_ids.size : 0)
 
     # 新用户注册数
     @day_new_user_count = User.where(created_on: today).count

From d9653e461eaa556b5f4646ee453fe9754c8e6989 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 18 Jul 2022 11:00:47 +0800
Subject: [PATCH 110/208] =?UTF-8?q?fixed=20=E5=90=8E=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BC=98=E5=8C=96,=E5=91=A8=E5=AD=98=E7=8E=87?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb
index 3d86f161..d9e25c66 100644
--- a/app/controllers/admins/dashboards_controller.rb
+++ b/app/controllers/admins/dashboards_controller.rb
@@ -9,7 +9,7 @@ class Admins::DashboardsController < Admins::BaseController
     @month_active_user_count = User.where(last_login_on: current_month).or(User.where(id: month_user_ids)).count
     user_ids = User.where(created_on: pre_week).pluck(:id).uniq
     weekly_keep_user_count = User.where(id: user_ids).where(last_login_on: current_week).count
-    @weekly_keep_rate = format("%.2f", user_ids.size > 0 ? weekly_keep_user_count / user_ids.size : 0)
+    @weekly_keep_rate = format("%.2f", user_ids.size > 0 ? weekly_keep_user_count.to_f / user_ids.size : 0)
 
     # 新用户注册数
     @day_new_user_count = User.where(created_on: today).count

From 3580a8653d0b80e56526357aa17b1f2972a1a24f Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 18 Jul 2022 11:04:57 +0800
Subject: [PATCH 111/208] =?UTF-8?q?fixed=20=E5=90=8E=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BC=98=E5=8C=96,=E6=96=B0=E5=A2=9E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/dashboards_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb
index d9e25c66..5ac1508d 100644
--- a/app/controllers/admins/dashboards_controller.rb
+++ b/app/controllers/admins/dashboards_controller.rb
@@ -25,9 +25,9 @@ class Admins::DashboardsController < Admins::BaseController
     @month_active_project_count = Project.where(updated_on: current_month).or(Project.where(id: month_project_ids)).count
 
     # 新增项目数
-    @day_new_project_count = User.where(created_on: today).count
-    @weekly_new_project_count = User.where(created_on: current_week).count
-    @month_new_project_count = User.where(created_on: current_month).count
+    @day_new_project_count = Project.where(created_on: today).count
+    @weekly_new_project_count = Project.where(created_on: current_week).count
+    @month_new_project_count = Project.where(created_on: current_month).count
   end
 
   def month_active_user

From 04b9e433826a8e19cb5874ed6fb32a95cf274886 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Mon, 18 Jul 2022 11:14:45 +0800
Subject: [PATCH 112/208] =?UTF-8?q?fixed=20=E5=90=8E=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BC=98=E5=8C=96,=E6=96=B0=E5=A2=9E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admins/dashboards/index.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/admins/dashboards/index.html.erb b/app/views/admins/dashboards/index.html.erb
index 649c0090..2d86b4b6 100644
--- a/app/views/admins/dashboards/index.html.erb
+++ b/app/views/admins/dashboards/index.html.erb
@@ -38,17 +38,17 @@
         <button type="button" class="btn btn-primary" style="font-size:14px;width:85px;padding: 0; height:36px;background-color:#f89422;border-radius:4px; border-color: #f89422;">活跃项目</button>
       </td>
       <td><%=@day_active_project_count %></td>
-      <td><%=@weekly_new_project_count %></td>
-      <td><%=@month_new_project_count %></td>
+      <td><%=@weekly_active_project_count %></td>
+      <td><%=@month_active_project_count %></td>
       <td><%="--" %></td>
     </tr>
     <tr>
       <td>
-        <button type="button" class="btn btn-primary" style="font-size:14px;width:85px;padding: 0; height:36px;background-color:#9d74ff;border-radius:4px; border-color: #9d74ff;">新注册项目</button>
+        <button type="button" class="btn btn-primary" style="font-size:14px;width:85px;padding: 0; height:36px;background-color:#9d74ff;border-radius:4px; border-color: #9d74ff;">新增项目</button>
       </td>
       <td><%=@day_new_project_count %></td>
-      <td><%=@weekly_new_user_count %></td>
-      <td><%=@month_new_user_count %></td>
+      <td><%=@weekly_new_project_count %></td>
+      <td><%=@month_new_project_count %></td>
       <td><%="--" %></td>
     </tr>
     </tbody>

From b248f770f1b870afb6e5380f3f1a753ec9684a63 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 18 Jul 2022 11:18:29 +0800
Subject: [PATCH 113/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8D=95=E4=B8=AA=E6=8F=90=E4=BA=A4=E7=9A=84blame?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BB=A5=E5=8F=8A=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/commits_controller.rb     |   8 +
 .../slate/source/includes/_repositories.md    | 164 +++++++---
 .../api/v1/projects/commits/diff_service.rb   |  31 ++
 .../v1/projects/commits/diff.json.jbuilder    |  40 +++
 config/routes/api.rb                          |   2 +
 public/docs/api.html                          | 279 +++++++++++++++---
 6 files changed, 444 insertions(+), 80 deletions(-)
 create mode 100644 app/controllers/api/v1/projects/commits_controller.rb
 create mode 100644 app/services/api/v1/projects/commits/diff_service.rb
 create mode 100644 app/views/api/v1/projects/commits/diff.json.jbuilder

diff --git a/app/controllers/api/v1/projects/commits_controller.rb b/app/controllers/api/v1/projects/commits_controller.rb
new file mode 100644
index 00000000..1e6c17be
--- /dev/null
+++ b/app/controllers/api/v1/projects/commits_controller.rb
@@ -0,0 +1,8 @@
+class Api::V1::Projects::CommitsController < Api::V1::BaseController 
+  before_action :require_public_and_member_above, only: [:diff]
+
+  def diff 
+    @result_object = Api::V1::Projects::Commits::DiffService.call(@project, params[:sha], current_user&.gitea_token)
+    puts @result_object
+  end
+end
\ No newline at end of file
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index 7da740ef..afd09932 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -1413,72 +1413,170 @@ await octokit.request('GET /api/v1/yystopf/csfjkkj/git/blobs/80dd40214a586223123
   Success Data.
 </aside>
 
-## 获取仓库贡献者
-获取仓库贡献者
+## 获取单个提交的blame信息
+根据commit ID获取blame信息
 
 > 示例:
 
 ```shell
-curl -X GET \
--d "ref=master" \
--d "filepath=lib" \
-http://localhost:3000/api/yystopf/csfjkkj/contributors.json
+curl -X GET http://localhost:3000/api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393b2ae693756a4781fab2/diff.json
 ```
 
 ```javascript
-await octokit.request('GET /api/yystopf/csfjkkj/contributors.json')
+await octokit.request('GET /api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393b2ae693756a4781fab2/diff.json')
 ```
 
 ### HTTP 请求
-`GET /api/:owner/:repo/contributors.json`
+`GET /api/v1/:owner/:repo/commits/:sha/diff.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
-|owner             |是| |string |用户登录名  |
-|repo             |是| |string |项目标识identifier  |
-|ref             |否| | string |分支名称、tag名称或是提交记录id，默认为整个仓库  |
-|filepath        |否| | string |子目录名称，默认为空 |
-
+|owner|是|  | string |用户登录名  |
+|repo |是|  | string |项目标识identifier  |
+|sha  |是|  | string |提交记录id  |
 ### 返回字段说明:
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
-|total_count    |integer|贡献者数量|
-|contributions  |integer|贡献数量|
-|login          |string |用户登录名 |
-|type           |string|用户类型 |
-|name           |string|用户昵称|
-|image_url      |string|用户头像|
+|file_nums|int|文件数量|
+|total_addition|int|新增行数|
+|total_deletion|int|删除行数|
+|files.name|string|文件名称|
+|files.oldname|string|文件修改前名称|
+|files.addition|int|文件新增行数|
+|files.deletion|int|文件删除行数|
+|files.type|int|文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制|
+|files.is_created|bool|是否为新建文件|
+|files.is_deleted|bool|是否为删除文件|
+|files.is_bin|bool|是否为二进制文件|
+|files.is_lfs_file|bool||
+|files.is_renamed|bool|是否重命名|
+|files.is_ambiguous|bool||
+|files.is_submodule|bool|是否为子模块|
+|files.sections.file_name|string|文件名称|
+|files.sections.name|string||
+|files.sections.lines.left_index|int||
+|files.sections.lines.right_index|int||
+|files.sections.lines.match|int||
+|files.sections.lines.type|int||
+|files.sections.lines.content|string||
+|files.sections.lines.section_path|string||
+|files.sections.lines.section_last_left_index|int||
+|files.sections.lines.section_last_right_index|int||
+|files.sections.lines.section_left_index|int||
+|files.sections.lines.section_right_index|int||
+|files.sections.lines.section_left_hunk_size|int||
+|files.sections.lines.section_right_hunk_size|int||
+
 
 
 > 返回的JSON示例:
 
 ```json
 {
-    "contributors": [
+    "file_nums": 2,
+    "total_addition": 2,
+    "total_deletion": 2,
+    "files": [
         {
-            "contributions": 5,
-            "login": "testforge2",
-            "type": "User",
-            "name": "testforge2",
-            "image_url": "system/lets/letter_avatars/2/T/236_177_85/120.png"
+            "name": "xinzeng3",
+            "oldname": "xinzeng3",
+            "addition": 1,
+            "deletion": 0,
+            "type": 1,
+            "is_created": true,
+            "is_deleted": false,
+            "is_bin": false,
+            "is_lfs_file": false,
+            "is_renamed": false,
+            "is_ambiguous": false,
+            "is_submodule": false,
+            "sections": [
+                {
+                    "file_name": "xinzeng3",
+                    "name": "",
+                    "lines": [
+                        {
+                            "left_index": 0,
+                            "right_index": 0,
+                            "match": 0,
+                            "type": 4,
+                            "content": "@@ -0,0 +1 @@",
+                            "section_path": "xinzeng3",
+                            "section_last_left_index": 0,
+                            "section_last_right_index": 0,
+                            "section_left_index": 0,
+                            "section_right_index": 1,
+                            "section_left_hunk_size": 0,
+                            "section_right_hunk_size": 0
+                        },
+                        {
+                            "left_index": 0,
+                            "right_index": 1,
+                            "match": -1,
+                            "type": 2,
+                            "content": "+1111122222"
+                        }
+                    ]
+                }
+            ],
+            "is_incomplete": false,
+            "is_incomplete_line_too_long": false,
+            "is_protected": false
         },
         {
-            "contributions": 79,
-            "login": "yystopf",
-            "type": "User",
-            "name": "yystopf",
-            "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+            "name": "xinzeng4",
+            "oldname": "xinzeng4",
+            "addition": 1,
+            "deletion": 0,
+            "type": 1,
+            "is_created": true,
+            "is_deleted": false,
+            "is_bin": false,
+            "is_lfs_file": false,
+            "is_renamed": false,
+            "is_ambiguous": false,
+            "is_submodule": false,
+            "sections": [
+                {
+                    "file_name": "xinzeng4",
+                    "name": "",
+                    "lines": [
+                        {
+                            "left_index": 0,
+                            "right_index": 0,
+                            "match": 0,
+                            "type": 4,
+                            "content": "@@ -0,0 +1 @@",
+                            "section_path": "xinzeng4",
+                            "section_last_left_index": 0,
+                            "section_last_right_index": 0,
+                            "section_left_index": 0,
+                            "section_right_index": 1,
+                            "section_left_hunk_size": 0,
+                            "section_right_hunk_size": 0
+                        },
+                        {
+                            "left_index": 0,
+                            "right_index": 1,
+                            "match": -1,
+                            "type": 2,
+                            "content": "+111112222"
+                        }
+                    ]
+                }
+            ],
+            "is_incomplete": false,
+            "is_incomplete_line_too_long": false,
+            "is_protected": false
         }
-    ],
-    "total_count": 2
+    ]
 }
 ```
 <aside class="success">
   Success Data.
 </aside>
 
-
 ## 获取仓库webhooks列表
 获取仓库webhooks列表
 
diff --git a/app/services/api/v1/projects/commits/diff_service.rb b/app/services/api/v1/projects/commits/diff_service.rb
new file mode 100644
index 00000000..8b12fc31
--- /dev/null
+++ b/app/services/api/v1/projects/commits/diff_service.rb
@@ -0,0 +1,31 @@
+class Api::V1::Projects::Commits::DiffService < ApplicationService 
+  attr_accessor :project, :sha, :token, :owner, :repo 
+  attr_accessor :gitea_data 
+
+  def initialize(project, sha, token = nil)
+    @project = project 
+    @sha = sha
+    @owner = project&.owner.login 
+    @repo = project&.identifier 
+    @token = token
+  end
+
+  def call 
+    load_gitea_data
+
+    gitea_data
+  end
+
+  private 
+  def request_params
+    {
+      access_token: token
+    }
+  end
+
+  def load_gitea_data 
+    @gitea_data = $gitea_client.get_repos_commits_diff_by_owner_repo_sha(owner, repo, sha, {query: request_params})
+    raise Error, '获取提交对比失败！' unless @gitea_data.is_a?(Hash)
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/commits/diff.json.jbuilder b/app/views/api/v1/projects/commits/diff.json.jbuilder
new file mode 100644
index 00000000..e0237369
--- /dev/null
+++ b/app/views/api/v1/projects/commits/diff.json.jbuilder
@@ -0,0 +1,40 @@
+json.file_nums @result_object['NumFiles']
+json.total_addition @result_object['TotalAddition']
+json.total_deletion @result_object['TotalAddition']
+json.files @result_object['Files'].each do |file|
+  json.name file['Name']
+  json.oldname file['OldName']
+  json.addition file['Addition']
+  json.deletion file['Deletion']
+  json.type file['Type']
+  json.is_created file['IsCreated']
+  json.is_deleted file['IsDeleted']
+  json.is_bin file['IsBin']
+  json.is_lfs_file file['IsLFSFile']
+  json.is_renamed file['IsRenamed']
+  json.is_ambiguous file['IsAmbiguous']
+  json.is_submodule file['IsSubmodule']
+  json.sections file['Sections'] do |section|
+    json.file_name section['FileName']
+    json.name section['Name']
+    json.lines section['Lines'] do |line|
+      json.left_index line['LeftIdx']
+      json.right_index line['RightIdx']
+      json.match line['Match']
+      json.type line['Type']
+      json.content line['Content']
+      unless line['SectionInfo'].blank?
+        json.section_path line['SectionInfo']['Path']
+        json.section_last_left_index line['SectionInfo']['LastLeftIdx']
+        json.section_last_right_index line['SectionInfo']['LastRightIdx']
+        json.section_left_index line['SectionInfo']['LeftIdx']
+        json.section_right_index line['SectionInfo']['RightIdx']
+        json.section_left_hunk_size line['SectionInfo']['LeftHunkSize']
+        json.section_right_hunk_size line['SectionInfo']['RightHunkSize']
+      end
+    end
+  end
+  json.is_incomplete file['IsIncomplete']
+  json.is_incomplete_line_too_long file['IsIncompleteLineTooLong']
+  json.is_protected file['IsProtected']
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 99684e6d..78901696 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -28,6 +28,8 @@ defaults format: :json do
                 get :all 
               end
             end
+
+            get '/commits/:sha/diff', to: 'commits#diff'
             get '/git/blobs/:sha', to: 'git#blobs'
             get '/git/trees/:sha', to: 'git#trees'
           end
diff --git a/public/docs/api.html b/public/docs/api.html
index 6fedc946..efc0432b 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -554,7 +554,7 @@
                     <a href="#blobs" class="toc-h2 toc-link" data-title="获取仓库blobs内容">获取仓库blobs内容</a>
                   </li>
                   <li>
-                    <a href="#28d27a81d5" class="toc-h2 toc-link" data-title="获取仓库贡献者">获取仓库贡献者</a>
+                    <a href="#blame" class="toc-h2 toc-link" data-title="获取单个提交的blame信息">获取单个提交的blame信息</a>
                   </li>
                   <li>
                     <a href="#webhooks" class="toc-h2 toc-link" data-title="获取仓库webhooks列表">获取仓库webhooks列表</a>
@@ -9662,19 +9662,16 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 <aside class="success">
   Success Data.
 </aside>
-<h2 id='28d27a81d5'>获取仓库贡献者</h2>
-<p>获取仓库贡献者</p>
+<h2 id='blame'>获取单个提交的blame信息</h2>
+<p>根据commit ID获取blame信息</p>
 
 <blockquote>
 <p>示例:</p>
 </blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
-<span class="nt">-d</span> <span class="s2">"ref=master"</span> <span class="se">\</span>
-<span class="nt">-d</span> <span class="s2">"filepath=lib"</span> <span class="se">\</span>
-http://localhost:3000/api/yystopf/csfjkkj/contributors.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/contributors.json</span><span class="dl">'</span><span class="p">)</span>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393b2ae693756a4781fab2/diff.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393b2ae693756a4781fab2/diff.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-22'>HTTP 请求</h3>
-<p><code>GET /api/:owner/:repo/contributors.json</code></p>
+<p><code>GET /api/v1/:owner/:repo/commits/:sha/diff.json</code></p>
 <h3 id='2eb6f47757-22'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -9700,18 +9697,11 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 <td>项目标识identifier</td>
 </tr>
 <tr>
-<td>ref</td>
-<td>否</td>
+<td>sha</td>
+<td>是</td>
 <td></td>
 <td>string</td>
-<td>分支名称、tag名称或是提交记录id，默认为整个仓库</td>
-</tr>
-<tr>
-<td>filepath</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>子目录名称，默认为空</td>
+<td>提交记录id</td>
 </tr>
 </tbody></table>
 <h3 id='7447e4874e-22'>返回字段说明:</h3>
@@ -9723,34 +9713,149 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 </tr>
 </thead><tbody>
 <tr>
-<td>total_count</td>
-<td>integer</td>
-<td>贡献者数量</td>
+<td>file_nums</td>
+<td>int</td>
+<td>文件数量</td>
 </tr>
 <tr>
-<td>contributions</td>
-<td>integer</td>
-<td>贡献数量</td>
+<td>total_addition</td>
+<td>int</td>
+<td>新增行数</td>
 </tr>
 <tr>
-<td>login</td>
+<td>total_deletion</td>
+<td>int</td>
+<td>删除行数</td>
+</tr>
+<tr>
+<td>files.name</td>
 <td>string</td>
-<td>用户登录名</td>
+<td>文件名称</td>
 </tr>
 <tr>
-<td>type</td>
+<td>files.oldname</td>
 <td>string</td>
-<td>用户类型</td>
+<td>文件修改前名称</td>
 </tr>
 <tr>
-<td>name</td>
-<td>string</td>
-<td>用户昵称</td>
+<td>files.addition</td>
+<td>int</td>
+<td>文件新增行数</td>
 </tr>
 <tr>
-<td>image_url</td>
+<td>files.deletion</td>
+<td>int</td>
+<td>文件删除行数</td>
+</tr>
+<tr>
+<td>files.type</td>
+<td>int</td>
+<td>文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制</td>
+</tr>
+<tr>
+<td>files.is_created</td>
+<td>bool</td>
+<td>是否为新建文件</td>
+</tr>
+<tr>
+<td>files.is_deleted</td>
+<td>bool</td>
+<td>是否为删除文件</td>
+</tr>
+<tr>
+<td>files.is_bin</td>
+<td>bool</td>
+<td>是否为二进制文件</td>
+</tr>
+<tr>
+<td>files.is_lfs_file</td>
+<td>bool</td>
+<td></td>
+</tr>
+<tr>
+<td>files.is_renamed</td>
+<td>bool</td>
+<td>是否重命名</td>
+</tr>
+<tr>
+<td>files.is_ambiguous</td>
+<td>bool</td>
+<td></td>
+</tr>
+<tr>
+<td>files.is_submodule</td>
+<td>bool</td>
+<td>是否为子模块</td>
+</tr>
+<tr>
+<td>files.sections.file_name</td>
 <td>string</td>
-<td>用户头像</td>
+<td>文件名称</td>
+</tr>
+<tr>
+<td>files.sections.name</td>
+<td>string</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.left_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.right_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.match</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.type</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.content</td>
+<td>string</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.section_path</td>
+<td>string</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.section_last_left_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.section_last_right_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.section_left_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.section_right_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.section_left_hunk_size</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.section_right_hunk_size</td>
+<td>int</td>
+<td></td>
 </tr>
 </tbody></table>
 
@@ -9758,23 +9863,103 @@ http://localhost:3000/api/yystopf/csfjkkj/contributors.json
 <p>返回的JSON示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"contributors"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+    </span><span class="nl">"file_nums"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"total_addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"total_deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"files"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
         </span><span class="p">{</span><span class="w">
-            </span><span class="nl">"contributions"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"testforge2"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"testforge2"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/T/236_177_85/120.png"</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng3"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"oldname"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng3"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_created"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_deleted"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_bin"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_lfs_file"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_renamed"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_ambiguous"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_submodule"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"sections"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng3"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                        </span><span class="p">{</span><span class="w">
+                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"@@ -0,0 +1 @@"</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng3"</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_last_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_last_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_left_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_right_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+                        </span><span class="p">},</span><span class="w">
+                        </span><span class="p">{</span><span class="w">
+                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">-1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"+1111122222"</span><span class="w">
+                        </span><span class="p">}</span><span class="w">
+                    </span><span class="p">]</span><span class="w">
+                </span><span class="p">}</span><span class="w">
+            </span><span class="p">],</span><span class="w">
+            </span><span class="nl">"is_incomplete"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
         </span><span class="p">},</span><span class="w">
         </span><span class="p">{</span><span class="w">
-            </span><span class="nl">"contributions"</span><span class="p">:</span><span class="w"> </span><span class="mi">79</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/Y/241_125_89/120.png"</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng4"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"oldname"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng4"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_created"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_deleted"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_bin"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_lfs_file"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_renamed"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_ambiguous"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_submodule"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"sections"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng4"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                        </span><span class="p">{</span><span class="w">
+                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"@@ -0,0 +1 @@"</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng4"</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_last_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_last_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_left_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_right_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+                        </span><span class="p">},</span><span class="w">
+                        </span><span class="p">{</span><span class="w">
+                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">-1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"+111112222"</span><span class="w">
+                        </span><span class="p">}</span><span class="w">
+                    </span><span class="p">]</span><span class="w">
+                </span><span class="p">}</span><span class="w">
+            </span><span class="p">],</span><span class="w">
+            </span><span class="nl">"is_incomplete"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
         </span><span class="p">}</span><span class="w">
-    </span><span class="p">],</span><span class="w">
-    </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="w">
+    </span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div>
 <aside class="success">

From e8deb830046ab32794acb76005f8f728610c1c6d Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 18 Jul 2022 11:20:24 +0800
Subject: [PATCH 114/208] fix: gemfile

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

diff --git a/Gemfile b/Gemfile
index 091716e5..b6d5099a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.9.1'
\ No newline at end of file
+gem 'gitea-client', '~> 0.9.3'
\ No newline at end of file

From 62733493349f9f6a737ba3d6745c7e9b96d4b3e8 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 18 Jul 2022 11:37:41 +0800
Subject: [PATCH 115/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=AF=94=E8=BE=83blame=E3=80=81token=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |   2 +-
 .../api/v1/projects/commits_controller.rb     |   1 -
 app/controllers/api/v1/projects_controller.rb |   6 +-
 .../slate/source/includes/_repositories.md    | 207 ++++-
 .../v1/projects/branches/all_list_service.rb  |  10 +-
 .../v1/projects/branches/create_service.rb    |  14 +-
 .../api/v1/projects/commits/diff_service.rb   |   7 +-
 .../api/v1/projects/compare_service.rb        |  34 +
 app/services/api/v1/projects/get_service.rb   |  12 +-
 .../api/v1/projects/git/blobs_service.rb      |  10 +-
 .../api/v1/projects/git/trees_service.rb      |   8 +-
 .../v1/projects/webhooks/create_service.rb    |  12 +-
 .../v1/projects/webhooks/delete_service.rb    |  10 +-
 .../api/v1/projects/webhooks/get_service.rb   |   9 +-
 .../v1/projects/webhooks/hooktasks_service.rb |   7 +-
 .../api/v1/projects/webhooks/list_service.rb  |  10 +-
 .../api/v1/projects/webhooks/tests_service.rb |  10 +-
 .../v1/projects/webhooks/update_service.rb    |  12 +-
 .../_simple_gitea_diff_detail.json.jbuilder   |  40 +
 .../v1/projects/commits/diff.json.jbuilder    |  41 +-
 .../api/v1/projects/compare.json.jbuilder     |  18 +
 config/routes/api.rb                          |   6 +-
 public/docs/api.html                          | 845 ++++++++++++------
 23 files changed, 912 insertions(+), 419 deletions(-)
 create mode 100644 app/services/api/v1/projects/compare_service.rb
 create mode 100644 app/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/compare.json.jbuilder

diff --git a/Gemfile b/Gemfile
index b6d5099a..37687e78 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.9.3'
\ No newline at end of file
+gem 'gitea-client', '~> 0.9.4'
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/commits_controller.rb b/app/controllers/api/v1/projects/commits_controller.rb
index 1e6c17be..873dd4d9 100644
--- a/app/controllers/api/v1/projects/commits_controller.rb
+++ b/app/controllers/api/v1/projects/commits_controller.rb
@@ -3,6 +3,5 @@ class Api::V1::Projects::CommitsController < Api::V1::BaseController
 
   def diff 
     @result_object = Api::V1::Projects::Commits::DiffService.call(@project, params[:sha], current_user&.gitea_token)
-    puts @result_object
   end
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects_controller.rb b/app/controllers/api/v1/projects_controller.rb
index 05a3750c..0873213d 100644
--- a/app/controllers/api/v1/projects_controller.rb
+++ b/app/controllers/api/v1/projects_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::ProjectsController < Api::V1::BaseController 
-  before_action :load_project, only: [:show]
+  before_action :require_public_and_member_above, only: [:show, :compare]
 
   def index 
     render_ok
@@ -8,4 +8,8 @@ class Api::V1::ProjectsController < Api::V1::BaseController
   def show 
     @result_object = Api::V1::Projects::GetService.call(@project, current_user.gitea_token)
   end
+
+  def compare
+    @result_object = Api::V1::Projects::CompareService.call(@project, params[:from], params[:to], current_user&.gitea_token)
+  end
 end
\ No newline at end of file
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index afd09932..2b3ca132 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -1474,9 +1474,9 @@ await octokit.request('GET /api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393
 
 ```json
 {
-    "file_nums": 2,
-    "total_addition": 2,
-    "total_deletion": 2,
+    "file_nums": 1,
+    "total_addition": 1,
+    "total_deletion": 0,
     "files": [
         {
             "name": "xinzeng3",
@@ -1523,52 +1523,6 @@ await octokit.request('GET /api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393
             "is_incomplete": false,
             "is_incomplete_line_too_long": false,
             "is_protected": false
-        },
-        {
-            "name": "xinzeng4",
-            "oldname": "xinzeng4",
-            "addition": 1,
-            "deletion": 0,
-            "type": 1,
-            "is_created": true,
-            "is_deleted": false,
-            "is_bin": false,
-            "is_lfs_file": false,
-            "is_renamed": false,
-            "is_ambiguous": false,
-            "is_submodule": false,
-            "sections": [
-                {
-                    "file_name": "xinzeng4",
-                    "name": "",
-                    "lines": [
-                        {
-                            "left_index": 0,
-                            "right_index": 0,
-                            "match": 0,
-                            "type": 4,
-                            "content": "@@ -0,0 +1 @@",
-                            "section_path": "xinzeng4",
-                            "section_last_left_index": 0,
-                            "section_last_right_index": 0,
-                            "section_left_index": 0,
-                            "section_right_index": 1,
-                            "section_left_hunk_size": 0,
-                            "section_right_hunk_size": 0
-                        },
-                        {
-                            "left_index": 0,
-                            "right_index": 1,
-                            "match": -1,
-                            "type": 2,
-                            "content": "+111112222"
-                        }
-                    ]
-                }
-            ],
-            "is_incomplete": false,
-            "is_incomplete_line_too_long": false,
-            "is_protected": false
         }
     ]
 }
@@ -1577,6 +1531,161 @@ await octokit.request('GET /api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393
   Success Data.
 </aside>
 
+## 获取比较提交blame
+根据分支名、标签、commit ID来获取代码对比blame
+
+> 示例:
+
+```shell
+curl -X GET \
+-d "from=hh_ceshi" \
+-d "to=master" \
+http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/yystopf/csfjkkj/compare.json')
+```
+
+### HTTP 请求
+`GET /api/v1/:owner/:repo/compare.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner|是|  | string |用户登录名  |
+|repo |是|  | string |项目标识identifier  |
+|from |是|  | string |源分支、标签、commitID |
+|to|是||string|目标分支、标签、commitID|
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|commits_count|int|提交数量|
+|commits.branch|string|提交分支|
+|commits.author|object|提交作者|
+|commits.committer|object|提交者|
+|commits.commit_message|string|提交信息|
+|commits.sha|string|提交ID|
+|commits.parent_shas|array|提交父节点ID|
+|diff.file_nums|int|文件数量|
+|diff.total_addition|int|新增行数|
+|diff.total_deletion|int|删除行数|
+|diff.files.name|string|文件名称|
+|diff.files.oldname|string|文件修改前名称|
+|diff.files.addition|int|文件新增行数|
+|diff.files.deletion|int|文件删除行数|
+|diff.files.type|int|文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制|
+|diff.files.is_created|bool|是否为新建文件|
+|diff.files.is_deleted|bool|是否为删除文件|
+|diff.files.is_bin|bool|是否为二进制文件|
+|diff.files.is_lfs_file|bool||
+|diff.files.is_renamed|bool|是否重命名|
+|diff.files.is_ambiguous|bool||
+|diff.files.is_submodule|bool|是否为子模块|
+|diff.files.sections.file_name|string|文件名称|
+|diff.files.sections.name|string||
+|diff.files.sections.lines.left_index|int||
+|diff.files.sections.lines.right_index|int||
+|diff.files.sections.lines.match|int||
+|diff.files.sections.lines.type|int||
+|diff.files.sections.lines.content|string||
+|diff.files.sections.lines.section_path|string||
+|diff.files.sections.lines.section_last_left_index|int||
+|diff.files.sections.lines.section_last_right_index|int||
+|diff.files.sections.lines.section_left_index|int||
+|diff.files.sections.lines.section_right_index|int||
+|diff.files.sections.lines.section_left_hunk_size|int||
+|diff.files.sections.lines.section_right_hunk_size|int||
+
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "commits_count": 1,
+    "last_commit_sha": "80dd40214a58622312393b2ae693756a4781fab2",
+    "commits": [
+        {
+            "author": {
+                "id": "2",
+                "login": "yystopf",
+                "name": "heh",
+                "type": "User",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "committer": {
+                "id": "2",
+                "login": "yystopf",
+                "name": "heh",
+                "type": "User",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "branch": "",
+            "commit_message": "x拟增\n\nSigned-off-by: yystopf <yystopf@163.com>",
+            "sha": "7e4d8bb3c28e24d4cd6b205f2eed32513e937524",
+            "parent_shas": null
+        }
+    ],
+    "diff": {
+        "file_nums": 1,
+        "total_addition": 1,
+        "total_deletion": 0,
+        "files": [
+            {
+                "name": "ceshi123",
+                "oldname": "ceshi123",
+                "addition": 1,
+                "deletion": 0,
+                "type": 1,
+                "is_created": true,
+                "is_deleted": false,
+                "is_bin": false,
+                "is_lfs_file": false,
+                "is_renamed": false,
+                "is_ambiguous": false,
+                "is_submodule": false,
+                "sections": [
+                    {
+                        "file_name": "ceshi123",
+                        "name": "",
+                        "lines": [
+                            {
+                                "left_index": 0,
+                                "right_index": 0,
+                                "match": 0,
+                                "type": 4,
+                                "content": "@@ -0,0 +1 @@",
+                                "section_path": "ceshi123",
+                                "section_last_left_index": 0,
+                                "section_last_right_index": 0,
+                                "section_left_index": 0,
+                                "section_right_index": 1,
+                                "section_left_hunk_size": 0,
+                                "section_right_hunk_size": 0
+                            },
+                            {
+                                "left_index": 0,
+                                "right_index": 1,
+                                "match": -1,
+                                "type": 2,
+                                "content": "+1111122222"
+                            }
+                        ]
+                    }
+                ],
+                "is_incomplete": false,
+                "is_incomplete_line_too_long": false,
+                "is_protected": false
+            }
+        ]
+    }
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
+
 ## 获取仓库webhooks列表
 获取仓库webhooks列表
 
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 9e97b6dd..182495cd 100644
--- a/app/services/api/v1/projects/branches/all_list_service.rb
+++ b/app/services/api/v1/projects/branches/all_list_service.rb
@@ -11,16 +11,20 @@ class Api::V1::Projects::Branches::AllListService < ApplicationService
   end
 
   def call 
-    $gitea_client.token = token unless token.blank? 
     load_gitea_data
     
-    $gitea_client.token = nil unless token.blank?
     gitea_data
   end
 
   private 
+  def request_params 
+    {
+      access_token: token 
+    }
+  end
+
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo)
+    @gitea_data = $gitea_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 a4d9f854..33e56127 100644
--- a/app/services/api/v1/projects/branches/create_service.rb
+++ b/app/services/api/v1/projects/branches/create_service.rb
@@ -4,7 +4,7 @@ class Api::V1::Projects::Branches::CreateService < ApplicationService
   attr_accessor :project, :token, :owner, :repo, :old_branch_name, :new_branch_name
   attr_accessor :gitea_data
 
-  validates :new_branch_name, :old_branch_name, presence: :true
+  validates :new_branch_name, :old_branch_name, presence: true
 
   def initialize(project, params, token=nil)
     @project = project 
@@ -17,16 +17,20 @@ class Api::V1::Projects::Branches::CreateService < ApplicationService
 
   def call 
     raise Error, errors.full_messages.join(",") unless valid?
-    $gitea_client.token = token unless token.blank? 
 
     check_new_branch_exist
     excute_data_to_gitea
     
-    $gitea_client.token = nil unless token.blank?
     gitea_data
   end
 
   private 
+  def request_params 
+    {
+      access_token: token 
+    }
+  end
+
   def request_body 
     {
       new_branch_name: new_branch_name,
@@ -35,12 +39,12 @@ class Api::V1::Projects::Branches::CreateService < ApplicationService
   end
 
   def excute_data_to_gitea 
-    @gitea_data = $gitea_client.post_repos_branches_by_owner_repo(owner, repo, {body: request_body.to_json})
+    @gitea_data = $gitea_client.post_repos_branches_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_new_branch_exist
-    result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo)
+    result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo) rescue nil
     raise Error, '查询分支名称失败！' unless result.is_a?(Hash)
     raise Error, '分支已存在！' if result['branch_name'].include?(@new_branch_name)
   end
diff --git a/app/services/api/v1/projects/commits/diff_service.rb b/app/services/api/v1/projects/commits/diff_service.rb
index 8b12fc31..71dd155a 100644
--- a/app/services/api/v1/projects/commits/diff_service.rb
+++ b/app/services/api/v1/projects/commits/diff_service.rb
@@ -1,7 +1,11 @@
 class Api::V1::Projects::Commits::DiffService < ApplicationService 
+  include ActiveModel::Model
+
   attr_accessor :project, :sha, :token, :owner, :repo 
   attr_accessor :gitea_data 
 
+  validates :sha, presence: true
+
   def initialize(project, sha, token = nil)
     @project = project 
     @sha = sha
@@ -11,6 +15,7 @@ class Api::V1::Projects::Commits::DiffService < ApplicationService
   end
 
   def call 
+    raise Error, errors.full_messages.join(",") unless valid?
     load_gitea_data
 
     gitea_data
@@ -24,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})
+    @gitea_data = $gitea_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/compare_service.rb b/app/services/api/v1/projects/compare_service.rb
new file mode 100644
index 00000000..23a24830
--- /dev/null
+++ b/app/services/api/v1/projects/compare_service.rb
@@ -0,0 +1,34 @@
+class Api::V1::Projects::CompareService < ApplicationService 
+  include ActiveModel::Model
+  attr_reader :project, :from, :to, :token, :owner, :repo 
+  attr_accessor :gitea_data
+
+  validates :from, :to, presence: true
+
+  def initialize(project, from, to, token=nil)
+    @project = project 
+    @owner = project&.owner.login 
+    @repo = project&.identifier 
+    @from = from 
+    @to = to 
+    @token = token
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid?
+    load_gitea_data
+    raise Error, '获取对比信息失败！' unless gitea_data.is_a?(Hash)
+    gitea_data
+  end
+
+  private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
+
+  def load_gitea_data 
+    @gitea_data = $gitea_client.get_repos_compare_by_owner_repo_from_to(owner, repo, from, to, {query: request_params}) rescue nil
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/get_service.rb b/app/services/api/v1/projects/get_service.rb
index 1244938c..ebb0d1cf 100644
--- a/app/services/api/v1/projects/get_service.rb
+++ b/app/services/api/v1/projects/get_service.rb
@@ -11,18 +11,20 @@ class Api::V1::Projects::GetService < ApplicationService
   end
 
   def call 
-    $gitea_client.token = token unless token.blank? 
     load_gitea_data
     load_gitea_branch_tag_count
 
-    $gitea_client.token = nil unless token.blank? 
-
     result_object
   rescue 
     raise Error, "服务器错误，请联系系统管理员！"
   end
 
   private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
 
   def result_object
     {
@@ -39,10 +41,10 @@ class Api::V1::Projects::GetService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_by_owner_repo(owner, repo)
+    @gitea_data = $gitea_client.get_repos_by_owner_repo(owner, repo, {query: request_params}) rescue nil
   end
 
   def load_gitea_branch_tag_count 
-    @gitea_branch_tag_count = $gitea_client.get_repos_branch_tag_count_by_owner_repo(owner, repo)
+    @gitea_branch_tag_count = $gitea_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/git/blobs_service.rb b/app/services/api/v1/projects/git/blobs_service.rb
index 0b197c10..e2097d93 100644
--- a/app/services/api/v1/projects/git/blobs_service.rb
+++ b/app/services/api/v1/projects/git/blobs_service.rb
@@ -16,15 +16,19 @@ class Api::V1::Projects::Git::BlobsService < ApplicationService
   end
 
   def call 
-    $gitea_client.token = token unless token.blank? 
     load_gitea_data 
 
-    $gitea_client.token = nil unless token.blank? 
     gitea_data
   end
 
   private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
+
   def load_gitea_data
-    @gitea_data = $gitea_client.get_repos_git_blobs_by_owner_repo_sha(owner, repo, sha)
+    @gitea_data = $gitea_client.get_repos_git_blobs_by_owner_repo_sha(owner, repo, sha, {query: request_params}) rescue nil
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/git/trees_service.rb b/app/services/api/v1/projects/git/trees_service.rb
index 2a72c11a..4d6f5d18 100644
--- a/app/services/api/v1/projects/git/trees_service.rb
+++ b/app/services/api/v1/projects/git/trees_service.rb
@@ -33,18 +33,20 @@ class Api::V1::Projects::Git::TreesService < ApplicationService
       {
         recursive: recursive,
         page: page,
-        per_page: limit
+        per_page: limit,
+        access_token: token
       }
     else 
       {
         page: page,
-        per_page: limit
+        per_page: limit,
+        access_token: token
       }
     end
   end
 
   def load_gitea_data
-    @gitea_data = $gitea_client.get_repos_git_trees_by_owner_repo_sha(owner, repo, sha, {query: request_query})
+    @gitea_data = $gitea_client.get_repos_git_trees_by_owner_repo_sha(owner, repo, sha, {query: request_query}) 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/webhooks/create_service.rb b/app/services/api/v1/projects/webhooks/create_service.rb
index 401ff9ff..bef0a340 100644
--- a/app/services/api/v1/projects/webhooks/create_service.rb
+++ b/app/services/api/v1/projects/webhooks/create_service.rb
@@ -26,12 +26,8 @@ class Api::V1::Projects::Webhooks::CreateService < ApplicationService
   def call 
     raise Error, errors.full_messages.join(",") unless valid?
     begin
-      $gitea_client.token = token unless token.blank? 
-
       excute_data_to_gitea
 
-      $gitea_client.token = nil unless token.blank? 
-
       gitea_data
     rescue 
       raise Error, "服务器错误，请联系系统管理员！"
@@ -39,6 +35,12 @@ class Api::V1::Projects::Webhooks::CreateService < ApplicationService
   end
 
   private 
+  def request_params
+    {
+      access_token: token
+    }
+  end
+
   def request_body 
     {
       active: active,
@@ -55,6 +57,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})
+    @gitea_data = $gitea_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/delete_service.rb b/app/services/api/v1/projects/webhooks/delete_service.rb
index 5dd499e6..8343a5b2 100644
--- a/app/services/api/v1/projects/webhooks/delete_service.rb
+++ b/app/services/api/v1/projects/webhooks/delete_service.rb
@@ -12,19 +12,21 @@ class Api::V1::Projects::Webhooks::DeleteService < ApplicationService
   end
 
   def call 
-    $gitea_client.token = token unless token.blank? 
     excute_data_to_gitea
 
-    $gitea_client.token = nil unless token.blank? 
-
     gitea_data
   rescue 
     raise Error, "服务器错误，请联系系统管理员！"
   end
 
   private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
 
   def excute_data_to_gitea 
-    @gitea_data = $gitea_client.delete_repos_hooks_by_owner_repo_id(owner, repo, id)
+    @gitea_data = $gitea_client.delete_repos_hooks_by_owner_repo_id(owner, repo, id, {query: request_params}) rescue nil
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/webhooks/get_service.rb b/app/services/api/v1/projects/webhooks/get_service.rb
index 1ae5c54e..5c6c79d3 100644
--- a/app/services/api/v1/projects/webhooks/get_service.rb
+++ b/app/services/api/v1/projects/webhooks/get_service.rb
@@ -12,10 +12,8 @@ class Api::V1::Projects::Webhooks::GetService < ApplicationService
   end
 
   def call 
-    $gitea_client.token = token unless token.blank? 
     load_gitea_data
 
-    $gitea_client.token = nil unless token.blank? 
 
     gitea_data
   rescue 
@@ -23,8 +21,13 @@ class Api::V1::Projects::Webhooks::GetService < ApplicationService
   end
 
   private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_hooks_by_owner_repo_id(owner, repo, id)
+    @gitea_data = $gitea_client.get_repos_hooks_by_owner_repo_id(owner, repo, id, {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 4dd90ee3..6be9c67c 100644
--- a/app/services/api/v1/projects/webhooks/hooktasks_service.rb
+++ b/app/services/api/v1/projects/webhooks/hooktasks_service.rb
@@ -23,8 +23,13 @@ class Api::V1::Projects::Webhooks::ListService < ApplicationService
   end
 
   private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_hooks_hooktasks_by_owner_repo(owner, repo, id)
+    @gitea_data = $gitea_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/api/v1/projects/webhooks/list_service.rb b/app/services/api/v1/projects/webhooks/list_service.rb
index fb746de4..2a76d196 100644
--- a/app/services/api/v1/projects/webhooks/list_service.rb
+++ b/app/services/api/v1/projects/webhooks/list_service.rb
@@ -11,19 +11,21 @@ class Api::V1::Projects::Webhooks::ListService < ApplicationService
   end
 
   def call 
-    $gitea_client.token = token unless token.blank? 
     load_gitea_data
 
-    $gitea_client.token = nil unless token.blank? 
-
     gitea_data
   rescue 
     raise Error, "服务器错误，请联系系统管理员！"
   end
 
   private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_hooks_by_owner_repo(owner, repo)
+    @gitea_data = $gitea_client.get_repos_hooks_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/webhooks/tests_service.rb b/app/services/api/v1/projects/webhooks/tests_service.rb
index 3d8b99c9..3f9fe064 100644
--- a/app/services/api/v1/projects/webhooks/tests_service.rb
+++ b/app/services/api/v1/projects/webhooks/tests_service.rb
@@ -12,19 +12,21 @@ class Api::V1::Projects::Webhooks::TestsService < ApplicationService
   end
 
   def call 
-    $gitea_client.token = token unless token.blank? 
     excute_data_to_gitea
 
-    $gitea_client.token = nil unless token.blank? 
-
     gitea_data
   rescue 
     raise Error, "服务器错误，请联系系统管理员！"
   end
 
   private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
 
   def excute_data_to_gitea 
-    @gitea_data = $gitea_client.post_repos_hooks_tests_by_owner_repo_id(owner, repo, id)
+    @gitea_data = $gitea_client.post_repos_hooks_tests_by_owner_repo_id(owner, repo, id, {query: request_params}) rescue nil
   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 19ff4f32..a632d6f2 100644
--- a/app/services/api/v1/projects/webhooks/update_service.rb
+++ b/app/services/api/v1/projects/webhooks/update_service.rb
@@ -27,12 +27,8 @@ class Api::V1::Projects::Webhooks::UpdateService < ApplicationService
   def call 
     raise Error, errors.full_messages.join(",") unless valid?
     begin
-      $gitea_client.token = token unless token.blank? 
-
       excute_data_to_gitea
 
-      $gitea_client.token = nil unless token.blank? 
-
       gitea_data
     rescue 
       raise Error, "服务器错误，请联系系统管理员！"
@@ -40,6 +36,12 @@ class Api::V1::Projects::Webhooks::UpdateService < ApplicationService
   end
 
   private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
+
   def request_body 
     {
       active: active,
@@ -56,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})
+    @gitea_data = $gitea_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/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder b/app/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder
new file mode 100644
index 00000000..5dff0b89
--- /dev/null
+++ b/app/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder
@@ -0,0 +1,40 @@
+json.file_nums diff['NumFiles']
+json.total_addition diff['TotalAddition']
+json.total_deletion diff['TotalDeletion']
+json.files diff['Files'].each do |file|
+  json.name file['Name']
+  json.oldname file['OldName']
+  json.addition file['Addition']
+  json.deletion file['Deletion']
+  json.type file['Type']
+  json.is_created file['IsCreated']
+  json.is_deleted file['IsDeleted']
+  json.is_bin file['IsBin']
+  json.is_lfs_file file['IsLFSFile']
+  json.is_renamed file['IsRenamed']
+  json.is_ambiguous file['IsAmbiguous']
+  json.is_submodule file['IsSubmodule']
+  json.sections file['Sections'] do |section|
+    json.file_name section['FileName']
+    json.name section['Name']
+    json.lines section['Lines'] do |line|
+      json.left_index line['LeftIdx']
+      json.right_index line['RightIdx']
+      json.match line['Match']
+      json.type line['Type']
+      json.content line['Content']
+      unless line['SectionInfo'].blank?
+        json.section_path line['SectionInfo']['Path']
+        json.section_last_left_index line['SectionInfo']['LastLeftIdx']
+        json.section_last_right_index line['SectionInfo']['LastRightIdx']
+        json.section_left_index line['SectionInfo']['LeftIdx']
+        json.section_right_index line['SectionInfo']['RightIdx']
+        json.section_left_hunk_size line['SectionInfo']['LeftHunkSize']
+        json.section_right_hunk_size line['SectionInfo']['RightHunkSize']
+      end
+    end
+  end
+  json.is_incomplete file['IsIncomplete']
+  json.is_incomplete_line_too_long file['IsIncompleteLineTooLong']
+  json.is_protected file['IsProtected']
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/commits/diff.json.jbuilder b/app/views/api/v1/projects/commits/diff.json.jbuilder
index e0237369..8c280b7f 100644
--- a/app/views/api/v1/projects/commits/diff.json.jbuilder
+++ b/app/views/api/v1/projects/commits/diff.json.jbuilder
@@ -1,40 +1 @@
-json.file_nums @result_object['NumFiles']
-json.total_addition @result_object['TotalAddition']
-json.total_deletion @result_object['TotalAddition']
-json.files @result_object['Files'].each do |file|
-  json.name file['Name']
-  json.oldname file['OldName']
-  json.addition file['Addition']
-  json.deletion file['Deletion']
-  json.type file['Type']
-  json.is_created file['IsCreated']
-  json.is_deleted file['IsDeleted']
-  json.is_bin file['IsBin']
-  json.is_lfs_file file['IsLFSFile']
-  json.is_renamed file['IsRenamed']
-  json.is_ambiguous file['IsAmbiguous']
-  json.is_submodule file['IsSubmodule']
-  json.sections file['Sections'] do |section|
-    json.file_name section['FileName']
-    json.name section['Name']
-    json.lines section['Lines'] do |line|
-      json.left_index line['LeftIdx']
-      json.right_index line['RightIdx']
-      json.match line['Match']
-      json.type line['Type']
-      json.content line['Content']
-      unless line['SectionInfo'].blank?
-        json.section_path line['SectionInfo']['Path']
-        json.section_last_left_index line['SectionInfo']['LastLeftIdx']
-        json.section_last_right_index line['SectionInfo']['LastRightIdx']
-        json.section_left_index line['SectionInfo']['LeftIdx']
-        json.section_right_index line['SectionInfo']['RightIdx']
-        json.section_left_hunk_size line['SectionInfo']['LeftHunkSize']
-        json.section_right_hunk_size line['SectionInfo']['RightHunkSize']
-      end
-    end
-  end
-  json.is_incomplete file['IsIncomplete']
-  json.is_incomplete_line_too_long file['IsIncompleteLineTooLong']
-  json.is_protected file['IsProtected']
-end
\ No newline at end of file
+json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object
\ No newline at end of file
diff --git a/app/views/api/v1/projects/compare.json.jbuilder b/app/views/api/v1/projects/compare.json.jbuilder
new file mode 100644
index 00000000..2d20c51e
--- /dev/null
+++ b/app/views/api/v1/projects/compare.json.jbuilder
@@ -0,0 +1,18 @@
+json.commits_count @result_object['CommitsCount']
+json.last_commit_sha @result_object['LatestSha']
+json.commits @result_object['Commits'] do |commit|
+  json.author do 
+    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(commit['Author']), name: commit['Author']['Name'] }
+  end
+  
+  json.committer do 
+    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
+  end
+  json.branch commit['Branch']
+  json.commit_message commit['CommitMessage']
+  json.sha commit['Sha']
+  json.parent_shas commit['Sha']['ParentShas']
+end
+json.diff do 
+  json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object['Diff']
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 78901696..fc07a986 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -9,7 +9,11 @@ defaults format: :json do
 
         scope ':repo' do 
           # projects
-          resource :projects, path: '/', only: [:show, :update, :edit, :destroy]
+          resource :projects, path: '/', only: [:show, :update, :edit, :destroy] do 
+            collection do 
+              get :compare
+            end
+          end
 
           # projects文件夹下的
           scope module: :projects do 
diff --git a/public/docs/api.html b/public/docs/api.html
index efc0432b..505ab44c 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -556,6 +556,9 @@
                   <li>
                     <a href="#blame" class="toc-h2 toc-link" data-title="获取单个提交的blame信息">获取单个提交的blame信息</a>
                   </li>
+                  <li>
+                    <a href="#blame-2" class="toc-h2 toc-link" data-title="获取比较提交blame">获取比较提交blame</a>
+                  </li>
                   <li>
                     <a href="#webhooks" class="toc-h2 toc-link" data-title="获取仓库webhooks列表">获取仓库webhooks列表</a>
                   </li>
@@ -9863,9 +9866,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 <p>返回的JSON示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"file_nums"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"total_addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"total_deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"file_nums"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"total_addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"total_deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
     </span><span class="nl">"files"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
         </span><span class="p">{</span><span class="w">
             </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng3"</span><span class="p">,</span><span class="w">
@@ -9912,52 +9915,6 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
             </span><span class="nl">"is_incomplete"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
             </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
             </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
-        </span><span class="p">},</span><span class="w">
-        </span><span class="p">{</span><span class="w">
-            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng4"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"oldname"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng4"</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"is_created"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"is_deleted"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"is_bin"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"is_lfs_file"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"is_renamed"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"is_ambiguous"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"is_submodule"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"sections"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-                </span><span class="p">{</span><span class="w">
-                    </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng4"</span><span class="p">,</span><span class="w">
-                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
-                    </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-                        </span><span class="p">{</span><span class="w">
-                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"@@ -0,0 +1 @@"</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"section_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"xinzeng4"</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"section_last_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"section_last_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"section_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"section_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"section_left_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"section_right_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
-                        </span><span class="p">},</span><span class="w">
-                        </span><span class="p">{</span><span class="w">
-                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">-1</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
-                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"+111112222"</span><span class="w">
-                        </span><span class="p">}</span><span class="w">
-                    </span><span class="p">]</span><span class="w">
-                </span><span class="p">}</span><span class="w">
-            </span><span class="p">],</span><span class="w">
-            </span><span class="nl">"is_incomplete"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-            </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
         </span><span class="p">}</span><span class="w">
     </span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
@@ -9965,17 +9922,19 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 <aside class="success">
   Success Data.
 </aside>
-<h2 id='webhooks'>获取仓库webhooks列表</h2>
-<p>获取仓库webhooks列表</p>
+<h2 id='blame-2'>获取比较提交blame</h2>
+<p>根据分支名、标签、commit ID来获取代码对比blame</p>
 
 <blockquote>
 <p>示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
-http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
+<span class="nt">-d</span> <span class="s2">"from=hh_ceshi"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"to=master"</span> <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/compare.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-23'>HTTP 请求</h3>
-<p><code>GET /api/v1/:owner/:repo/webhooks.json</code></p>
+<p><code>GET /api/v1/:owner/:repo/compare.json</code></p>
 <h3 id='2eb6f47757-23'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -10000,6 +9959,20 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <td>string</td>
 <td>项目标识identifier</td>
 </tr>
+<tr>
+<td>from</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>源分支、标签、commitID</td>
+</tr>
+<tr>
+<td>to</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>目标分支、标签、commitID</td>
+</tr>
 </tbody></table>
 <h3 id='7447e4874e-23'>返回字段说明:</h3>
 <table><thead>
@@ -10010,6 +9983,318 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </tr>
 </thead><tbody>
 <tr>
+<td>commits_count</td>
+<td>int</td>
+<td>提交数量</td>
+</tr>
+<tr>
+<td>commits.branch</td>
+<td>string</td>
+<td>提交分支</td>
+</tr>
+<tr>
+<td>commits.author</td>
+<td>object</td>
+<td>提交作者</td>
+</tr>
+<tr>
+<td>commits.committer</td>
+<td>object</td>
+<td>提交者</td>
+</tr>
+<tr>
+<td>commits.commit_message</td>
+<td>string</td>
+<td>提交信息</td>
+</tr>
+<tr>
+<td>commits.sha</td>
+<td>string</td>
+<td>提交ID</td>
+</tr>
+<tr>
+<td>commits.parent_shas</td>
+<td>array</td>
+<td>提交父节点ID</td>
+</tr>
+<tr>
+<td>diff.file_nums</td>
+<td>int</td>
+<td>文件数量</td>
+</tr>
+<tr>
+<td>diff.total_addition</td>
+<td>int</td>
+<td>新增行数</td>
+</tr>
+<tr>
+<td>diff.total_deletion</td>
+<td>int</td>
+<td>删除行数</td>
+</tr>
+<tr>
+<td>diff.files.name</td>
+<td>string</td>
+<td>文件名称</td>
+</tr>
+<tr>
+<td>diff.files.oldname</td>
+<td>string</td>
+<td>文件修改前名称</td>
+</tr>
+<tr>
+<td>diff.files.addition</td>
+<td>int</td>
+<td>文件新增行数</td>
+</tr>
+<tr>
+<td>diff.files.deletion</td>
+<td>int</td>
+<td>文件删除行数</td>
+</tr>
+<tr>
+<td>diff.files.type</td>
+<td>int</td>
+<td>文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制</td>
+</tr>
+<tr>
+<td>diff.files.is_created</td>
+<td>bool</td>
+<td>是否为新建文件</td>
+</tr>
+<tr>
+<td>diff.files.is_deleted</td>
+<td>bool</td>
+<td>是否为删除文件</td>
+</tr>
+<tr>
+<td>diff.files.is_bin</td>
+<td>bool</td>
+<td>是否为二进制文件</td>
+</tr>
+<tr>
+<td>diff.files.is_lfs_file</td>
+<td>bool</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.is_renamed</td>
+<td>bool</td>
+<td>是否重命名</td>
+</tr>
+<tr>
+<td>diff.files.is_ambiguous</td>
+<td>bool</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.is_submodule</td>
+<td>bool</td>
+<td>是否为子模块</td>
+</tr>
+<tr>
+<td>diff.files.sections.file_name</td>
+<td>string</td>
+<td>文件名称</td>
+</tr>
+<tr>
+<td>diff.files.sections.name</td>
+<td>string</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.left_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.right_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.match</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.type</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.content</td>
+<td>string</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.section_path</td>
+<td>string</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.section_last_left_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.section_last_right_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.section_left_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.section_right_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.section_left_hunk_size</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>diff.files.sections.lines.section_right_hunk_size</td>
+<td>int</td>
+<td></td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"commits_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"last_commit_sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"80dd40214a58622312393b2ae693756a4781fab2"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commits"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"committer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"branch"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"commit_message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"x拟增</span><span class="se">\n\n</span><span class="s2">Signed-off-by: yystopf &lt;yystopf@163.com&gt;"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"7e4d8bb3c28e24d4cd6b205f2eed32513e937524"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"parent_shas"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"diff"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"file_nums"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"total_addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"total_deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"files"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+            </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi123"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"oldname"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi123"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_created"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_deleted"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_bin"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_lfs_file"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_renamed"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_ambiguous"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_submodule"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"sections"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                    </span><span class="p">{</span><span class="w">
+                        </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi123"</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                            </span><span class="p">{</span><span class="w">
+                                </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"@@ -0,0 +1 @@"</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"section_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi123"</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"section_last_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"section_last_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"section_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"section_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"section_left_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"section_right_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+                            </span><span class="p">},</span><span class="w">
+                            </span><span class="p">{</span><span class="w">
+                                </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">-1</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                                </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"+1111122222"</span><span class="w">
+                            </span><span class="p">}</span><span class="w">
+                        </span><span class="p">]</span><span class="w">
+                    </span><span class="p">}</span><span class="w">
+                </span><span class="p">],</span><span class="w">
+                </span><span class="nl">"is_incomplete"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
+            </span><span class="p">}</span><span class="w">
+        </span><span class="p">]</span><span class="w">
+    </span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='webhooks'>获取仓库webhooks列表</h2>
+<p>获取仓库webhooks列表</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
+<p><code>GET /api/v1/:owner/:repo/webhooks.json</code></p>
+<h3 id='2eb6f47757-24'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-24'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
 <td>id</td>
 <td>int</td>
 <td>id</td>
@@ -10094,9 +10379,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-24'>请求参数:</h3>
+<h3 id='2eb6f47757-25'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10128,7 +10413,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-24'>返回字段说明:</h3>
+<h3 id='7447e4874e-25'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10251,214 +10536,8 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
-<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-25'>请求参数:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>必选</th>
-<th>默认</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>owner</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>用户登录名</td>
-</tr>
-<tr>
-<td>repo</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>项目标识identifier</td>
-</tr>
-<tr>
-<td>webhook.url</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>目标url</td>
-</tr>
-<tr>
-<td>webhook.http_method</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>http方法, POST和GET</td>
-</tr>
-<tr>
-<td>webhook.content_type</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>webhook.secret</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>密钥文本</td>
-</tr>
-<tr>
-<td>webhook.active</td>
-<td>是</td>
-<td></td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>webhook.branch_filter</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>分支过滤</td>
-</tr>
-<tr>
-<td>webhook.events</td>
-<td>否</td>
-<td></td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-</tbody></table>
-
-<p>触发事件字段说明 </p>
-
-<table><thead>
-<tr>
-<th>参数</th>
-<th>含义</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>create</td>
-<td>创建分支或标签</td>
-</tr>
-<tr>
-<td>delete</td>
-<td>分支或标签删除</td>
-</tr>
-<tr>
-<td>push</td>
-<td>git仓库推送</td>
-</tr>
-<tr>
-<td>pull_request</td>
-<td>合并请求</td>
-</tr>
-<tr>
-<td>pull_request_assign</td>
-<td>合并请求被指派</td>
-</tr>
-<tr>
-<td>pull_request_review_approved</td>
-<td>合并请求被批准</td>
-</tr>
-<tr>
-<td>pull_request_review_rejected</td>
-<td>合并请求被拒绝</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>请求的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-25'>返回字段说明:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>id</td>
-<td>int</td>
-<td>id</td>
-</tr>
-<tr>
-<td>url</td>
-<td>string</td>
-<td>地址</td>
-</tr>
-<tr>
-<td>content_type</td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>is_active</td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>type</td>
-<td>string</td>
-<td>类型</td>
-</tr>
-<tr>
-<td>events</td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-<tr>
-<td>create_time</td>
-<td>string</td>
-<td>创建时间</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>返回的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
-    </span><span class="p">],</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div>
-<aside class="success">
-  Success Data.
-</aside>
-<h2 id='webhook-3'>更新仓库webhook</h2>
-<p>更新仓库webhook</p>
-
-<blockquote>
-<p>示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
-http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-26'>HTTP 请求</h3>
-<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
 <h3 id='2eb6f47757-26'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -10484,13 +10563,6 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>项目标识identifier</td>
 </tr>
 <tr>
-<td>id</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>webhook id</td>
-</tr>
-<tr>
 <td>webhook.url</td>
 <td>是</td>
 <td></td>
@@ -10592,6 +10664,219 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h3 id='7447e4874e-26'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>id</td>
+</tr>
+<tr>
+<td>url</td>
+<td>string</td>
+<td>地址</td>
+</tr>
+<tr>
+<td>content_type</td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>is_active</td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>type</td>
+<td>string</td>
+<td>类型</td>
+</tr>
+<tr>
+<td>events</td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+<tr>
+<td>create_time</td>
+<td>string</td>
+<td>创建时间</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='webhook-3'>更新仓库webhook</h2>
+<p>更新仓库webhook</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
+<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<h3 id='2eb6f47757-27'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>id</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>webhook id</td>
+</tr>
+<tr>
+<td>webhook.url</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>目标url</td>
+</tr>
+<tr>
+<td>webhook.http_method</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>http方法, POST和GET</td>
+</tr>
+<tr>
+<td>webhook.content_type</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>webhook.secret</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>密钥文本</td>
+</tr>
+<tr>
+<td>webhook.active</td>
+<td>是</td>
+<td></td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>webhook.branch_filter</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>分支过滤</td>
+</tr>
+<tr>
+<td>webhook.events</td>
+<td>否</td>
+<td></td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+</tbody></table>
+
+<p>触发事件字段说明 </p>
+
+<table><thead>
+<tr>
+<th>参数</th>
+<th>含义</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>create</td>
+<td>创建分支或标签</td>
+</tr>
+<tr>
+<td>delete</td>
+<td>分支或标签删除</td>
+</tr>
+<tr>
+<td>push</td>
+<td>git仓库推送</td>
+</tr>
+<tr>
+<td>pull_request</td>
+<td>合并请求</td>
+</tr>
+<tr>
+<td>pull_request_assign</td>
+<td>合并请求被指派</td>
+</tr>
+<tr>
+<td>pull_request_review_approved</td>
+<td>合并请求被批准</td>
+</tr>
+<tr>
+<td>pull_request_review_rejected</td>
+<td>合并请求被拒绝</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h3 id='7447e4874e-27'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -10626,9 +10911,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-28'>HTTP 请求</h3>
 <p><code>DELETE /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-27'>请求参数:</h3>
+<h3 id='2eb6f47757-28'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10660,7 +10945,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>webhook id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-27'>返回字段说明:</h3>
+<h3 id='7447e4874e-28'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -10681,9 +10966,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3/hooktasks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-28'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-29'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id/hooktasks.json</code></p>
-<h3 id='2eb6f47757-28'>请求参数:</h3>
+<h3 id='2eb6f47757-29'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10715,7 +11000,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-28'>返回字段说明:</h3>
+<h3 id='7447e4874e-29'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10952,9 +11237,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks/3/tests.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-29'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-30'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/webhooks/:id/tests.json</code></p>
-<h3 id='2eb6f47757-29'>请求参数:</h3>
+<h3 id='2eb6f47757-30'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10986,7 +11271,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-29'>返回字段说明:</h3>
+<h3 id='7447e4874e-30'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>

From 274cd81655ce8f7356db88c44e5fe3f25279d5b6 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 19 Jul 2022 10:41:25 +0800
Subject: [PATCH 116/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96commit=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |   2 +-
 .../api/v1/projects/commits_controller.rb     |   7 +-
 .../slate/source/includes/_repositories.md    |  83 +++
 .../api/v1/projects/commits/list_service.rb   |  38 ++
 .../v1/projects/commits/index.json.jbuilder   |  17 +
 config/routes/api.rb                          |   2 +-
 public/docs/api.html                          | 632 +++++++++++-------
 7 files changed, 543 insertions(+), 238 deletions(-)
 create mode 100644 app/services/api/v1/projects/commits/list_service.rb
 create mode 100644 app/views/api/v1/projects/commits/index.json.jbuilder

diff --git a/Gemfile b/Gemfile
index 37687e78..a4c7c241 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.9.4'
\ No newline at end of file
+gem 'gitea-client', '~> 0.10.1'
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/commits_controller.rb b/app/controllers/api/v1/projects/commits_controller.rb
index 873dd4d9..a1545ae6 100644
--- a/app/controllers/api/v1/projects/commits_controller.rb
+++ b/app/controllers/api/v1/projects/commits_controller.rb
@@ -1,5 +1,10 @@
 class Api::V1::Projects::CommitsController < Api::V1::BaseController 
-  before_action :require_public_and_member_above, only: [:diff]
+  before_action :require_public_and_member_above, only: [:index, :diff]
+
+  def index 
+    @result_object = Api::V1::Projects::Commits::ListService.call(@project, {page: page, limit: limit, sha: params[:sha]}, current_user&.gitea_token)
+    puts @result_object
+  end
 
   def diff 
     @result_object = Api::V1::Projects::Commits::DiffService.call(@project, params[:sha], current_user&.gitea_token)
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index 2b3ca132..c760fc62 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -1413,6 +1413,89 @@ await octokit.request('GET /api/v1/yystopf/csfjkkj/git/blobs/80dd40214a586223123
   Success Data.
 </aside>
 
+## 获取仓库提交列表
+根据分支名、标签、commit ID来获取提交列表
+
+> 示例:
+
+```shell
+curl -X GET \
+-d "sha=master" \
+-d "page=1" \
+-d "limit=1" \
+http://localhost:3000/api/v1/yystopf/csfjkkj/commits.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/yystopf/csfjkkj/commits.json')
+```
+
+### HTTP 请求
+`GET /api/v1/:owner/:repo/commits.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner|是|  | string |用户登录名  |
+|repo |是|  | string |项目标识identifier  |
+|sha  |否|  | string |分支名、标签名或Commit ID|
+|page |否|  | int    |页码|
+|limit|否|  | int    |每页数量|
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|total_count|int|提交总数|
+|commits.sha|string|提交ID|
+|commits.author|object|提交作者|
+|commits.committer|object|提交者|
+|commits.commit_message|string|提交信息|
+|commits.parent_shas|array|提交父节点ID|
+|commits.files|array|提交文件|
+|commits.commit_date|string|提交日期|
+|commits.commit_time|string|提交时间|
+|commits.branch|string|提交分支|
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 12,
+    "commits": [
+        {
+            "sha": "86c62a1e91c07b58b8aa6c89b94856d89c0f7e55",
+            "author": {
+                "id": null,
+                "login": "viletyy",
+                "name": "viletyy",
+                "type": null,
+                "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+            },
+            "committer": {
+                "id": null,
+                "login": "viletyy",
+                "name": "viletyy",
+                "type": null,
+                "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+            },
+            "commit_message": "fix\n",
+            "parent_shas": [
+                "411e4d259785241f1bd14faf99ca24fd1b802f2a"
+            ],
+            "files": [
+                "hd.txt"
+            ],
+            "commit_date": "2022-07-05",
+            "commit_time": "2022-07-05 11:00:45",
+            "branch": "hh_ceshi"
+        }
+    ]
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
+
 ## 获取单个提交的blame信息
 根据commit ID获取blame信息
 
diff --git a/app/services/api/v1/projects/commits/list_service.rb b/app/services/api/v1/projects/commits/list_service.rb
new file mode 100644
index 00000000..17818554
--- /dev/null
+++ b/app/services/api/v1/projects/commits/list_service.rb
@@ -0,0 +1,38 @@
+class Api::V1::Projects::Commits::ListService < ApplicationService 
+
+  attr_reader :project, :sha, :page, :limit, :owner, :repo, :token
+  attr_accessor :gitea_data 
+
+  def initialize(project, params, token=nil) 
+    @project = project 
+    @sha = params[:sha]
+    @page = params[:page] || 1
+    @limit = params[:limit] || 15
+    @owner = project&.owner.login
+    @repo = project&.identifier
+    @token = token
+  end
+
+  def call 
+    load_gitea_data 
+
+    gitea_data
+  end
+
+  private 
+  def request_params 
+    param = {
+      access_token: token,
+      page: page, 
+      limit: limit
+    }
+    param.merge!(sha: sha) if sha.present?
+
+    param
+  end
+
+  def load_gitea_data 
+    @gitea_data = $gitea_client.get_repos_commits_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/commits/index.json.jbuilder b/app/views/api/v1/projects/commits/index.json.jbuilder
new file mode 100644
index 00000000..aa13845a
--- /dev/null
+++ b/app/views/api/v1/projects/commits/index.json.jbuilder
@@ -0,0 +1,17 @@
+json.total_count @result_object[:total_data].to_i
+json.commits @result_object[:data].each do |commit| 
+  json.sha commit['sha']
+  json.author do 
+    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(commit['commit']['author']), name: commit['commit']['author']['name'] }
+  end
+  
+  json.committer do 
+    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name'] }
+  end
+  json.commit_message commit['commit']['message']
+  json.parent_shas commit['parents'].map{|x|x['sha']}
+  json.files commit['files'].map{|f|f['filename']}
+  json.commit_date commit['commit_date']
+  json.commit_time commit['commit']['committer']['date'].to_time.strftime("%Y-%m-%d %H:%M:%S")
+  json.branch commit['branch']
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index fc07a986..9c71ea80 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -32,7 +32,7 @@ defaults format: :json do
                 get :all 
               end
             end
-
+            resources :commits, only: [:index]
             get '/commits/:sha/diff', to: 'commits#diff'
             get '/git/blobs/:sha', to: 'git#blobs'
             get '/git/trees/:sha', to: 'git#trees'
diff --git a/public/docs/api.html b/public/docs/api.html
index 505ab44c..f3e56574 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -553,6 +553,9 @@
                   <li>
                     <a href="#blobs" class="toc-h2 toc-link" data-title="获取仓库blobs内容">获取仓库blobs内容</a>
                   </li>
+                  <li>
+                    <a href="#7fa60ec6e9" class="toc-h2 toc-link" data-title="获取仓库提交列表">获取仓库提交列表</a>
+                  </li>
                   <li>
                     <a href="#blame" class="toc-h2 toc-link" data-title="获取单个提交的blame信息">获取单个提交的blame信息</a>
                   </li>
@@ -9665,6 +9668,165 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 <aside class="success">
   Success Data.
 </aside>
+<h2 id='7fa60ec6e9'>获取仓库提交列表</h2>
+<p>根据分支名、标签、commit ID来获取提交列表</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"sha=master"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"page=1"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"limit=1"</span> <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/csfjkkj/commits.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/commits.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
+<p><code>GET /api/v1/:owner/:repo/commits.json</code></p>
+<h3 id='2eb6f47757-22'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>sha</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>分支名、标签名或Commit ID</td>
+</tr>
+<tr>
+<td>page</td>
+<td>否</td>
+<td></td>
+<td>int</td>
+<td>页码</td>
+</tr>
+<tr>
+<td>limit</td>
+<td>否</td>
+<td></td>
+<td>int</td>
+<td>每页数量</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-22'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>total_count</td>
+<td>int</td>
+<td>提交总数</td>
+</tr>
+<tr>
+<td>commits.sha</td>
+<td>string</td>
+<td>提交ID</td>
+</tr>
+<tr>
+<td>commits.author</td>
+<td>object</td>
+<td>提交作者</td>
+</tr>
+<tr>
+<td>commits.committer</td>
+<td>object</td>
+<td>提交者</td>
+</tr>
+<tr>
+<td>commits.commit_message</td>
+<td>string</td>
+<td>提交信息</td>
+</tr>
+<tr>
+<td>commits.parent_shas</td>
+<td>array</td>
+<td>提交父节点ID</td>
+</tr>
+<tr>
+<td>commits.files</td>
+<td>array</td>
+<td>提交文件</td>
+</tr>
+<tr>
+<td>commits.commit_date</td>
+<td>string</td>
+<td>提交日期</td>
+</tr>
+<tr>
+<td>commits.commit_time</td>
+<td>string</td>
+<td>提交时间</td>
+</tr>
+<tr>
+<td>commits.branch</td>
+<td>string</td>
+<td>提交分支</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">12</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commits"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"86c62a1e91c07b58b8aa6c89b94856d89c0f7e55"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"committer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"commit_message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fix</span><span class="se">\n</span><span class="s2">"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"parent_shas"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="s2">"411e4d259785241f1bd14faf99ca24fd1b802f2a"</span><span class="w">
+            </span><span class="p">],</span><span class="w">
+            </span><span class="nl">"files"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="s2">"hd.txt"</span><span class="w">
+            </span><span class="p">],</span><span class="w">
+            </span><span class="nl">"commit_date"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-05"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"commit_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-05 11:00:45"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"branch"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hh_ceshi"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
 <h2 id='blame'>获取单个提交的blame信息</h2>
 <p>根据commit ID获取blame信息</p>
 
@@ -9673,9 +9835,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393b2ae693756a4781fab2/diff.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393b2ae693756a4781fab2/diff.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-23'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/commits/:sha/diff.json</code></p>
-<h3 id='2eb6f47757-22'>请求参数:</h3>
+<h3 id='2eb6f47757-23'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9707,7 +9869,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 <td>提交记录id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-22'>返回字段说明:</h3>
+<h3 id='7447e4874e-23'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9933,9 +10095,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 <span class="nt">-d</span> <span class="s2">"to=master"</span> <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/compare.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-23'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/compare.json</code></p>
-<h3 id='2eb6f47757-23'>请求参数:</h3>
+<h3 id='2eb6f47757-24'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9974,7 +10136,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <td>目标分支、标签、commitID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-23'>返回字段说明:</h3>
+<h3 id='7447e4874e-24'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10259,9 +10421,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-24'>请求参数:</h3>
+<h3 id='2eb6f47757-25'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10286,7 +10448,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-24'>返回字段说明:</h3>
+<h3 id='7447e4874e-25'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10379,9 +10541,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-25'>请求参数:</h3>
+<h3 id='2eb6f47757-26'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10413,7 +10575,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-25'>返回字段说明:</h3>
+<h3 id='7447e4874e-26'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10536,214 +10698,8 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
-<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-26'>请求参数:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>必选</th>
-<th>默认</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>owner</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>用户登录名</td>
-</tr>
-<tr>
-<td>repo</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>项目标识identifier</td>
-</tr>
-<tr>
-<td>webhook.url</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>目标url</td>
-</tr>
-<tr>
-<td>webhook.http_method</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>http方法, POST和GET</td>
-</tr>
-<tr>
-<td>webhook.content_type</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>webhook.secret</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>密钥文本</td>
-</tr>
-<tr>
-<td>webhook.active</td>
-<td>是</td>
-<td></td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>webhook.branch_filter</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>分支过滤</td>
-</tr>
-<tr>
-<td>webhook.events</td>
-<td>否</td>
-<td></td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-</tbody></table>
-
-<p>触发事件字段说明 </p>
-
-<table><thead>
-<tr>
-<th>参数</th>
-<th>含义</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>create</td>
-<td>创建分支或标签</td>
-</tr>
-<tr>
-<td>delete</td>
-<td>分支或标签删除</td>
-</tr>
-<tr>
-<td>push</td>
-<td>git仓库推送</td>
-</tr>
-<tr>
-<td>pull_request</td>
-<td>合并请求</td>
-</tr>
-<tr>
-<td>pull_request_assign</td>
-<td>合并请求被指派</td>
-</tr>
-<tr>
-<td>pull_request_review_approved</td>
-<td>合并请求被批准</td>
-</tr>
-<tr>
-<td>pull_request_review_rejected</td>
-<td>合并请求被拒绝</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>请求的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-26'>返回字段说明:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>id</td>
-<td>int</td>
-<td>id</td>
-</tr>
-<tr>
-<td>url</td>
-<td>string</td>
-<td>地址</td>
-</tr>
-<tr>
-<td>content_type</td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>is_active</td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>type</td>
-<td>string</td>
-<td>类型</td>
-</tr>
-<tr>
-<td>events</td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-<tr>
-<td>create_time</td>
-<td>string</td>
-<td>创建时间</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>返回的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
-    </span><span class="p">],</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div>
-<aside class="success">
-  Success Data.
-</aside>
-<h2 id='webhook-3'>更新仓库webhook</h2>
-<p>更新仓库webhook</p>
-
-<blockquote>
-<p>示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
-http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-27'>HTTP 请求</h3>
-<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
 <h3 id='2eb6f47757-27'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -10769,13 +10725,6 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>项目标识identifier</td>
 </tr>
 <tr>
-<td>id</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>webhook id</td>
-</tr>
-<tr>
 <td>webhook.url</td>
 <td>是</td>
 <td></td>
@@ -10877,6 +10826,219 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h3 id='7447e4874e-27'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>id</td>
+</tr>
+<tr>
+<td>url</td>
+<td>string</td>
+<td>地址</td>
+</tr>
+<tr>
+<td>content_type</td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>is_active</td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>type</td>
+<td>string</td>
+<td>类型</td>
+</tr>
+<tr>
+<td>events</td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+<tr>
+<td>create_time</td>
+<td>string</td>
+<td>创建时间</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='webhook-3'>更新仓库webhook</h2>
+<p>更新仓库webhook</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-28'>HTTP 请求</h3>
+<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<h3 id='2eb6f47757-28'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>id</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>webhook id</td>
+</tr>
+<tr>
+<td>webhook.url</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>目标url</td>
+</tr>
+<tr>
+<td>webhook.http_method</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>http方法, POST和GET</td>
+</tr>
+<tr>
+<td>webhook.content_type</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>webhook.secret</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>密钥文本</td>
+</tr>
+<tr>
+<td>webhook.active</td>
+<td>是</td>
+<td></td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>webhook.branch_filter</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>分支过滤</td>
+</tr>
+<tr>
+<td>webhook.events</td>
+<td>否</td>
+<td></td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+</tbody></table>
+
+<p>触发事件字段说明 </p>
+
+<table><thead>
+<tr>
+<th>参数</th>
+<th>含义</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>create</td>
+<td>创建分支或标签</td>
+</tr>
+<tr>
+<td>delete</td>
+<td>分支或标签删除</td>
+</tr>
+<tr>
+<td>push</td>
+<td>git仓库推送</td>
+</tr>
+<tr>
+<td>pull_request</td>
+<td>合并请求</td>
+</tr>
+<tr>
+<td>pull_request_assign</td>
+<td>合并请求被指派</td>
+</tr>
+<tr>
+<td>pull_request_review_approved</td>
+<td>合并请求被批准</td>
+</tr>
+<tr>
+<td>pull_request_review_rejected</td>
+<td>合并请求被拒绝</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h3 id='7447e4874e-28'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -10911,9 +11073,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-28'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-29'>HTTP 请求</h3>
 <p><code>DELETE /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-28'>请求参数:</h3>
+<h3 id='2eb6f47757-29'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10945,7 +11107,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>webhook id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-28'>返回字段说明:</h3>
+<h3 id='7447e4874e-29'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -10966,9 +11128,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3/hooktasks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-29'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-30'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id/hooktasks.json</code></p>
-<h3 id='2eb6f47757-29'>请求参数:</h3>
+<h3 id='2eb6f47757-30'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11000,7 +11162,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-29'>返回字段说明:</h3>
+<h3 id='7447e4874e-30'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11237,9 +11399,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks/3/tests.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-30'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-31'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/webhooks/:id/tests.json</code></p>
-<h3 id='2eb6f47757-30'>请求参数:</h3>
+<h3 id='2eb6f47757-31'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11271,7 +11433,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-30'>返回字段说明:</h3>
+<h3 id='7447e4874e-31'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>

From 1882120df314e4c5147da5d6ff2157cf7446d35a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 19 Jul 2022 11:14:50 +0800
Subject: [PATCH 117/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8D=95=E6=96=87=E4=BB=B6blame=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |   2 +-
 app/controllers/api/v1/projects_controller.rb |   7 +-
 .../slate/source/includes/_repositories.md    | 197 +++++
 app/services/api/v1/projects/blame_service.rb |  38 +
 app/views/api/v1/projects/blame.json.jbuilder |  22 +
 config/routes/api.rb                          |   1 +
 public/docs/api.html                          | 728 ++++++++++++------
 7 files changed, 759 insertions(+), 236 deletions(-)
 create mode 100644 app/services/api/v1/projects/blame_service.rb
 create mode 100644 app/views/api/v1/projects/blame.json.jbuilder

diff --git a/Gemfile b/Gemfile
index a4c7c241..3da6f273 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.10.1'
\ No newline at end of file
+gem 'gitea-client', '~> 0.10.2'
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects_controller.rb b/app/controllers/api/v1/projects_controller.rb
index 0873213d..bc51362a 100644
--- a/app/controllers/api/v1/projects_controller.rb
+++ b/app/controllers/api/v1/projects_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::ProjectsController < Api::V1::BaseController 
-  before_action :require_public_and_member_above, only: [:show, :compare]
+  before_action :require_public_and_member_above, only: [:show, :compare, :blame]
 
   def index 
     render_ok
@@ -12,4 +12,9 @@ class Api::V1::ProjectsController < Api::V1::BaseController
   def compare
     @result_object = Api::V1::Projects::CompareService.call(@project, params[:from], params[:to], current_user&.gitea_token)
   end
+
+  def blame
+    @result_object = Api::V1::Projects::BlameService.call(@project, params[:sha], params[:filepath], current_user&.gitea_token)
+    puts @result_object
+  end
 end
\ No newline at end of file
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index c760fc62..5b506749 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -1614,6 +1614,203 @@ await octokit.request('GET /api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393
   Success Data.
 </aside>
 
+## 获取单个文件的blame信息
+根据分支、标签、commitID获取某个文件的blame信息
+
+> 示例:
+
+```shell
+curl -X GET \
+-d "sha=master" \
+-d "filepath=hd.txt" \
+http://localhost:3000/api/v1/yystopf/csfjkkj/blame.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/yystopf/csfjkkj/blame.json')
+```
+
+### HTTP 请求
+`GET /api/v1/:owner/:repo/blame.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner   |是|  | string |用户登录名  |
+|repo    |是|  | string |项目标识identifier  |
+|sha     |是|  | string |分支、标签或提交记录id  |
+|filepath|是|  | string |文件路径|
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|file_size|int|文件大小|
+|file_name|string|文件名称|
+|num_lines|int|文件总行数|
+|blame_parts.commit|object|提交|
+|blame_parts.current_number|int|当前行数|
+|blame_parts.effect_line|int|影响的行数|
+|blame_parts.lines|array|行内容|
+
+> 返回的JSON示例:
+
+```json
+{
+    "file_size": 32,
+    "file_name": "hd.txt",
+    "num_lines": 12,
+    "blame_parts": [
+        {
+            "commit": {
+                "sha": "40f76e80bf5bc41fcc94c28ca8a6eab506c15215",
+                "author": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "committer": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "commit_message": "fix\n",
+                "authored_time": "2022-07-04 18:41:25",
+                "committed_time": "2022-07-04 18:41:25",
+                "created_time": "2022-07-04 18:41:25"
+            },
+            "current_number": 1,
+            "effect_line": 5,
+            "lines": [
+                "dkfj",
+                "s",
+                "324",
+                "234",
+                "2"
+            ]
+        },
+        {
+            "commit": {
+                "sha": "86c62a1e91c07b58b8aa6c89b94856d89c0f7e55",
+                "author": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "committer": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "commit_message": "fix\n",
+                "authored_time": "2022-07-05 11:00:45",
+                "committed_time": "2022-07-05 11:00:45",
+                "created_time": "2022-07-05 11:00:45"
+            },
+            "current_number": 6,
+            "effect_line": 1,
+            "lines": [
+                "dd"
+            ]
+        },
+        {
+            "commit": {
+                "sha": "40f76e80bf5bc41fcc94c28ca8a6eab506c15215",
+                "author": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "committer": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "commit_message": "fix\n",
+                "authored_time": "2022-07-04 18:41:25",
+                "committed_time": "2022-07-04 18:41:25",
+                "created_time": "2022-07-04 18:41:25"
+            },
+            "current_number": 7,
+            "effect_line": 3,
+            "lines": [
+                "23",
+                "4",
+                "23"
+            ]
+        },
+        {
+            "commit": {
+                "sha": "86c62a1e91c07b58b8aa6c89b94856d89c0f7e55",
+                "author": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "committer": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "commit_message": "fix\n",
+                "authored_time": "2022-07-05 11:00:45",
+                "committed_time": "2022-07-05 11:00:45",
+                "created_time": "2022-07-05 11:00:45"
+            },
+            "current_number": 10,
+            "effect_line": 1,
+            "lines": [
+                "s1"
+            ]
+        },
+        {
+            "commit": {
+                "sha": "40f76e80bf5bc41fcc94c28ca8a6eab506c15215",
+                "author": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "committer": {
+                    "id": null,
+                    "login": "viletyy",
+                    "name": "viletyy",
+                    "type": null,
+                    "image_url": "system/lets/letter_avatars/2/V/39_141_222/120.png"
+                },
+                "commit_message": "fix\n",
+                "authored_time": "2022-07-04 18:41:25",
+                "committed_time": "2022-07-04 18:41:25",
+                "created_time": "2022-07-04 18:41:25"
+            },
+            "current_number": 11,
+            "effect_line": 1,
+            "lines": [
+                ""
+            ]
+        }
+    ]
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
 ## 获取比较提交blame
 根据分支名、标签、commit ID来获取代码对比blame
 
diff --git a/app/services/api/v1/projects/blame_service.rb b/app/services/api/v1/projects/blame_service.rb
new file mode 100644
index 00000000..d419fec1
--- /dev/null
+++ b/app/services/api/v1/projects/blame_service.rb
@@ -0,0 +1,38 @@
+class Api::V1::Projects::BlameService < ApplicationService 
+  include ActiveModel::Model
+
+  attr_reader :project, :sha, :filepath, :owner, :repo, :token 
+  attr_accessor :gitea_data
+
+  validates :sha, :filepath, presence: true
+
+  def initialize(project, sha, filepath, token=nil)
+    @project = project 
+    @owner = project&.owner.login 
+    @repo = project&.identifier 
+    @sha = sha 
+    @filepath = filepath
+    @token = token
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid? 
+    load_gitea_data 
+
+    gitea_data
+  end
+
+  private 
+  def request_params 
+    {
+      access_token: token,
+      sha: sha, 
+      filepath: filepath 
+    }
+  end
+
+  def load_gitea_data 
+    @gitea_data = $gitea_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/views/api/v1/projects/blame.json.jbuilder b/app/views/api/v1/projects/blame.json.jbuilder
new file mode 100644
index 00000000..d2e68953
--- /dev/null
+++ b/app/views/api/v1/projects/blame.json.jbuilder
@@ -0,0 +1,22 @@
+json.file_size @result_object['file_size']
+json.file_name @result_object['file_name']
+json.num_lines @result_object['num_lines']
+json.blame_parts @result_object['blame_parts'] do |part| 
+  json.commit do 
+    json.sha part['commit']['id']
+    json.author do 
+      json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(part['commit']['author']), name: part['commit']['author']['Name'] }
+    end
+    
+    json.committer do 
+      json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(part['commit']['commiter']), name: part['commit']['commiter']['Name'] }
+    end
+    json.commit_message part['commit']['commit_message']
+    json.authored_time part['commit']['authored_time'].to_time.strftime("%Y-%m-%d %H:%M:%S")
+    json.committed_time part['commit']['committed_time'].to_time.strftime("%Y-%m-%d %H:%M:%S")
+    json.created_time part['commit']['created_time'].to_time.strftime("%Y-%m-%d %H:%M:%S")
+  end
+  json.current_number part['current_number']
+  json.effect_line part['effect_line']
+  json.lines part['lines']
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 9c71ea80..6a01d1ab 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -12,6 +12,7 @@ defaults format: :json do
           resource :projects, path: '/', only: [:show, :update, :edit, :destroy] do 
             collection do 
               get :compare
+              get :blame
             end
           end
 
diff --git a/public/docs/api.html b/public/docs/api.html
index f3e56574..0fcb033a 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -560,7 +560,10 @@
                     <a href="#blame" class="toc-h2 toc-link" data-title="获取单个提交的blame信息">获取单个提交的blame信息</a>
                   </li>
                   <li>
-                    <a href="#blame-2" class="toc-h2 toc-link" data-title="获取比较提交blame">获取比较提交blame</a>
+                    <a href="#blame-2" class="toc-h2 toc-link" data-title="获取单个文件的blame信息">获取单个文件的blame信息</a>
+                  </li>
+                  <li>
+                    <a href="#blame-3" class="toc-h2 toc-link" data-title="获取比较提交blame">获取比较提交blame</a>
                   </li>
                   <li>
                     <a href="#webhooks" class="toc-h2 toc-link" data-title="获取仓库webhooks列表">获取仓库webhooks列表</a>
@@ -10084,7 +10087,264 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/commits.json
 <aside class="success">
   Success Data.
 </aside>
-<h2 id='blame-2'>获取比较提交blame</h2>
+<h2 id='blame-2'>获取单个文件的blame信息</h2>
+<p>根据分支、标签、commitID获取某个文件的blame信息</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"sha=master"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"filepath=hd.txt"</span> <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/csfjkkj/blame.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/blame.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
+<p><code>GET /api/v1/:owner/:repo/blame.json</code></p>
+<h3 id='2eb6f47757-24'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>sha</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>分支、标签或提交记录id</td>
+</tr>
+<tr>
+<td>filepath</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>文件路径</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-24'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>file_size</td>
+<td>int</td>
+<td>文件大小</td>
+</tr>
+<tr>
+<td>file_name</td>
+<td>string</td>
+<td>文件名称</td>
+</tr>
+<tr>
+<td>num_lines</td>
+<td>int</td>
+<td>文件总行数</td>
+</tr>
+<tr>
+<td>blame_parts.commit</td>
+<td>object</td>
+<td>提交</td>
+</tr>
+<tr>
+<td>blame_parts.current_number</td>
+<td>int</td>
+<td>当前行数</td>
+</tr>
+<tr>
+<td>blame_parts.effect_line</td>
+<td>int</td>
+<td>影响的行数</td>
+</tr>
+<tr>
+<td>blame_parts.lines</td>
+<td>array</td>
+<td>行内容</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"file_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">32</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hd.txt"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"num_lines"</span><span class="p">:</span><span class="w"> </span><span class="mi">12</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"blame_parts"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"commit"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"40f76e80bf5bc41fcc94c28ca8a6eab506c15215"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"committer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"commit_message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fix</span><span class="se">\n</span><span class="s2">"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"authored_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-04 18:41:25"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"committed_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-04 18:41:25"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"created_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-04 18:41:25"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"current_number"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"effect_line"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="s2">"dkfj"</span><span class="p">,</span><span class="w">
+                </span><span class="s2">"s"</span><span class="p">,</span><span class="w">
+                </span><span class="s2">"324"</span><span class="p">,</span><span class="w">
+                </span><span class="s2">"234"</span><span class="p">,</span><span class="w">
+                </span><span class="s2">"2"</span><span class="w">
+            </span><span class="p">]</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"commit"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"86c62a1e91c07b58b8aa6c89b94856d89c0f7e55"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"committer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"commit_message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fix</span><span class="se">\n</span><span class="s2">"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"authored_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-05 11:00:45"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"committed_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-05 11:00:45"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"created_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-05 11:00:45"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"current_number"</span><span class="p">:</span><span class="w"> </span><span class="mi">6</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"effect_line"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="s2">"dd"</span><span class="w">
+            </span><span class="p">]</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"commit"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"40f76e80bf5bc41fcc94c28ca8a6eab506c15215"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"committer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"commit_message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fix</span><span class="se">\n</span><span class="s2">"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"authored_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-04 18:41:25"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"committed_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-04 18:41:25"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"created_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-04 18:41:25"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"current_number"</span><span class="p">:</span><span class="w"> </span><span class="mi">7</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"effect_line"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="s2">"23"</span><span class="p">,</span><span class="w">
+                </span><span class="s2">"4"</span><span class="p">,</span><span class="w">
+                </span><span class="s2">"23"</span><span class="w">
+            </span><span class="p">]</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"commit"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"86c62a1e91c07b58b8aa6c89b94856d89c0f7e55"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"committer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"commit_message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fix</span><span class="se">\n</span><span class="s2">"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"authored_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-05 11:00:45"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"committed_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-05 11:00:45"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"created_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-05 11:00:45"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"current_number"</span><span class="p">:</span><span class="w"> </span><span class="mi">10</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"effect_line"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="s2">"s1"</span><span class="w">
+            </span><span class="p">]</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"commit"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"40f76e80bf5bc41fcc94c28ca8a6eab506c15215"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"committer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"viletyy"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/V/39_141_222/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"commit_message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fix</span><span class="se">\n</span><span class="s2">"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"authored_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-04 18:41:25"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"committed_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-04 18:41:25"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"created_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-04 18:41:25"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"current_number"</span><span class="p">:</span><span class="w"> </span><span class="mi">11</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"effect_line"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="s2">""</span><span class="w">
+            </span><span class="p">]</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='blame-3'>获取比较提交blame</h2>
 <p>根据分支名、标签、commit ID来获取代码对比blame</p>
 
 <blockquote>
@@ -10095,9 +10355,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/commits.json
 <span class="nt">-d</span> <span class="s2">"to=master"</span> <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/compare.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/compare.json</code></p>
-<h3 id='2eb6f47757-24'>请求参数:</h3>
+<h3 id='2eb6f47757-25'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10136,7 +10396,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <td>目标分支、标签、commitID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-24'>返回字段说明:</h3>
+<h3 id='7447e4874e-25'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10421,9 +10681,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-25'>请求参数:</h3>
+<h3 id='2eb6f47757-26'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10448,7 +10708,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-25'>返回字段说明:</h3>
+<h3 id='7447e4874e-26'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10541,9 +10801,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-26'>请求参数:</h3>
+<h3 id='2eb6f47757-27'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10575,7 +10835,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-26'>返回字段说明:</h3>
+<h3 id='7447e4874e-27'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10698,214 +10958,8 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
-<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-27'>请求参数:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>必选</th>
-<th>默认</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>owner</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>用户登录名</td>
-</tr>
-<tr>
-<td>repo</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>项目标识identifier</td>
-</tr>
-<tr>
-<td>webhook.url</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>目标url</td>
-</tr>
-<tr>
-<td>webhook.http_method</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>http方法, POST和GET</td>
-</tr>
-<tr>
-<td>webhook.content_type</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>webhook.secret</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>密钥文本</td>
-</tr>
-<tr>
-<td>webhook.active</td>
-<td>是</td>
-<td></td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>webhook.branch_filter</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>分支过滤</td>
-</tr>
-<tr>
-<td>webhook.events</td>
-<td>否</td>
-<td></td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-</tbody></table>
-
-<p>触发事件字段说明 </p>
-
-<table><thead>
-<tr>
-<th>参数</th>
-<th>含义</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>create</td>
-<td>创建分支或标签</td>
-</tr>
-<tr>
-<td>delete</td>
-<td>分支或标签删除</td>
-</tr>
-<tr>
-<td>push</td>
-<td>git仓库推送</td>
-</tr>
-<tr>
-<td>pull_request</td>
-<td>合并请求</td>
-</tr>
-<tr>
-<td>pull_request_assign</td>
-<td>合并请求被指派</td>
-</tr>
-<tr>
-<td>pull_request_review_approved</td>
-<td>合并请求被批准</td>
-</tr>
-<tr>
-<td>pull_request_review_rejected</td>
-<td>合并请求被拒绝</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>请求的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-27'>返回字段说明:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>id</td>
-<td>int</td>
-<td>id</td>
-</tr>
-<tr>
-<td>url</td>
-<td>string</td>
-<td>地址</td>
-</tr>
-<tr>
-<td>content_type</td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>is_active</td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>type</td>
-<td>string</td>
-<td>类型</td>
-</tr>
-<tr>
-<td>events</td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-<tr>
-<td>create_time</td>
-<td>string</td>
-<td>创建时间</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>返回的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
-    </span><span class="p">],</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div>
-<aside class="success">
-  Success Data.
-</aside>
-<h2 id='webhook-3'>更新仓库webhook</h2>
-<p>更新仓库webhook</p>
-
-<blockquote>
-<p>示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
-http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-28'>HTTP 请求</h3>
-<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
 <h3 id='2eb6f47757-28'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -10931,13 +10985,6 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>项目标识identifier</td>
 </tr>
 <tr>
-<td>id</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>webhook id</td>
-</tr>
-<tr>
 <td>webhook.url</td>
 <td>是</td>
 <td></td>
@@ -11039,6 +11086,219 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h3 id='7447e4874e-28'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>id</td>
+</tr>
+<tr>
+<td>url</td>
+<td>string</td>
+<td>地址</td>
+</tr>
+<tr>
+<td>content_type</td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>is_active</td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>type</td>
+<td>string</td>
+<td>类型</td>
+</tr>
+<tr>
+<td>events</td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+<tr>
+<td>create_time</td>
+<td>string</td>
+<td>创建时间</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='webhook-3'>更新仓库webhook</h2>
+<p>更新仓库webhook</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-29'>HTTP 请求</h3>
+<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<h3 id='2eb6f47757-29'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>id</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>webhook id</td>
+</tr>
+<tr>
+<td>webhook.url</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>目标url</td>
+</tr>
+<tr>
+<td>webhook.http_method</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>http方法, POST和GET</td>
+</tr>
+<tr>
+<td>webhook.content_type</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>webhook.secret</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>密钥文本</td>
+</tr>
+<tr>
+<td>webhook.active</td>
+<td>是</td>
+<td></td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>webhook.branch_filter</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>分支过滤</td>
+</tr>
+<tr>
+<td>webhook.events</td>
+<td>否</td>
+<td></td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+</tbody></table>
+
+<p>触发事件字段说明 </p>
+
+<table><thead>
+<tr>
+<th>参数</th>
+<th>含义</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>create</td>
+<td>创建分支或标签</td>
+</tr>
+<tr>
+<td>delete</td>
+<td>分支或标签删除</td>
+</tr>
+<tr>
+<td>push</td>
+<td>git仓库推送</td>
+</tr>
+<tr>
+<td>pull_request</td>
+<td>合并请求</td>
+</tr>
+<tr>
+<td>pull_request_assign</td>
+<td>合并请求被指派</td>
+</tr>
+<tr>
+<td>pull_request_review_approved</td>
+<td>合并请求被批准</td>
+</tr>
+<tr>
+<td>pull_request_review_rejected</td>
+<td>合并请求被拒绝</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h3 id='7447e4874e-29'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -11073,9 +11333,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-29'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-30'>HTTP 请求</h3>
 <p><code>DELETE /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-29'>请求参数:</h3>
+<h3 id='2eb6f47757-30'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11107,7 +11367,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>webhook id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-29'>返回字段说明:</h3>
+<h3 id='7447e4874e-30'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -11128,9 +11388,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3/hooktasks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-30'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-31'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id/hooktasks.json</code></p>
-<h3 id='2eb6f47757-30'>请求参数:</h3>
+<h3 id='2eb6f47757-31'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11162,7 +11422,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-30'>返回字段说明:</h3>
+<h3 id='7447e4874e-31'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11399,9 +11659,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks/3/tests.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-31'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-32'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/webhooks/:id/tests.json</code></p>
-<h3 id='2eb6f47757-31'>请求参数:</h3>
+<h3 id='2eb6f47757-32'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11433,7 +11693,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-31'>返回字段说明:</h3>
+<h3 id='7447e4874e-32'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>

From b386dc51e4bed47a1fd308d206704634cc9c3555 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Tue, 19 Jul 2022 14:56:02 +0800
Subject: [PATCH 118/208] =?UTF-8?q?fixed=20=E5=90=8E=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BC=98=E5=8C=96,7=E5=A4=A9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=B2=BE=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/dashboards_controller.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb
index 5ac1508d..fac44cca 100644
--- a/app/controllers/admins/dashboards_controller.rb
+++ b/app/controllers/admins/dashboards_controller.rb
@@ -17,9 +17,9 @@ class Admins::DashboardsController < Admins::BaseController
     @month_new_user_count = User.where(created_on: current_month).count
 
     # 活跃项目数
-    day_project_ids = CommitLog.where(created_at: today).pluck(:project_id).uniq
-    weekly_project_ids = CommitLog.where(created_at: current_week).pluck(:project_id).uniq
-    month_project_ids = CommitLog.where(created_at: current_month).pluck(:project_id).uniq
+    day_project_ids = (CommitLog.where(created_at: today).pluck(:project_id).uniq + Issue.where(created_on: today).pluck(:project_id).uniq).uniq
+    weekly_project_ids = (CommitLog.where(created_at: current_week).pluck(:project_id).uniq + Issue.where(created_on: current_week).pluck(:project_id).uniq).uniq
+    month_project_ids = (CommitLog.where(created_at: current_month).pluck(:project_id).uniq + Issue.where(created_on: current_month).pluck(:project_id).uniq).uniq
     @day_active_project_count = Project.where(updated_on: today).or(Project.where(id: day_project_ids)).count
     @weekly_active_project_count = Project.where(updated_on: current_week).or(Project.where(id: weekly_project_ids)).count
     @month_active_project_count = Project.where(updated_on: current_month).or(Project.where(id: month_project_ids)).count
@@ -65,14 +65,14 @@ class Admins::DashboardsController < Admins::BaseController
   end
 
   def current_week
-    7.days.ago.beginning_of_day..Time.now.end_of_day
+    7.days.ago.end_of_day..Time.now.end_of_day
   end
 
   def current_month
-    30.days.ago.beginning_of_day..Time.now.end_of_day
+    30.days.ago.end_of_day..Time.now.end_of_day
   end
 
   def pre_week
-    14.days.ago.beginning_of_day..7.days.ago.beginning_of_day
+    14.days.ago.end_of_day..7.days.ago.end_of_day
   end
 end
\ No newline at end of file

From 25afedcdfd941a01da0d1f7c75c94148d676f1b6 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 19 Jul 2022 16:47:01 +0800
Subject: [PATCH 119/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=9B=B4=E6=94=B9=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/contents_controller.rb    |  13 +
 .../slate/source/includes/_repositories.md    | 132 +++
 .../v1/projects/branches/create_service.rb    |   2 +-
 .../projects/contents/batch_create_service.rb |  91 ++
 app/views/api/v1/projects/blame.json.jbuilder |   6 +-
 .../_simple_gitea_detail.json.jbuilder        |  10 +
 .../v1/projects/commits/index.json.jbuilder   |   2 +-
 .../v1/projects/contents/batch.json.jbuilder  |  14 +
 config/routes/api.rb                          |   6 +
 public/docs/api.html                          | 801 ++++++++++++------
 10 files changed, 816 insertions(+), 261 deletions(-)
 create mode 100644 app/controllers/api/v1/projects/contents_controller.rb
 create mode 100644 app/services/api/v1/projects/contents/batch_create_service.rb
 create mode 100644 app/views/api/v1/projects/commits/_simple_gitea_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/contents/batch.json.jbuilder

diff --git a/app/controllers/api/v1/projects/contents_controller.rb b/app/controllers/api/v1/projects/contents_controller.rb
new file mode 100644
index 00000000..a4e65051
--- /dev/null
+++ b/app/controllers/api/v1/projects/contents_controller.rb
@@ -0,0 +1,13 @@
+class Api::V1::Projects::ContentsController < Api::V1::BaseController 
+  before_action :require_operate_above, only: [:batch]
+
+  def batch 
+    @result_object = Api::V1::Projects::Contents::BatchCreateService.call(@project, batch_content_params, current_user&.gitea_token)
+    puts @result_object
+  end
+
+  private 
+  def batch_content_params 
+    params.require(:content).permit(:author_email, :author_name, :author_timeunix, :branch, :committer_email, :committer_name, :committer_timeunix, :message, :new_branch, files: [ :action_type, :content, :encoding, :file_path])
+  end
+end
\ No newline at end of file
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index 5b506749..ae74dac7 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -1093,6 +1093,138 @@ await octokit.request('GET /api/yystopf/ceshi/files.json')
 ]
 ```
 
+## 提交文件到仓库
+提交文件到仓库，支持批量
+
+> 示例:
+
+```shell
+curl -X POST \
+-d "files[][action_type]=create" \
+-d "files[][content]=jfksj" \
+-d "files[][encoding]=text" \
+-d "files[][file_path]=heihei8" \
+-d "author_email=yystopf@163.com" \
+-d "author_name=yystopf" \
+-d "author_timeunix=1658214400" \
+-d "committer_email=yystopf@163.com" \
+-d "committer_name=yystopf" \
+-d "committer_timeunix=1658214400" \
+-d "branch=develop" \
+-d "new_branch=develop_ceshi" \
+-d "message=测试提交" \
+http://localhost:3000/api/v1/yystopf/ceshi/contents/batch.json
+```
+
+```javascript
+await octokit.request('POST /api/v1/yystopf/ceshi/contents/batch.json')
+```
+
+### HTTP 请求
+`POST /api/v1/:owner/:repo/contents/batch`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是|      |string |用户登录名  |
+|repo              |是|      |string |项目标识identifier  |
+|files.action_type |是|      |string|操作类型 create: 创建 update: 更新 delete: 删除|
+|files.content     |是|      |string|文件内容|
+|files.encoding    |是|      |string|文件编码方式 text 文本 base64 加密|
+|files.file_path   |是|      |string|文件路径|
+|author_email      |是|      |string|作者邮箱|
+|author_name       |是|      |string|作者名称|
+|author_timeunix   |是|      |int|编码时间，精确到秒|
+|committer_email   |是|      |string|提交者邮箱|
+|committer_name    |是|      |string|提交者名称|
+|committer_timeunix|是|      |int|提交时间戳，精确到秒|
+|branch            |是|      |string|提交分支|
+|new_branch        |否|      |string|如果需要创建新分支，这个需要填|
+|message           |是|      |string|提交信息|
+
+> 请求的JSON示例:
+
+```json
+{
+    "files": [
+        {
+            "action_type": "create",
+            "content": "jfksj",
+            "encoding": "text",
+            "file_path": "heihei7"
+        }
+    ],
+    "author_email": "yystopf@163.com",
+    "author_name": "yystopf",
+    "author_timeunix": 1658214400,
+    "committer_email": "yystopf@163.com",
+    "committer_name": "yystopf",
+    "committer_timeunix": 1658214400,
+    "branch": "hh_ceshi",
+    "message": "测试提交"
+}
+```
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|commit.sha           |string      |提交ID|
+|commit.author        |object      |作者|
+|commit.committer     |object      |提交者|
+|commit.commit_message|string      |提交信息|
+|commit.parent_shas  |array        |父节点commit ID|
+|commit.authored_time|int          |编码时间|
+|commit.commited_time|int          |提交时间|
+|contents.name       |string       |文件名称|
+|contents.path       |string       |文件路径|
+|contents.sha        |string       |文件标识|
+|contents.type       |string       |文件类型|
+|contents.size       |int          |文件大小|
+|contents.url        |string       |文件地址|
+|contents.encoding   |string       |编码类型 text 文本 base64 加密 |
+|contents.content    |string       |文件内容|
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "commit": {
+        "sha": "7c1e25f9b974e4b7a3816bd7f5e49b441078e999",
+        "author": {
+            "id": "2",
+            "login": "yystopf",
+            "name": "heh",
+            "type": "User",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "committer": {
+            "id": "2",
+            "login": "yystopf",
+            "name": "heh",
+            "type": "User",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "commit_message": "测试提交\n",
+        "parent_shas": [
+            "9aec816d0f3600082ca77893290a14bd29d805fe"
+        ],
+        "authored_time": 1658214400,
+        "commited_time": 1658214400
+    },
+    "contents": [
+        {
+            "name": "heihei7",
+            "path": "heihei7",
+            "sha": "f0acac8efb3021b0f6a7b13b42d033d86e076a4b",
+            "type": "file",
+            "size": 5,
+            "encoding": "base64",
+            "content": "amZrc2o="
+        }
+    ]
+}
+```
 
 ## 获取仓库代码目录
 获取仓库代码目录
diff --git a/app/services/api/v1/projects/branches/create_service.rb b/app/services/api/v1/projects/branches/create_service.rb
index 33e56127..2837dfcf 100644
--- a/app/services/api/v1/projects/branches/create_service.rb
+++ b/app/services/api/v1/projects/branches/create_service.rb
@@ -44,7 +44,7 @@ class Api::V1::Projects::Branches::CreateService < ApplicationService
   end
 
   def check_new_branch_exist
-    result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo) rescue nil
+    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_branch_name)
   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
new file mode 100644
index 00000000..d987f931
--- /dev/null
+++ b/app/services/api/v1/projects/contents/batch_create_service.rb
@@ -0,0 +1,91 @@
+class Api::V1::Projects::Contents::BatchCreateService < ApplicationService 
+  include ActiveModel::Model 
+
+  attr_reader :project, :owner, :repo, :token 
+  attr_reader :files, :author_email, :author_name, :author_timeunix, :branch, :committer_email, :committer_name, :committer_timeunix, :message, :new_branch
+  attr_accessor :gitea_data 
+
+  validates :author_email, :committer_email, presence: true, format: { with: CustomRegexp::EMAIL }
+  validates :author_name, :committer_name, presence: true, format: { with: /\A(?!_)(?!.*?_$)[a-zA-Z0-9_-]{4,15}\z/ }
+  validates :author_timeunix, :committer_timeunix, presence: true 
+  validates :branch, presence: true 
+  validates :message, presence: true
+
+
+  def initialize(project, params, token=nil)
+    puts params
+    @project = project 
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @token = token 
+    @files = params[:files]
+    @author_email = params[:author_email]
+    @author_name = params[:author_name]
+    @author_timeunix = params[:author_timeunix]
+    @branch = params[:branch]
+    @committer_email = params[:committer_email]
+    @committer_name = params[:committer_name]
+    @committer_timeunix = params[:committer_timeunix]
+    @message = params[:message]
+    @new_branch = params[:new_branch]
+  end
+
+  def call 
+    raise Error, '请输入正确的文件参数Files' unless valid_files?
+    raise Error, errors.full_messages.join(", ") unless valid? 
+    check_branch_exist
+    excute_data_to_gitea 
+
+    gitea_data 
+  end
+
+  private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
+  
+  def request_body 
+    {
+      files: files,
+      header: {
+        author: {
+          email: author_email,
+          name: author_name
+        },
+        committer: {
+          email: committer_email,
+          name: committer_name
+        },
+        dates: {
+          author: Time.at(author_timeunix.to_i),
+          committer: Time.at(committer_timeunix.to_i)
+        },
+        message: message,
+        new_branch: new_branch,
+        signoff: false
+      }
+    }
+  end
+
+  def valid_files?
+    return false unless files.is_a?(Array) && !files.blank?
+    files.each do |file|
+      return false unless file.has_key?(:action_type) && file.has_key?(:content) && file.has_key?(:encoding) && file.has_key?(:file_path)
+    end
+  end
+
+  def excute_data_to_gitea
+    @gitea_data = $gitea_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 
+    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?
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/blame.json.jbuilder b/app/views/api/v1/projects/blame.json.jbuilder
index d2e68953..8dfa6c8a 100644
--- a/app/views/api/v1/projects/blame.json.jbuilder
+++ b/app/views/api/v1/projects/blame.json.jbuilder
@@ -12,9 +12,9 @@ json.blame_parts @result_object['blame_parts'] do |part|
       json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(part['commit']['commiter']), name: part['commit']['commiter']['Name'] }
     end
     json.commit_message part['commit']['commit_message']
-    json.authored_time part['commit']['authored_time'].to_time.strftime("%Y-%m-%d %H:%M:%S")
-    json.committed_time part['commit']['committed_time'].to_time.strftime("%Y-%m-%d %H:%M:%S")
-    json.created_time part['commit']['created_time'].to_time.strftime("%Y-%m-%d %H:%M:%S")
+    json.authored_time render_unix_time(part['commit']['authored_time'])
+    json.committed_time render_unix_time(part['commit']['committed_time'])
+    json.created_time render_unix_time(part['commit']['created_time'])
   end
   json.current_number part['current_number']
   json.effect_line part['effect_line']
diff --git a/app/views/api/v1/projects/commits/_simple_gitea_detail.json.jbuilder b/app/views/api/v1/projects/commits/_simple_gitea_detail.json.jbuilder
new file mode 100644
index 00000000..36e3cc16
--- /dev/null
+++ b/app/views/api/v1/projects/commits/_simple_gitea_detail.json.jbuilder
@@ -0,0 +1,10 @@
+json.sha commit['sha']
+json.author do 
+  json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(commit['author']), name: commit['author']['name'] }
+end
+
+json.committer do 
+  json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(commit['committer']), name: commit['committer']['name'] }
+end
+json.commit_message commit['message']
+json.parent_shas commit['parents'].map{|x|x['sha']}
\ No newline at end of file
diff --git a/app/views/api/v1/projects/commits/index.json.jbuilder b/app/views/api/v1/projects/commits/index.json.jbuilder
index aa13845a..bd085535 100644
--- a/app/views/api/v1/projects/commits/index.json.jbuilder
+++ b/app/views/api/v1/projects/commits/index.json.jbuilder
@@ -12,6 +12,6 @@ json.commits @result_object[:data].each do |commit|
   json.parent_shas commit['parents'].map{|x|x['sha']}
   json.files commit['files'].map{|f|f['filename']}
   json.commit_date commit['commit_date']
-  json.commit_time commit['commit']['committer']['date'].to_time.strftime("%Y-%m-%d %H:%M:%S")
+  json.commit_time render_unix_time(commit['commit']['committer']['date'])
   json.branch commit['branch']
 end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/contents/batch.json.jbuilder b/app/views/api/v1/projects/contents/batch.json.jbuilder
new file mode 100644
index 00000000..a9ef08fa
--- /dev/null
+++ b/app/views/api/v1/projects/contents/batch.json.jbuilder
@@ -0,0 +1,14 @@
+json.commit do 
+  json.partial! "api/v1/projects/commits/simple_gitea_detail", commit: @result_object['commit']
+  json.authored_time render_unix_time(@result_object['commit']['author']['date'])
+  json.commited_time render_unix_time(@result_object['commit']['committer']['date'])
+end
+json.contents @result_object['contents'].each do |content|
+  json.name content['name']
+  json.path content['path']
+  json.sha content['sha']
+  json.type content['type'] 
+  json.size content['size']
+  json.encoding content['encoding']
+  json.content content['content']
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 6a01d1ab..81668804 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -37,6 +37,12 @@ defaults format: :json do
             get '/commits/:sha/diff', to: 'commits#diff'
             get '/git/blobs/:sha', to: 'git#blobs'
             get '/git/trees/:sha', to: 'git#trees'
+
+            resources :contents, only: [:index] do 
+              collection do 
+                post :batch
+              end
+            end
           end
         end
 
diff --git a/public/docs/api.html b/public/docs/api.html
index 0fcb033a..52e114d7 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -538,6 +538,9 @@
                   <li>
                     <a href="#59943eacca" class="toc-h2 toc-link" data-title="获取仓库所有文件">获取仓库所有文件</a>
                   </li>
+                  <li>
+                    <a href="#fc4df8ddd9" class="toc-h2 toc-link" data-title="提交文件到仓库">提交文件到仓库</a>
+                  </li>
                   <li>
                     <a href="#0c98b4c01b" class="toc-h2 toc-link" data-title="获取仓库代码目录">获取仓库代码目录</a>
                   </li>
@@ -9056,6 +9059,292 @@ http://localhost:3000/api/yystopf/ceshi/files.json
         </span><span class="nl">"html_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10080/yystopf/ceshi/src/branch/master/README.md"</span><span class="w">
     </span><span class="p">}</span><span class="w">
 </span><span class="p">]</span><span class="w">
+</span></code></pre></div><h2 id='fc4df8ddd9'>提交文件到仓库</h2>
+<p>提交文件到仓库，支持批量</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"files[][action_type]=create"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"files[][content]=jfksj"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"files[][encoding]=text"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"files[][file_path]=heihei8"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"author_email=yystopf@163.com"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"author_name=yystopf"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"author_timeunix=1658214400"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"committer_email=yystopf@163.com"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"committer_name=yystopf"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"committer_timeunix=1658214400"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"branch=develop"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"new_branch=develop_ceshi"</span> <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"message=测试提交"</span> <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/contents/batch.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/contents/batch.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
+<p><code>POST /api/v1/:owner/:repo/contents/batch</code></p>
+<h3 id='2eb6f47757-17'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>files.action_type</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>操作类型 create: 创建 update: 更新 delete: 删除</td>
+</tr>
+<tr>
+<td>files.content</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>文件内容</td>
+</tr>
+<tr>
+<td>files.encoding</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>文件编码方式 text 文本 base64 加密</td>
+</tr>
+<tr>
+<td>files.file_path</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>文件路径</td>
+</tr>
+<tr>
+<td>author_email</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>作者邮箱</td>
+</tr>
+<tr>
+<td>author_name</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>作者名称</td>
+</tr>
+<tr>
+<td>author_timeunix</td>
+<td>是</td>
+<td></td>
+<td>int</td>
+<td>编码时间，精确到秒</td>
+</tr>
+<tr>
+<td>committer_email</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>提交者邮箱</td>
+</tr>
+<tr>
+<td>committer_name</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>提交者名称</td>
+</tr>
+<tr>
+<td>committer_timeunix</td>
+<td>是</td>
+<td></td>
+<td>int</td>
+<td>提交时间戳，精确到秒</td>
+</tr>
+<tr>
+<td>branch</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>提交分支</td>
+</tr>
+<tr>
+<td>new_branch</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>如果需要创建新分支，这个需要填</td>
+</tr>
+<tr>
+<td>message</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>提交信息</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"files"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"action_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"jfksj"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"encoding"</span><span class="p">:</span><span class="w"> </span><span class="s2">"text"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"file_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heihei7"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"author_email"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf@163.com"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"author_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"author_timeunix"</span><span class="p">:</span><span class="w"> </span><span class="mi">1658214400</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"committer_email"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf@163.com"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"committer_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"committer_timeunix"</span><span class="p">:</span><span class="w"> </span><span class="mi">1658214400</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hh_ceshi"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试提交"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h3 id='7447e4874e-17'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>commit.sha</td>
+<td>string</td>
+<td>提交ID</td>
+</tr>
+<tr>
+<td>commit.author</td>
+<td>object</td>
+<td>作者</td>
+</tr>
+<tr>
+<td>commit.committer</td>
+<td>object</td>
+<td>提交者</td>
+</tr>
+<tr>
+<td>commit.commit_message</td>
+<td>string</td>
+<td>提交信息</td>
+</tr>
+<tr>
+<td>commit.parent_shas</td>
+<td>array</td>
+<td>父节点commit ID</td>
+</tr>
+<tr>
+<td>commit.authored_time</td>
+<td>int</td>
+<td>编码时间</td>
+</tr>
+<tr>
+<td>commit.commited_time</td>
+<td>int</td>
+<td>提交时间</td>
+</tr>
+<tr>
+<td>contents.name</td>
+<td>string</td>
+<td>文件名称</td>
+</tr>
+<tr>
+<td>contents.path</td>
+<td>string</td>
+<td>文件路径</td>
+</tr>
+<tr>
+<td>contents.sha</td>
+<td>string</td>
+<td>文件标识</td>
+</tr>
+<tr>
+<td>contents.type</td>
+<td>string</td>
+<td>文件类型</td>
+</tr>
+<tr>
+<td>contents.size</td>
+<td>int</td>
+<td>文件大小</td>
+</tr>
+<tr>
+<td>contents.url</td>
+<td>string</td>
+<td>文件地址</td>
+</tr>
+<tr>
+<td>contents.encoding</td>
+<td>string</td>
+<td>编码类型 text 文本 base64 加密</td>
+</tr>
+<tr>
+<td>contents.content</td>
+<td>string</td>
+<td>文件内容</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"commit"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"7c1e25f9b974e4b7a3816bd7f5e49b441078e999"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"committer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"commit_message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试提交</span><span class="se">\n</span><span class="s2">"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"parent_shas"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+            </span><span class="s2">"9aec816d0f3600082ca77893290a14bd29d805fe"</span><span class="w">
+        </span><span class="p">],</span><span class="w">
+        </span><span class="nl">"authored_time"</span><span class="p">:</span><span class="w"> </span><span class="mi">1658214400</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"commited_time"</span><span class="p">:</span><span class="w"> </span><span class="mi">1658214400</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"contents"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heihei7"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heihei7"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"f0acac8efb3021b0f6a7b13b42d033d86e076a4b"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"file"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"encoding"</span><span class="p">:</span><span class="w"> </span><span class="s2">"base64"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"amZrc2o="</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
 </span></code></pre></div><h2 id='0c98b4c01b'>获取仓库代码目录</h2>
 <p>获取仓库代码目录</p>
 
@@ -9066,9 +9355,9 @@ http://localhost:3000/api/yystopf/ceshi/files.json
 <span class="nt">-d</span> <span class="s2">"ref=develop"</span> <span class="se">\</span>
 http://localhost:3000//api/jasder/jasder_test/entries.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/entries.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-17'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/entries.json</code></p>
-<h3 id='2eb6f47757-17'>请求参数:</h3>
+<h3 id='2eb6f47757-18'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9100,7 +9389,7 @@ http://localhost:3000//api/jasder/jasder_test/entries.json
 <td>分支名称、tag名称或是提交记录id，默认为master分支</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-17'>返回字段说明:</h3>
+<h3 id='7447e4874e-18'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9214,9 +9503,9 @@ http://localhost:3000//api/jasder/jasder_test/entries.json
 <span class="nt">-d</span> <span class="s2">"filepath=file"</span> <span class="se">\</span>
 http://localhost:3000//api/jasder/jasder_test/sub_entries.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/jasder/jasder_test/sub_entries.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-18'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-19'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/sub_entries.json</code></p>
-<h3 id='2eb6f47757-18'>请求参数:</h3>
+<h3 id='2eb6f47757-19'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9255,7 +9544,7 @@ http://localhost:3000//api/jasder/jasder_test/sub_entries.json
 <td>分支名称、tag名称或是提交记录id，默认为master分支</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-18'>返回字段说明:</h3>
+<h3 id='7447e4874e-19'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9352,9 +9641,9 @@ http://localhost:3000//api/jasder/jasder_test/sub_entries.json
 <span class="nt">-d</span> <span class="s2">"filepath=lib"</span> <span class="se">\</span>
 http://localhost:3000/api/yystopf/csfjkkj/readme.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/yystopf/csfjkkj/readme.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-19'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
 <p><code>GET /api/:owner/:repo/readme.json</code></p>
-<h3 id='2eb6f47757-19'>请求参数:</h3>
+<h3 id='2eb6f47757-20'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9393,7 +9682,7 @@ http://localhost:3000/api/yystopf/csfjkkj/readme.json
 <td>子目录名称，默认为空</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-19'>返回字段说明:</h3>
+<h3 id='7447e4874e-20'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9466,9 +9755,9 @@ http://localhost:3000/api/yystopf/csfjkkj/readme.json
 <span class="nt">-d</span> <span class="s2">"limit=1"</span> <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae693756a4781fab2.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae693756a4781fab2.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-20'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/git/trees/:sha.json</code></p>
-<h3 id='2eb6f47757-20'>请求参数:</h3>
+<h3 id='2eb6f47757-21'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9521,7 +9810,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 <td>分页个数</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-20'>返回字段说明:</h3>
+<h3 id='7447e4874e-21'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9594,9 +9883,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/csfjkkj/git/blobs/80dd40214a58622312393b2ae693756a4781fab2.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/git/blobs/80dd40214a58622312393b2ae693756a4781fab2.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-21'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/git/blobs/:sha.json</code></p>
-<h3 id='2eb6f47757-21'>请求参数:</h3>
+<h3 id='2eb6f47757-22'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9628,7 +9917,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 <td>提交记录id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-21'>返回字段说明:</h3>
+<h3 id='7447e4874e-22'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9683,9 +9972,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/git/trees/80dd40214a58622312393b2ae
 <span class="nt">-d</span> <span class="s2">"limit=1"</span> <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/csfjkkj/commits.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/commits.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-22'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-23'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/commits.json</code></p>
-<h3 id='2eb6f47757-22'>请求参数:</h3>
+<h3 id='2eb6f47757-23'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9731,7 +10020,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/commits.json
 <td>每页数量</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-22'>返回字段说明:</h3>
+<h3 id='7447e4874e-23'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9838,9 +10127,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/commits.json
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393b2ae693756a4781fab2/diff.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/commits/80dd40214a58622312393b2ae693756a4781fab2/diff.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-23'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/commits/:sha/diff.json</code></p>
-<h3 id='2eb6f47757-23'>请求参数:</h3>
+<h3 id='2eb6f47757-24'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -9872,7 +10161,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/commits.json
 <td>提交记录id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-23'>返回字段说明:</h3>
+<h3 id='7447e4874e-24'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10098,9 +10387,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/commits.json
 <span class="nt">-d</span> <span class="s2">"filepath=hd.txt"</span> <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/csfjkkj/blame.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/blame.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-24'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/blame.json</code></p>
-<h3 id='2eb6f47757-24'>请求参数:</h3>
+<h3 id='2eb6f47757-25'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10139,7 +10428,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/blame.json
 <td>文件路径</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-24'>返回字段说明:</h3>
+<h3 id='7447e4874e-25'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10355,9 +10644,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/blame.json
 <span class="nt">-d</span> <span class="s2">"to=master"</span> <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/csfjkkj/compare.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-25'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/compare.json</code></p>
-<h3 id='2eb6f47757-25'>请求参数:</h3>
+<h3 id='2eb6f47757-26'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10396,7 +10685,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <td>目标分支、标签、commitID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-25'>返回字段说明:</h3>
+<h3 id='7447e4874e-26'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10681,9 +10970,9 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-26'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-26'>请求参数:</h3>
+<h3 id='2eb6f47757-27'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10708,7 +10997,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-26'>返回字段说明:</h3>
+<h3 id='7447e4874e-27'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10801,9 +11090,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-27'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-28'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-27'>请求参数:</h3>
+<h3 id='2eb6f47757-28'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10835,7 +11124,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-27'>返回字段说明:</h3>
+<h3 id='7447e4874e-28'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -10958,214 +11247,8 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-28'>HTTP 请求</h3>
-<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
-<h3 id='2eb6f47757-28'>请求参数:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>必选</th>
-<th>默认</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>owner</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>用户登录名</td>
-</tr>
-<tr>
-<td>repo</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>项目标识identifier</td>
-</tr>
-<tr>
-<td>webhook.url</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>目标url</td>
-</tr>
-<tr>
-<td>webhook.http_method</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>http方法, POST和GET</td>
-</tr>
-<tr>
-<td>webhook.content_type</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>webhook.secret</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>密钥文本</td>
-</tr>
-<tr>
-<td>webhook.active</td>
-<td>是</td>
-<td></td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>webhook.branch_filter</td>
-<td>否</td>
-<td></td>
-<td>string</td>
-<td>分支过滤</td>
-</tr>
-<tr>
-<td>webhook.events</td>
-<td>否</td>
-<td></td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-</tbody></table>
-
-<p>触发事件字段说明 </p>
-
-<table><thead>
-<tr>
-<th>参数</th>
-<th>含义</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>create</td>
-<td>创建分支或标签</td>
-</tr>
-<tr>
-<td>delete</td>
-<td>分支或标签删除</td>
-</tr>
-<tr>
-<td>push</td>
-<td>git仓库推送</td>
-</tr>
-<tr>
-<td>pull_request</td>
-<td>合并请求</td>
-</tr>
-<tr>
-<td>pull_request_assign</td>
-<td>合并请求被指派</td>
-</tr>
-<tr>
-<td>pull_request_review_approved</td>
-<td>合并请求被批准</td>
-</tr>
-<tr>
-<td>pull_request_review_rejected</td>
-<td>合并请求被拒绝</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>请求的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-28'>返回字段说明:</h3>
-<table><thead>
-<tr>
-<th>参数</th>
-<th>类型</th>
-<th>字段说明</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>id</td>
-<td>int</td>
-<td>id</td>
-</tr>
-<tr>
-<td>url</td>
-<td>string</td>
-<td>地址</td>
-</tr>
-<tr>
-<td>content_type</td>
-<td>string</td>
-<td>POST Content Type</td>
-</tr>
-<tr>
-<td>is_active</td>
-<td>bool</td>
-<td>是否激活</td>
-</tr>
-<tr>
-<td>type</td>
-<td>string</td>
-<td>类型</td>
-</tr>
-<tr>
-<td>events</td>
-<td>array</td>
-<td>触发事件</td>
-</tr>
-<tr>
-<td>create_time</td>
-<td>string</td>
-<td>创建时间</td>
-</tr>
-</tbody></table>
-
-<blockquote>
-<p>返回的JSON示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
-    </span><span class="p">],</span><span class="w">
-    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
-</span><span class="p">}</span><span class="w">
-</span></code></pre></div>
-<aside class="success">
-  Success Data.
-</aside>
-<h2 id='webhook-3'>更新仓库webhook</h2>
-<p>更新仓库webhook</p>
-
-<blockquote>
-<p>示例:</p>
-</blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
-http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-29'>HTTP 请求</h3>
-<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<p><code>POST /api/v1/:owner/:repo/webhooks.json</code></p>
 <h3 id='2eb6f47757-29'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -11191,13 +11274,6 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>项目标识identifier</td>
 </tr>
 <tr>
-<td>id</td>
-<td>是</td>
-<td></td>
-<td>string</td>
-<td>webhook id</td>
-</tr>
-<tr>
 <td>webhook.url</td>
 <td>是</td>
 <td></td>
@@ -11299,6 +11375,219 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
     </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h3 id='7447e4874e-29'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>id</td>
+</tr>
+<tr>
+<td>url</td>
+<td>string</td>
+<td>地址</td>
+</tr>
+<tr>
+<td>content_type</td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>is_active</td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>type</td>
+<td>string</td>
+<td>类型</td>
+</tr>
+<tr>
+<td>events</td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+<tr>
+<td>create_time</td>
+<td>string</td>
+<td>创建时间</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">68</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://127.0.0.1:3000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="s2">"create"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"delete"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_assign"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_approved"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"pull_request_review_rejected"</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-06-23 15:52"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='webhook-3'>更新仓库webhook</h2>
+<p>更新仓库webhook</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-30'>HTTP 请求</h3>
+<p><code>PATCH /api/v1/:owner/:repo/webhooks/68.json</code></p>
+<h3 id='2eb6f47757-30'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>id</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>webhook id</td>
+</tr>
+<tr>
+<td>webhook.url</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>目标url</td>
+</tr>
+<tr>
+<td>webhook.http_method</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>http方法, POST和GET</td>
+</tr>
+<tr>
+<td>webhook.content_type</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>POST Content Type</td>
+</tr>
+<tr>
+<td>webhook.secret</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>密钥文本</td>
+</tr>
+<tr>
+<td>webhook.active</td>
+<td>是</td>
+<td></td>
+<td>bool</td>
+<td>是否激活</td>
+</tr>
+<tr>
+<td>webhook.branch_filter</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>分支过滤</td>
+</tr>
+<tr>
+<td>webhook.events</td>
+<td>否</td>
+<td></td>
+<td>array</td>
+<td>触发事件</td>
+</tr>
+</tbody></table>
+
+<p>触发事件字段说明 </p>
+
+<table><thead>
+<tr>
+<th>参数</th>
+<th>含义</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>create</td>
+<td>创建分支或标签</td>
+</tr>
+<tr>
+<td>delete</td>
+<td>分支或标签删除</td>
+</tr>
+<tr>
+<td>push</td>
+<td>git仓库推送</td>
+</tr>
+<tr>
+<td>pull_request</td>
+<td>合并请求</td>
+</tr>
+<tr>
+<td>pull_request_assign</td>
+<td>合并请求被指派</td>
+</tr>
+<tr>
+<td>pull_request_review_approved</td>
+<td>合并请求被批准</td>
+</tr>
+<tr>
+<td>pull_request_review_rejected</td>
+<td>合并请求被拒绝</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> 
+    </span><span class="nl">"content_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"json"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"http_method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"GET"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"secret"</span><span class="p">:</span><span class="w"> </span><span class="s2">"123456"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:10000"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"branch_filter"</span><span class="p">:</span><span class="w"> </span><span class="s2">"*"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"events"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"push"</span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h3 id='7447e4874e-30'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -11333,9 +11622,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/v1/yystopf/ceshi/webhooks/7.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-30'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-31'>HTTP 请求</h3>
 <p><code>DELETE /api/v1/:owner/:repo/webhooks/:id.json</code></p>
-<h3 id='2eb6f47757-30'>请求参数:</h3>
+<h3 id='2eb6f47757-31'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11367,7 +11656,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <td>webhook id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-30'>返回字段说明:</h3>
+<h3 id='7447e4874e-31'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
@@ -11388,9 +11677,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/7.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi/webhooks/3/hooktasks.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-31'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-32'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/webhooks/:id/hooktasks.json</code></p>
-<h3 id='2eb6f47757-31'>请求参数:</h3>
+<h3 id='2eb6f47757-32'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11422,7 +11711,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-31'>返回字段说明:</h3>
+<h3 id='7447e4874e-32'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11659,9 +11948,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/hooktasks.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/webhooks/3/tests.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-32'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-33'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/webhooks/:id/tests.json</code></p>
-<h3 id='2eb6f47757-32'>请求参数:</h3>
+<h3 id='2eb6f47757-33'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -11693,7 +11982,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>webhook ID</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-32'>返回字段说明:</h3>
+<h3 id='7447e4874e-33'>返回字段说明:</h3>
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>

From b21f44b59efe0e8b16f95ffd8bf2b3e8408f5daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Fri, 22 Jul 2022 10:11:21 +0800
Subject: [PATCH 120/208] =?UTF-8?q?fixed=20=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=97=A5=E5=BF=97=E6=A0=B9=E6=8D=AE=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?commit=E8=AE=B0=E5=BD=95=E5=A4=9A=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/commit_logs_controller.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb
index c02d199b..c62c1300 100644
--- a/app/controllers/commit_logs_controller.rb
+++ b/app/controllers/commit_logs_controller.rb
@@ -3,8 +3,6 @@ class CommitLogsController < ApplicationController
   def create
     tip_exception "未认证" unless params[:token].to_s == "7917908927b6f1b792f2027a08a8b24a2de42c1692c2fd45da0dee5cf90a5af5"
     ref = params[:ref]
-    commit_id = params[:commits][0][:id]
-    message = params[:commits][0][:message]
     user_name = params[:pusher][:login]
     user_mail = params[:pusher][:email]
     user = User.find_by(mail: user_mail)
@@ -17,9 +15,13 @@ class CommitLogsController < ApplicationController
     owner = User.find_by(login: owner_name)
     project = Project.where(identifier: repository_name).where(user_id: owner&.id)&.first
     project = Project.where(identifier: repository_name).where(gpid: repository_id)&.first if project.blank?
-    CommitLog.create(user: user, project: project, repository_id: repository_id,
-                     name: repository_name, full_name: repository_full_name,
-                     ref: ref, commit_id: commit_id, message: message)
+    params[:commits].each do |commit|
+      commit_id = commit[:id]
+      message = commit[:message]
+      CommitLog.create(user: user, project: project, repository_id: repository_id,
+                       name: repository_name, full_name: repository_full_name,
+                       ref: ref, commit_id: commit_id, message: message)
+    end
 
   end
 end

From 8ba70a33becf0bad66780f6d2f4fb93548d902e5 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 22 Jul 2022 17:33:08 +0800
Subject: [PATCH 121/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20pr=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=88=97=E8=A1=A8=E5=92=8Cdiff=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  2 +-
 .../projects/pull_requests/base_controller.rb | 20 +++++++++++
 .../pull_requests/versions_controller.rb      | 10 ++++++
 .../versions/get_diff_service.rb              | 35 ++++++++++++++++++
 .../pull_requests/versions/list_service.rb    | 36 +++++++++++++++++++
 ...imple_gitea_diff_file_detail.json.jbuilder | 35 ++++++++++++++++++
 .../pull_requests/versions/diff.json.jbuilder |  6 ++++
 .../versions/index.json.jbuilder              | 13 +++++++
 config/routes/api.rb                          |  9 ++++-
 9 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 app/controllers/api/v1/projects/pull_requests/base_controller.rb
 create mode 100644 app/controllers/api/v1/projects/pull_requests/versions_controller.rb
 create mode 100644 app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb
 create mode 100644 app/services/api/v1/projects/pull_requests/versions/list_service.rb
 create mode 100644 app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder
 create mode 100644 app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder

diff --git a/Gemfile b/Gemfile
index 3da6f273..dd8885df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.10.2'
\ No newline at end of file
+gem 'gitea-client', '~> 0.10.4'
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pull_requests/base_controller.rb b/app/controllers/api/v1/projects/pull_requests/base_controller.rb
new file mode 100644
index 00000000..089a2bf7
--- /dev/null
+++ b/app/controllers/api/v1/projects/pull_requests/base_controller.rb
@@ -0,0 +1,20 @@
+class Api::V1::Projects::PullRequests::BaseController < Api::V1::BaseController 
+  before_action :require_public_and_member_above
+  before_action :load_pull_request
+
+  def load_pull_request
+    pull_request_id = params[:pull_request_id] || params[:id]
+    @pull_request = @project.pull_requests.where(gitea_number: pull_request_id).where.not(id: pull_request_id).take || PullRequest.find_by_id(pull_request_id)
+    @issue = @pull_request&.issue
+    if @pull_request
+      logger.info "###########pull_request founded"
+			@pull_request
+    else
+			logger.info "###########pull_request not found"
+      @pull_request = nil
+       render_not_found and return
+    end
+
+    @pull_request
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pull_requests/versions_controller.rb b/app/controllers/api/v1/projects/pull_requests/versions_controller.rb
new file mode 100644
index 00000000..abeaf7fd
--- /dev/null
+++ b/app/controllers/api/v1/projects/pull_requests/versions_controller.rb
@@ -0,0 +1,10 @@
+class Api::V1::Projects::PullRequests::VersionsController < Api::V1::Projects::PullRequests::BaseController
+
+  def index 
+    @result_object = Api::V1::Projects::PullRequests::Versions::ListService.call(@project, @pull_request, {page: page, limit: limit}, current_user&.gitea_token)
+  end
+
+  def diff 
+    @result_object = Api::V1::Projects::PullRequests::Versions::GetDiffService.call(@project, @pull_request, params[:id], {filepath: params[:filepath]}, current_user&.gitea_token)
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb b/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb
new file mode 100644
index 00000000..7c15fc6a
--- /dev/null
+++ b/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb
@@ -0,0 +1,35 @@
+class Api::V1::Projects::PullRequests::Versions::GetDiffService < ApplicationService 
+
+  attr_reader :project, :pull_request, :version_id, :owner, :repo, :index, :filepath, :token
+  attr_accessor :gitea_data 
+
+  def initialize(project, pull_request, version_id, params, token=nil)
+    @project = project 
+    @pull_request = pull_request
+    @version_id = version_id
+    @owner = project&.owner.login 
+    @repo = project&.identifier 
+    @index = pull_request.gitea_number 
+    @filepath = params[:filepath]
+    @token = token
+  end
+
+  def call 
+    load_gitea_data 
+
+    gitea_data
+  end
+
+  private 
+  def request_params
+    params = {
+      access_token: token
+    }
+    params.merge!(filepath: filepath) if filepath.present?
+  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})
+    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/pull_requests/versions/list_service.rb b/app/services/api/v1/projects/pull_requests/versions/list_service.rb
new file mode 100644
index 00000000..f33145b9
--- /dev/null
+++ b/app/services/api/v1/projects/pull_requests/versions/list_service.rb
@@ -0,0 +1,36 @@
+class Api::V1::Projects::PullRequests::Versions::ListService < ApplicationService 
+  
+  attr_reader :project, :pull_request, :token, :owner, :repo, :index, :page, :limit
+  attr_accessor :gitea_data 
+
+  def initialize(project, pull_request, params, token = nil)
+    @project = project 
+    @pull_request = pull_request
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @page = params[:page] || 1
+    @limit = params[:limit] || 15
+    @index = pull_request.gitea_number
+    @token = token 
+  end
+
+  def call 
+    load_gitea_data 
+
+    gitea_data
+  end
+
+  private 
+  def request_params 
+    {
+      access_token: token, 
+      page: page,
+      limit: limit
+    }
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_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/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder b/app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder
new file mode 100644
index 00000000..13f83333
--- /dev/null
+++ b/app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder
@@ -0,0 +1,35 @@
+json.name file['Name']
+  json.oldname file['OldName']
+  json.addition file['Addition']
+  json.deletion file['Deletion']
+  json.type file['Type']
+  json.is_created file['IsCreated']
+  json.is_deleted file['IsDeleted']
+  json.is_bin file['IsBin']
+  json.is_lfs_file file['IsLFSFile']
+  json.is_renamed file['IsRenamed']
+  json.is_ambiguous file['IsAmbiguous']
+  json.is_submodule file['IsSubmodule']
+  json.sections file['Sections'] do |section|
+    json.file_name section['FileName']
+    json.name section['Name']
+    json.lines section['Lines'] do |line|
+      json.left_index line['LeftIdx']
+      json.right_index line['RightIdx']
+      json.match line['Match']
+      json.type line['Type']
+      json.content line['Content']
+      unless line['SectionInfo'].blank?
+        json.section_path line['SectionInfo']['Path']
+        json.section_last_left_index line['SectionInfo']['LastLeftIdx']
+        json.section_last_right_index line['SectionInfo']['LastRightIdx']
+        json.section_left_index line['SectionInfo']['LeftIdx']
+        json.section_right_index line['SectionInfo']['RightIdx']
+        json.section_left_hunk_size line['SectionInfo']['LeftHunkSize']
+        json.section_right_hunk_size line['SectionInfo']['RightHunkSize']
+      end
+    end
+  end
+  json.is_incomplete file['IsIncomplete']
+  json.is_incomplete_line_too_long file['IsIncompleteLineTooLong']
+  json.is_protected file['IsProtected']
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder b/app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder
new file mode 100644
index 00000000..9e2c3430
--- /dev/null
+++ b/app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder
@@ -0,0 +1,6 @@
+
+if @result_object.has_key?("NumFiles")
+  json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object
+else 
+  json.partial! "api/v1/projects/simple_gitea_diff_file_detail", file: @result_object
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder b/app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder
new file mode 100644
index 00000000..4888c4f0
--- /dev/null
+++ b/app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder
@@ -0,0 +1,13 @@
+json.total_count @result_object[:total_data].to_i
+json.versions @result_object[:data].each do |version|
+  json.id version['id']
+  json.add_line_num version['add_line_num']
+  json.del_line_num version['del_line_num']
+  json.commits_count version['commits_count']
+  json.files_count version['files_count']
+  json.base_commit_sha version['base_commit_sha']
+  json.head_commit_sha version['head_commit_sha']
+  json.start_commit_sha version['start_commit_sha']
+  json.created_time render_unix_time(version['created_at'])
+  json.updated_time render_unix_time(version['updated_at'])
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 81668804..4f59995b 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -19,7 +19,14 @@ defaults format: :json do
           # projects文件夹下的
           scope module: :projects do 
             resources :issues
-            resources :pull_requests
+            resources :pull_requests, module: 'pull_requests' do 
+              resources :versions, only: [:index] do 
+                member do 
+                  get :diff
+                end
+              end
+            end
+
             resources :versions 
             resources :release_versions
             resources :webhooks do 

From 0df1e5fdd016c6308b1b74b1e07596fc4928abc1 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 22 Jul 2022 18:08:16 +0800
Subject: [PATCH 122/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E7=89=88=E6=9C=AC=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=92=8Cdiff=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pull_requests/versions_controller.rb      |  10 -
 .../base_controller.rb                        |   4 +-
 .../v1/projects/pulls/versions_controller.rb  |  10 +
 app/controllers/reviews_controller.rb         |   2 +-
 app/docs/slate/source/includes/_pulls.md      | 315 ++++++++
 .../slate/source/includes/_repositories.md    |  24 +-
 .../reviews/create_service.rb                 |   2 +-
 .../versions/get_diff_service.rb              |   2 +-
 .../versions/list_service.rb                  |   2 +-
 .../versions/diff.json.jbuilder               |   0
 .../versions/index.json.jbuilder              |   0
 config/routes/api.rb                          |   2 +-
 public/docs/api.html                          | 705 +++++++++++++++++-
 13 files changed, 1040 insertions(+), 38 deletions(-)
 delete mode 100644 app/controllers/api/v1/projects/pull_requests/versions_controller.rb
 rename app/controllers/api/v1/projects/{pull_requests => pulls}/base_controller.rb (78%)
 create mode 100644 app/controllers/api/v1/projects/pulls/versions_controller.rb
 rename app/services/api/v1/projects/{pull_requests => pulls}/reviews/create_service.rb (92%)
 rename app/services/api/v1/projects/{pull_requests => pulls}/versions/get_diff_service.rb (91%)
 rename app/services/api/v1/projects/{pull_requests => pulls}/versions/list_service.rb (90%)
 rename app/views/api/v1/projects/{pull_requests => pulls}/versions/diff.json.jbuilder (100%)
 rename app/views/api/v1/projects/{pull_requests => pulls}/versions/index.json.jbuilder (100%)

diff --git a/app/controllers/api/v1/projects/pull_requests/versions_controller.rb b/app/controllers/api/v1/projects/pull_requests/versions_controller.rb
deleted file mode 100644
index abeaf7fd..00000000
--- a/app/controllers/api/v1/projects/pull_requests/versions_controller.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class Api::V1::Projects::PullRequests::VersionsController < Api::V1::Projects::PullRequests::BaseController
-
-  def index 
-    @result_object = Api::V1::Projects::PullRequests::Versions::ListService.call(@project, @pull_request, {page: page, limit: limit}, current_user&.gitea_token)
-  end
-
-  def diff 
-    @result_object = Api::V1::Projects::PullRequests::Versions::GetDiffService.call(@project, @pull_request, params[:id], {filepath: params[:filepath]}, current_user&.gitea_token)
-  end
-end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pull_requests/base_controller.rb b/app/controllers/api/v1/projects/pulls/base_controller.rb
similarity index 78%
rename from app/controllers/api/v1/projects/pull_requests/base_controller.rb
rename to app/controllers/api/v1/projects/pulls/base_controller.rb
index 089a2bf7..0d5ae08b 100644
--- a/app/controllers/api/v1/projects/pull_requests/base_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/base_controller.rb
@@ -1,9 +1,9 @@
-class Api::V1::Projects::PullRequests::BaseController < Api::V1::BaseController 
+class Api::V1::Projects::Pulls::BaseController < Api::V1::BaseController 
   before_action :require_public_and_member_above
   before_action :load_pull_request
 
   def load_pull_request
-    pull_request_id = params[:pull_request_id] || params[:id]
+    pull_request_id = params[:pull_id] || params[:id]
     @pull_request = @project.pull_requests.where(gitea_number: pull_request_id).where.not(id: pull_request_id).take || PullRequest.find_by_id(pull_request_id)
     @issue = @pull_request&.issue
     if @pull_request
diff --git a/app/controllers/api/v1/projects/pulls/versions_controller.rb b/app/controllers/api/v1/projects/pulls/versions_controller.rb
new file mode 100644
index 00000000..dfd5d9e9
--- /dev/null
+++ b/app/controllers/api/v1/projects/pulls/versions_controller.rb
@@ -0,0 +1,10 @@
+class Api::V1::Projects::Pulls::VersionsController < Api::V1::Projects::Pulls::BaseController
+
+  def index 
+    @result_object = Api::V1::Projects::Pulls::Versions::ListService.call(@project, @pull_request, {page: page, limit: limit}, current_user&.gitea_token)
+  end
+
+  def diff 
+    @result_object = Api::V1::Projects::Pulls::Versions::GetDiffService.call(@project, @pull_request, params[:id], {filepath: params[:filepath]}, current_user&.gitea_token)
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb
index eec57113..e1201690 100644
--- a/app/controllers/reviews_controller.rb
+++ b/app/controllers/reviews_controller.rb
@@ -5,7 +5,7 @@ class ReviewsController < ApplicationController
 
   def create 
     return render_forbidden('您不是审查人员，无法进行审查！') if current_user&.id != @pull_request.issue.assigned_to_id
-    @journal, @review = Api::V1::Projects::PullRequests::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
+    @journal, @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
   end
 
   private 
diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index b9ad3b0b..e7df6409 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -499,4 +499,319 @@ await octokit.request('GET /api/Jasder/gitlink/pulls.json')
     }
   ]
 }
+```
+
+## 获取合并请求版本列表
+获取合并请求版本列表
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions.json')
+```
+
+### HTTP 请求
+`GET /api/v1/:owner/:repo/pulls/:index/versions.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是| |string |用户登录名  |
+|repo             |是| |string |项目标识identifier  |
+|index |是|| int |合并请求序号|
+
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|total_count              |int      |合并请求版本总数|
+|versions.id              |int      |版本ID|
+|versions.add_line_num    |int      |该版本新增行数|
+|versions.del_line_num    |int      |该版本删除行数|
+|versions.commits_count   |int      |该版本提交总数|
+|versions.files_count     |int      |该版本提交文件总数|
+|versions.base_commit_sha |string   |目标commit ID|
+|versions.head_commit_sha |string   |源commit ID|
+|versions.start_commit_sha|string   |该版本起始commit ID|
+|versions.created_time    |int      |版本创建时间|
+|versions.updated_time    |int      |版本更新时间|
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 1,
+    "versions": [
+        {
+            "id": 33,
+            "add_line_num": 5,
+            "del_line_num": 2,
+            "commits_count": 31,
+            "files_count": 29,
+            "base_commit_sha": "4a277037093c1248e46d2946ee30b61cccdb9df9",
+            "head_commit_sha": "fa3b1cdc8e0727d0fb9c96d28c545867c39815b8",
+            "start_commit_sha": "e49b1fd335e093a440fcf35a21e050afd48ef932",
+            "created_time": 1658469499,
+            "updated_time": 1658469499
+        }
+    ]
+}
+```
+
+## 获取合并请求版本Diff
+获取合并请求版本Diff（支持获取单文件Diff）
+
+> 示例:
+
+```shell
+curl -X GET \
+-d "filepath=ceshi_dir_1/new_file_1" \
+http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json')
+```
+
+### HTTP 请求
+`GET /api/v1/:owner/:repo/pulls/:index/versions/:version_id/diff.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是| |string |用户登录名  |
+|repo             |是| |string |项目标识identifier  |
+|index |是|| int |合并请求序号|
+|version_id|是|| int |版本ID|
+|filepath|否||string|文件路径|
+
+### 列表返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|file_nums|int|文件数量|
+|total_addition|int|新增行数|
+|total_deletion|int|删除行数|
+|files.name|string|文件名称|
+|files.oldname|string|文件修改前名称|
+|files.addition|int|文件新增行数|
+|files.deletion|int|文件删除行数|
+|files.type|int|文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制|
+|files.is_created|bool|是否为新建文件|
+|files.is_deleted|bool|是否为删除文件|
+|files.is_bin|bool|是否为二进制文件|
+|files.is_lfs_file|bool|是否为LFS文件|
+|files.is_renamed|bool|是否重命名|
+|files.is_ambiguous|bool||
+|files.is_submodule|bool|是否为子模块|
+|files.sections.file_name|string|文件名称|
+|files.sections.name|string||
+|files.sections.lines.left_index|int|文件变动之前所在行数|
+|files.sections.lines.right_index|int|文件变动之后所在行数|
+|files.sections.lines.match|int||
+|files.sections.lines.type|int|文件变更类型|
+|files.sections.lines.content|string|文件变更内容|
+|files.sections.lines.section_path|string|文件路径|
+|files.sections.lines.section_last_left_index|int||
+|files.sections.lines.section_last_right_index|int||
+|files.sections.lines.section_left_index|int|文件变更之前所在行数|
+|files.sections.lines.section_right_index|int|文件变更之后所在行数(即：页面编辑器开始显示的行数)|
+|files.sections.lines.section_left_hunk_size|int|文件变更之前的行数|
+|files.sections.lines.section_right_hunk_size|int|文件变更之后的行数(及当前页面编辑器显示的总行数)|
+|files.is_incomplete|bool|是否不完整|
+|files.is_incomplete_line_too_long|bool|文件是否不完整是因为太长了|
+|files.is_protected|bool|文件是否被保护|
+
+> 列表返回的JSON示例:
+
+```json
+{
+    "file_nums": 29,
+    "total_addition": 5,
+    "total_deletion": 2,
+    "files": [
+        {
+            "name": "README.md",
+            "oldname": "README.md",
+            "addition": 1,
+            "deletion": 2,
+            "type": 2,
+            "is_created": false,
+            "is_deleted": false,
+            "is_bin": false,
+            "is_lfs_file": false,
+            "is_renamed": false,
+            "is_ambiguous": false,
+            "is_submodule": false,
+            "sections": [
+                {
+                    "file_name": "README.md",
+                    "name": "",
+                    "lines": [
+                        {
+                            "left_index": 0,
+                            "right_index": 0,
+                            "match": 0,
+                            "type": 4,
+                            "content": "@@ -1,2 +1 @@",
+                            "section_path": "README.md",
+                            "section_last_left_index": 0,
+                            "section_last_right_index": 0,
+                            "section_left_index": 1,
+                            "section_right_index": 1,
+                            "section_left_hunk_size": 2,
+                            "section_right_hunk_size": 0
+                        },
+                        {
+                            "left_index": 1,
+                            "right_index": 0,
+                            "match": 3,
+                            "type": 3,
+                            "content": "-# ceshi_commit"
+                        },
+                        {
+                            "left_index": 2,
+                            "right_index": 0,
+                            "match": -1,
+                            "type": 3,
+                            "content": "-"
+                        },
+                        {
+                            "left_index": 0,
+                            "right_index": 1,
+                            "match": 1,
+                            "type": 2,
+                            "content": "+adsa"
+                        }
+                    ]
+                },
+                {}
+            ],
+            "is_incomplete": false,
+            "is_incomplete_line_too_long": false,
+            "is_protected": false
+        }
+    ]
+}
+```
+
+### 单个文件返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|name|string|文件名称|
+|oldname|string|文件修改前名称|
+|addition|int|文件新增行数|
+|deletion|int|文件删除行数|
+|type|int|文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制|
+|is_created|bool|是否为新建文件|
+|is_deleted|bool|是否为删除文件|
+|is_bin|bool|是否为二进制文件|
+|is_lfs_file|bool|是否为LFS文件|
+|is_renamed|bool|是否重命名|
+|is_ambiguous|bool||
+|is_submodule|bool|是否为子模块|
+|sections.file_name|string|文件名称|
+|sections.name|string||
+|sections.lines.left_index|int|文件变动之前所在行数|
+|sections.lines.right_index|int|文件变动之后所在行数|
+|sections.lines.match|int||
+|sections.lines.type|int|文件变更类型|
+|sections.lines.content|string|文件变更内容|
+|sections.lines.section_path|string|文件路径|
+|sections.lines.section_last_left_index|int||
+|sections.lines.section_last_right_index|int||
+|sections.lines.section_left_index|int|文件变更之前所在行数|
+|sections.lines.section_right_index|int|文件变更之后所在行数(即：页面编辑器开始显示的行数)|
+|sections.lines.section_left_hunk_size|int|文件变更之前的行数|
+|sections.lines.section_right_hunk_size|int|文件变更之后的行数(及当前页面编辑器显示的总行数)|
+|is_incomplete|bool|是否不完整|
+|is_incomplete_line_too_long|bool|文件是否不完整是因为太长了|
+|is_protected|bool|文件是否被保护|
+
+> 单个文件返回的JSON示例:
+
+```json
+{
+    "name": "README.md",
+    "oldname": "README.md",
+    "addition": 1,
+    "deletion": 2,
+    "type": 2,
+    "is_created": false,
+    "is_deleted": false,
+    "is_bin": false,
+    "is_lfs_file": false,
+    "is_renamed": false,
+    "is_ambiguous": false,
+    "is_submodule": false,
+    "sections": [
+        {
+            "file_name": "README.md",
+            "name": "",
+            "lines": [
+                {
+                    "left_index": 0,
+                    "right_index": 0,
+                    "match": 0,
+                    "type": 4,
+                    "content": "@@ -1,2 +1 @@",
+                    "section_path": "README.md",
+                    "section_last_left_index": 0,
+                    "section_last_right_index": 0,
+                    "section_left_index": 1,
+                    "section_right_index": 1,
+                    "section_left_hunk_size": 2,
+                    "section_right_hunk_size": 0
+                },
+                {
+                    "left_index": 1,
+                    "right_index": 0,
+                    "match": 3,
+                    "type": 3,
+                    "content": "-# ceshi_commit"
+                },
+                {
+                    "left_index": 2,
+                    "right_index": 0,
+                    "match": -1,
+                    "type": 3,
+                    "content": "-"
+                },
+                {
+                    "left_index": 0,
+                    "right_index": 1,
+                    "match": 1,
+                    "type": 2,
+                    "content": "+adsa"
+                }
+            ]
+        },
+        {
+            "file_name": "README.md",
+            "name": "",
+            "lines": [
+                {
+                    "left_index": 0,
+                    "right_index": 0,
+                    "match": 0,
+                    "type": 4,
+                    "content": " ",
+                    "section_path": "README.md",
+                    "section_last_left_index": 0,
+                    "section_last_right_index": 1,
+                    "section_left_index": 3,
+                    "section_right_index": 2,
+                    "section_left_hunk_size": 0,
+                    "section_right_hunk_size": 0
+                }
+            ]
+        }
+    ],
+    "is_incomplete": false,
+    "is_incomplete_line_too_long": false,
+    "is_protected": false
+}
 ```
\ No newline at end of file
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index ae74dac7..a07f2351 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -1990,25 +1990,27 @@ await octokit.request('GET /api/v1/yystopf/csfjkkj/compare.json')
 |diff.files.is_created|bool|是否为新建文件|
 |diff.files.is_deleted|bool|是否为删除文件|
 |diff.files.is_bin|bool|是否为二进制文件|
-|diff.files.is_lfs_file|bool||
+|diff.files.is_lfs_file|bool|是否为LFS文件|
 |diff.files.is_renamed|bool|是否重命名|
 |diff.files.is_ambiguous|bool||
 |diff.files.is_submodule|bool|是否为子模块|
 |diff.files.sections.file_name|string|文件名称|
 |diff.files.sections.name|string||
-|diff.files.sections.lines.left_index|int||
-|diff.files.sections.lines.right_index|int||
+|diff.files.sections.lines.left_index|int|文件变动之前所在行数|
+|diff.files.sections.lines.right_index|int|文件变动之后所在行数|
 |diff.files.sections.lines.match|int||
-|diff.files.sections.lines.type|int||
-|diff.files.sections.lines.content|string||
-|diff.files.sections.lines.section_path|string||
+|diff.files.sections.lines.type|int|文件变更类型|
+|diff.files.sections.lines.content|string|文件变更内容|
+|diff.files.sections.lines.section_path|string|文件路径|
 |diff.files.sections.lines.section_last_left_index|int||
 |diff.files.sections.lines.section_last_right_index|int||
-|diff.files.sections.lines.section_left_index|int||
-|diff.files.sections.lines.section_right_index|int||
-|diff.files.sections.lines.section_left_hunk_size|int||
-|diff.files.sections.lines.section_right_hunk_size|int||
-
+|diff.files.sections.lines.section_left_index|int|文件变更之前所在行数|
+|diff.files.sections.lines.section_right_index|int|文件变更之后所在行数(即：页面编辑器开始显示的行数)|
+|diff.files.sections.lines.section_left_hunk_size|int|文件变更之前的行数|
+|diff.files.sections.lines.section_right_hunk_size|int|文件变更之后的行数(及当前页面编辑器显示的总行数)|
+|diff.files.is_incomplete|bool|是否不完整|
+|diff.files.is_incomplete_line_too_long|bool|文件是否不完整是因为太长了|
+|diff.files.is_protected|bool|文件是否被保护|
 
 
 > 返回的JSON示例:
diff --git a/app/services/api/v1/projects/pull_requests/reviews/create_service.rb b/app/services/api/v1/projects/pulls/reviews/create_service.rb
similarity index 92%
rename from app/services/api/v1/projects/pull_requests/reviews/create_service.rb
rename to app/services/api/v1/projects/pulls/reviews/create_service.rb
index c003256d..13ec9f7e 100644
--- a/app/services/api/v1/projects/pull_requests/reviews/create_service.rb
+++ b/app/services/api/v1/projects/pulls/reviews/create_service.rb
@@ -1,4 +1,4 @@
-class Api::V1::Projects::PullRequests::Reviews::CreateService < ApplicationService
+class Api::V1::Projects::Pulls::Reviews::CreateService < ApplicationService
   include ActiveModel::Model
 
   attr_reader :project, :pull_request, :issue, :status, :commit_id, :content, :current_user
diff --git a/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb
similarity index 91%
rename from app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb
rename to app/services/api/v1/projects/pulls/versions/get_diff_service.rb
index 7c15fc6a..1a4f144a 100644
--- a/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb
+++ b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb
@@ -1,4 +1,4 @@
-class Api::V1::Projects::PullRequests::Versions::GetDiffService < ApplicationService 
+class Api::V1::Projects::Pulls::Versions::GetDiffService < ApplicationService 
 
   attr_reader :project, :pull_request, :version_id, :owner, :repo, :index, :filepath, :token
   attr_accessor :gitea_data 
diff --git a/app/services/api/v1/projects/pull_requests/versions/list_service.rb b/app/services/api/v1/projects/pulls/versions/list_service.rb
similarity index 90%
rename from app/services/api/v1/projects/pull_requests/versions/list_service.rb
rename to app/services/api/v1/projects/pulls/versions/list_service.rb
index f33145b9..ca88ff1f 100644
--- a/app/services/api/v1/projects/pull_requests/versions/list_service.rb
+++ b/app/services/api/v1/projects/pulls/versions/list_service.rb
@@ -1,4 +1,4 @@
-class Api::V1::Projects::PullRequests::Versions::ListService < ApplicationService 
+class Api::V1::Projects::Pulls::Versions::ListService < ApplicationService 
   
   attr_reader :project, :pull_request, :token, :owner, :repo, :index, :page, :limit
   attr_accessor :gitea_data 
diff --git a/app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder b/app/views/api/v1/projects/pulls/versions/diff.json.jbuilder
similarity index 100%
rename from app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder
rename to app/views/api/v1/projects/pulls/versions/diff.json.jbuilder
diff --git a/app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder b/app/views/api/v1/projects/pulls/versions/index.json.jbuilder
similarity index 100%
rename from app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder
rename to app/views/api/v1/projects/pulls/versions/index.json.jbuilder
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 4f59995b..8340097e 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -19,7 +19,7 @@ defaults format: :json do
           # projects文件夹下的
           scope module: :projects do 
             resources :issues
-            resources :pull_requests, module: 'pull_requests' do 
+            resources :pulls, module: 'pulls' do 
               resources :versions, only: [:index] do 
                 member do 
                   get :diff
diff --git a/public/docs/api.html b/public/docs/api.html
index 52e114d7..297c1dc8 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -609,6 +609,12 @@
                   <li>
                     <a href="#list-pull-requests" class="toc-h2 toc-link" data-title="List pull requests">List pull requests</a>
                   </li>
+                  <li>
+                    <a href="#12fc53a2d2" class="toc-h2 toc-link" data-title="获取合并请求版本列表">获取合并请求版本列表</a>
+                  </li>
+                  <li>
+                    <a href="#diff" class="toc-h2 toc-link" data-title="获取合并请求版本Diff">获取合并请求版本Diff</a>
+                  </li>
               </ul>
           </li>
           <li>
@@ -10786,7 +10792,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <tr>
 <td>diff.files.is_lfs_file</td>
 <td>bool</td>
-<td></td>
+<td>是否为LFS文件</td>
 </tr>
 <tr>
 <td>diff.files.is_renamed</td>
@@ -10816,12 +10822,12 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <tr>
 <td>diff.files.sections.lines.left_index</td>
 <td>int</td>
-<td></td>
+<td>文件变动之前所在行数</td>
 </tr>
 <tr>
 <td>diff.files.sections.lines.right_index</td>
 <td>int</td>
-<td></td>
+<td>文件变动之后所在行数</td>
 </tr>
 <tr>
 <td>diff.files.sections.lines.match</td>
@@ -10831,17 +10837,17 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <tr>
 <td>diff.files.sections.lines.type</td>
 <td>int</td>
-<td></td>
+<td>文件变更类型</td>
 </tr>
 <tr>
 <td>diff.files.sections.lines.content</td>
 <td>string</td>
-<td></td>
+<td>文件变更内容</td>
 </tr>
 <tr>
 <td>diff.files.sections.lines.section_path</td>
 <td>string</td>
-<td></td>
+<td>文件路径</td>
 </tr>
 <tr>
 <td>diff.files.sections.lines.section_last_left_index</td>
@@ -10856,22 +10862,37 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json
 <tr>
 <td>diff.files.sections.lines.section_left_index</td>
 <td>int</td>
-<td></td>
+<td>文件变更之前所在行数</td>
 </tr>
 <tr>
 <td>diff.files.sections.lines.section_right_index</td>
 <td>int</td>
-<td></td>
+<td>文件变更之后所在行数(即：页面编辑器开始显示的行数)</td>
 </tr>
 <tr>
 <td>diff.files.sections.lines.section_left_hunk_size</td>
 <td>int</td>
-<td></td>
+<td>文件变更之前的行数</td>
 </tr>
 <tr>
 <td>diff.files.sections.lines.section_right_hunk_size</td>
 <td>int</td>
-<td></td>
+<td>文件变更之后的行数(及当前页面编辑器显示的总行数)</td>
+</tr>
+<tr>
+<td>diff.files.is_incomplete</td>
+<td>bool</td>
+<td>是否不完整</td>
+</tr>
+<tr>
+<td>diff.files.is_incomplete_line_too_long</td>
+<td>bool</td>
+<td>文件是否不完整是因为太长了</td>
+</tr>
+<tr>
+<td>diff.files.is_protected</td>
+<td>bool</td>
+<td>文件是否被保护</td>
 </tr>
 </tbody></table>
 
@@ -12936,6 +12957,670 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
     </span><span class="p">}</span><span class="w">
   </span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='12fc53a2d2'>获取合并请求版本列表</h2>
+<p>获取合并请求版本列表</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi_commit/pulls/3/versions.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
+<p><code>GET /api/v1/:owner/:repo/pulls/:index/versions.json</code></p>
+<h3 id='2eb6f47757-6'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>index</td>
+<td>是</td>
+<td></td>
+<td>int</td>
+<td>合并请求序号</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-4'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>total_count</td>
+<td>int</td>
+<td>合并请求版本总数</td>
+</tr>
+<tr>
+<td>versions.id</td>
+<td>int</td>
+<td>版本ID</td>
+</tr>
+<tr>
+<td>versions.add_line_num</td>
+<td>int</td>
+<td>该版本新增行数</td>
+</tr>
+<tr>
+<td>versions.del_line_num</td>
+<td>int</td>
+<td>该版本删除行数</td>
+</tr>
+<tr>
+<td>versions.commits_count</td>
+<td>int</td>
+<td>该版本提交总数</td>
+</tr>
+<tr>
+<td>versions.files_count</td>
+<td>int</td>
+<td>该版本提交文件总数</td>
+</tr>
+<tr>
+<td>versions.base_commit_sha</td>
+<td>string</td>
+<td>目标commit ID</td>
+</tr>
+<tr>
+<td>versions.head_commit_sha</td>
+<td>string</td>
+<td>源commit ID</td>
+</tr>
+<tr>
+<td>versions.start_commit_sha</td>
+<td>string</td>
+<td>该版本起始commit ID</td>
+</tr>
+<tr>
+<td>versions.created_time</td>
+<td>int</td>
+<td>版本创建时间</td>
+</tr>
+<tr>
+<td>versions.updated_time</td>
+<td>int</td>
+<td>版本更新时间</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"versions"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">33</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"add_line_num"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"del_line_num"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"commits_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">31</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"files_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">29</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"base_commit_sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"4a277037093c1248e46d2946ee30b61cccdb9df9"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"head_commit_sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fa3b1cdc8e0727d0fb9c96d28c545867c39815b8"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"start_commit_sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"e49b1fd335e093a440fcf35a21e050afd48ef932"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"created_time"</span><span class="p">:</span><span class="w"> </span><span class="mi">1658469499</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"updated_time"</span><span class="p">:</span><span class="w"> </span><span class="mi">1658469499</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='diff'>获取合并请求版本Diff</h2>
+<p>获取合并请求版本Diff（支持获取单文件Diff）</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+<span class="nt">-d</span> <span class="s2">"filepath=ceshi_dir_1/new_file_1"</span> <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
+<p><code>GET /api/v1/:owner/:repo/pulls/:index/versions/:version_id/diff.json</code></p>
+<h3 id='2eb6f47757-7'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>index</td>
+<td>是</td>
+<td></td>
+<td>int</td>
+<td>合并请求序号</td>
+</tr>
+<tr>
+<td>version_id</td>
+<td>是</td>
+<td></td>
+<td>int</td>
+<td>版本ID</td>
+</tr>
+<tr>
+<td>filepath</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>文件路径</td>
+</tr>
+</tbody></table>
+<h3 id='a88770b445'>列表返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>file_nums</td>
+<td>int</td>
+<td>文件数量</td>
+</tr>
+<tr>
+<td>total_addition</td>
+<td>int</td>
+<td>新增行数</td>
+</tr>
+<tr>
+<td>total_deletion</td>
+<td>int</td>
+<td>删除行数</td>
+</tr>
+<tr>
+<td>files.name</td>
+<td>string</td>
+<td>文件名称</td>
+</tr>
+<tr>
+<td>files.oldname</td>
+<td>string</td>
+<td>文件修改前名称</td>
+</tr>
+<tr>
+<td>files.addition</td>
+<td>int</td>
+<td>文件新增行数</td>
+</tr>
+<tr>
+<td>files.deletion</td>
+<td>int</td>
+<td>文件删除行数</td>
+</tr>
+<tr>
+<td>files.type</td>
+<td>int</td>
+<td>文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制</td>
+</tr>
+<tr>
+<td>files.is_created</td>
+<td>bool</td>
+<td>是否为新建文件</td>
+</tr>
+<tr>
+<td>files.is_deleted</td>
+<td>bool</td>
+<td>是否为删除文件</td>
+</tr>
+<tr>
+<td>files.is_bin</td>
+<td>bool</td>
+<td>是否为二进制文件</td>
+</tr>
+<tr>
+<td>files.is_lfs_file</td>
+<td>bool</td>
+<td>是否为LFS文件</td>
+</tr>
+<tr>
+<td>files.is_renamed</td>
+<td>bool</td>
+<td>是否重命名</td>
+</tr>
+<tr>
+<td>files.is_ambiguous</td>
+<td>bool</td>
+<td></td>
+</tr>
+<tr>
+<td>files.is_submodule</td>
+<td>bool</td>
+<td>是否为子模块</td>
+</tr>
+<tr>
+<td>files.sections.file_name</td>
+<td>string</td>
+<td>文件名称</td>
+</tr>
+<tr>
+<td>files.sections.name</td>
+<td>string</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.left_index</td>
+<td>int</td>
+<td>文件变动之前所在行数</td>
+</tr>
+<tr>
+<td>files.sections.lines.right_index</td>
+<td>int</td>
+<td>文件变动之后所在行数</td>
+</tr>
+<tr>
+<td>files.sections.lines.match</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.type</td>
+<td>int</td>
+<td>文件变更类型</td>
+</tr>
+<tr>
+<td>files.sections.lines.content</td>
+<td>string</td>
+<td>文件变更内容</td>
+</tr>
+<tr>
+<td>files.sections.lines.section_path</td>
+<td>string</td>
+<td>文件路径</td>
+</tr>
+<tr>
+<td>files.sections.lines.section_last_left_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.section_last_right_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>files.sections.lines.section_left_index</td>
+<td>int</td>
+<td>文件变更之前所在行数</td>
+</tr>
+<tr>
+<td>files.sections.lines.section_right_index</td>
+<td>int</td>
+<td>文件变更之后所在行数(即：页面编辑器开始显示的行数)</td>
+</tr>
+<tr>
+<td>files.sections.lines.section_left_hunk_size</td>
+<td>int</td>
+<td>文件变更之前的行数</td>
+</tr>
+<tr>
+<td>files.sections.lines.section_right_hunk_size</td>
+<td>int</td>
+<td>文件变更之后的行数(及当前页面编辑器显示的总行数)</td>
+</tr>
+<tr>
+<td>files.is_incomplete</td>
+<td>bool</td>
+<td>是否不完整</td>
+</tr>
+<tr>
+<td>files.is_incomplete_line_too_long</td>
+<td>bool</td>
+<td>文件是否不完整是因为太长了</td>
+</tr>
+<tr>
+<td>files.is_protected</td>
+<td>bool</td>
+<td>文件是否被保护</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>列表返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"file_nums"</span><span class="p">:</span><span class="w"> </span><span class="mi">29</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"total_addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"total_deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"files"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"oldname"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_created"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_deleted"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_bin"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_lfs_file"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_renamed"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_ambiguous"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_submodule"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"sections"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                        </span><span class="p">{</span><span class="w">
+                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"@@ -1,2 +1 @@"</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_last_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_last_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_left_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"section_right_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+                        </span><span class="p">},</span><span class="w">
+                        </span><span class="p">{</span><span class="w">
+                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"-# ceshi_commit"</span><span class="w">
+                        </span><span class="p">},</span><span class="w">
+                        </span><span class="p">{</span><span class="w">
+                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">-1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"-"</span><span class="w">
+                        </span><span class="p">},</span><span class="w">
+                        </span><span class="p">{</span><span class="w">
+                            </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"+adsa"</span><span class="w">
+                        </span><span class="p">}</span><span class="w">
+                    </span><span class="p">]</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="p">{}</span><span class="w">
+            </span><span class="p">],</span><span class="w">
+            </span><span class="nl">"is_incomplete"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h3 id='7e3fc7ebbc'>单个文件返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>name</td>
+<td>string</td>
+<td>文件名称</td>
+</tr>
+<tr>
+<td>oldname</td>
+<td>string</td>
+<td>文件修改前名称</td>
+</tr>
+<tr>
+<td>addition</td>
+<td>int</td>
+<td>文件新增行数</td>
+</tr>
+<tr>
+<td>deletion</td>
+<td>int</td>
+<td>文件删除行数</td>
+</tr>
+<tr>
+<td>type</td>
+<td>int</td>
+<td>文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制</td>
+</tr>
+<tr>
+<td>is_created</td>
+<td>bool</td>
+<td>是否为新建文件</td>
+</tr>
+<tr>
+<td>is_deleted</td>
+<td>bool</td>
+<td>是否为删除文件</td>
+</tr>
+<tr>
+<td>is_bin</td>
+<td>bool</td>
+<td>是否为二进制文件</td>
+</tr>
+<tr>
+<td>is_lfs_file</td>
+<td>bool</td>
+<td>是否为LFS文件</td>
+</tr>
+<tr>
+<td>is_renamed</td>
+<td>bool</td>
+<td>是否重命名</td>
+</tr>
+<tr>
+<td>is_ambiguous</td>
+<td>bool</td>
+<td></td>
+</tr>
+<tr>
+<td>is_submodule</td>
+<td>bool</td>
+<td>是否为子模块</td>
+</tr>
+<tr>
+<td>sections.file_name</td>
+<td>string</td>
+<td>文件名称</td>
+</tr>
+<tr>
+<td>sections.name</td>
+<td>string</td>
+<td></td>
+</tr>
+<tr>
+<td>sections.lines.left_index</td>
+<td>int</td>
+<td>文件变动之前所在行数</td>
+</tr>
+<tr>
+<td>sections.lines.right_index</td>
+<td>int</td>
+<td>文件变动之后所在行数</td>
+</tr>
+<tr>
+<td>sections.lines.match</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>sections.lines.type</td>
+<td>int</td>
+<td>文件变更类型</td>
+</tr>
+<tr>
+<td>sections.lines.content</td>
+<td>string</td>
+<td>文件变更内容</td>
+</tr>
+<tr>
+<td>sections.lines.section_path</td>
+<td>string</td>
+<td>文件路径</td>
+</tr>
+<tr>
+<td>sections.lines.section_last_left_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>sections.lines.section_last_right_index</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>sections.lines.section_left_index</td>
+<td>int</td>
+<td>文件变更之前所在行数</td>
+</tr>
+<tr>
+<td>sections.lines.section_right_index</td>
+<td>int</td>
+<td>文件变更之后所在行数(即：页面编辑器开始显示的行数)</td>
+</tr>
+<tr>
+<td>sections.lines.section_left_hunk_size</td>
+<td>int</td>
+<td>文件变更之前的行数</td>
+</tr>
+<tr>
+<td>sections.lines.section_right_hunk_size</td>
+<td>int</td>
+<td>文件变更之后的行数(及当前页面编辑器显示的总行数)</td>
+</tr>
+<tr>
+<td>is_incomplete</td>
+<td>bool</td>
+<td>是否不完整</td>
+</tr>
+<tr>
+<td>is_incomplete_line_too_long</td>
+<td>bool</td>
+<td>文件是否不完整是因为太长了</td>
+</tr>
+<tr>
+<td>is_protected</td>
+<td>bool</td>
+<td>文件是否被保护</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>单个文件返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"oldname"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_created"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_deleted"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_bin"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_lfs_file"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_renamed"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_ambiguous"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_submodule"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"sections"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"@@ -1,2 +1 @@"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_last_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_last_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_left_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_right_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"-# ceshi_commit"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">-1</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"-"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"+adsa"</span><span class="w">
+                </span><span class="p">}</span><span class="w">
+            </span><span class="p">]</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">" "</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_last_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_last_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_left_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"section_right_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+                </span><span class="p">}</span><span class="w">
+            </span><span class="p">]</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"is_incomplete"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
+</span><span class="p">}</span><span class="w">
 </span></code></pre></div><h1 id='issues'>Issues</h1><h1 id='organizations'>Organizations</h1><h1 id='teams'>Teams</h1><h1 id='errors'>Errors</h1>
 <aside class="notice">
 This error section is stored in a separate file in <code>includes/_errors.md</code>. Slate allows you to optionally separate out your docs into many files...just save them to the <code>includes</code> folder and add them to the top of your <code>index.md</code>'s frontmatter. Files are included in the order listed.

From 1feb166fd5656f639479341848883bc7009cf65d Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 25 Jul 2022 16:20:42 +0800
Subject: [PATCH 123/208] =?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=E8=AF=84=E5=AE=A1=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb                           |  1 -
 app/models/journal.rb                         |  3 ++-
 app/models/pull_request.rb                    |  7 ++++++-
 app/models/pull_requests_reviewer.rb          | 21 +++++++++++++++++++
 app/models/review.rb                          | 20 +++++++++---------
 ...25020217_create_pull_requests_reviewers.rb |  9 ++++++++
 ...ange_reviews_reference_to_pull_requests.rb |  6 ++++++
 spec/models/pull_requests_reviewer_spec.rb    |  5 +++++
 8 files changed, 59 insertions(+), 13 deletions(-)
 create mode 100644 app/models/pull_requests_reviewer.rb
 create mode 100644 db/migrate/20220725020217_create_pull_requests_reviewers.rb
 create mode 100644 db/migrate/20220725020443_change_reviews_reference_to_pull_requests.rb
 create mode 100644 spec/models/pull_requests_reviewer_spec.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index fa8c43ea..2a3b9595 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -68,7 +68,6 @@ class Issue < ApplicationRecord
   has_many :issue_tags, through: :issue_tags_relates
   has_many :issue_times, dependent: :destroy
   has_many :issue_depends, dependent: :destroy
-  has_many :reviews, dependent: :destroy
   scope :issue_includes, ->{includes(:user)}
   scope :issue_many_includes, ->{includes(journals: :user)}
   scope :issue_issue, ->{where(issue_classify: [nil,"issue"])}
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 297c7a14..19fdce1c 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -25,7 +25,8 @@
 
 class Journal < ApplicationRecord
   belongs_to :user
-  belongs_to :issue, foreign_key: :journalized_id, :touch => true
+  belongs_to :issue, foreign_key: :journalized_id, :touch => true, optional: true
+  belongs_to :journalized, polymorphic: true
   has_many :journal_details, :dependent => :delete_all
   has_many :attachments, as: :container, dependent: :destroy
 
diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb
index e36af832..b3ab1e03 100644
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@@ -32,12 +32,17 @@ class PullRequest < ApplicationRecord
   belongs_to :issue
   belongs_to :user
   belongs_to :project, counter_cache: true, touch: true
-  # belongs_to :fork_project, foreign_key: :fork_project_id
+  belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id, optional: true
   has_many :pull_request_assigns, foreign_key: :pull_request_id
   has_many :pull_request_tags, foreign_key: :pull_request_id
   has_many :project_trends, as: :trend, dependent: :destroy
   has_many :attachments, as: :container, dependent: :destroy
   has_one :gitea_pull, foreign_key: :id, primary_key: :gitea_number, class_name: 'Gitea::Pull'
+  has_many :journals, :as => :journalized, :dependent => :destroy
+  has_many :journal_details, through: :journals
+  has_many :reviews, dependent: :destroy
+  has_many :pull_requests_reviewers, dependent: :destroy
+  has_many :reviewers, through: :pull_requests_reviewers
 
   scope :merged_and_closed, ->{where.not(status: 0)}
   scope :opening, -> {where(status: 0)}
diff --git a/app/models/pull_requests_reviewer.rb b/app/models/pull_requests_reviewer.rb
new file mode 100644
index 00000000..31502b2a
--- /dev/null
+++ b/app/models/pull_requests_reviewer.rb
@@ -0,0 +1,21 @@
+# == Schema Information
+#
+# Table name: pull_requests_reviewers
+#
+#  id              :integer          not null, primary key
+#  pull_request_id :integer
+#  reviewer_id     :integer
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+# Indexes
+#
+#  index_pull_requests_reviewers_on_pull_request_id  (pull_request_id)
+#  index_pull_requests_reviewers_on_reviewer_id      (reviewer_id)
+#
+
+class PullRequestsReviewer < ApplicationRecord
+
+  belongs_to :pull_request 
+  belongs_to :reviewers, class_name: 'User', foreign_key: :reviewer_id
+end
diff --git a/app/models/review.rb b/app/models/review.rb
index f2d3e678..715e1168 100644
--- a/app/models/review.rb
+++ b/app/models/review.rb
@@ -2,19 +2,19 @@
 #
 # Table name: reviews
 #
-#  id          :integer          not null, primary key
-#  issue_id    :integer
-#  reviewer_id :integer
-#  content     :text(65535)
-#  commit_id   :string(255)
-#  status      :integer          default("0")
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
+#  id              :integer          not null, primary key
+#  reviewer_id     :integer
+#  content         :text(65535)
+#  commit_id       :string(255)
+#  status          :integer          default("0")
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  pull_request_id :integer
 #
 # Indexes
 #
-#  index_reviews_on_issue_id     (issue_id)
-#  index_reviews_on_reviewer_id  (reviewer_id)
+#  index_reviews_on_pull_request_id  (pull_request_id)
+#  index_reviews_on_reviewer_id      (reviewer_id)
 #
 
 class Review < ApplicationRecord
diff --git a/db/migrate/20220725020217_create_pull_requests_reviewers.rb b/db/migrate/20220725020217_create_pull_requests_reviewers.rb
new file mode 100644
index 00000000..be5c561c
--- /dev/null
+++ b/db/migrate/20220725020217_create_pull_requests_reviewers.rb
@@ -0,0 +1,9 @@
+class CreatePullRequestsReviewers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :pull_requests_reviewers do |t|
+      t.belongs_to :pull_request, index: true 
+      t.belongs_to :reviewer, class_name: User, index:true
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20220725020443_change_reviews_reference_to_pull_requests.rb b/db/migrate/20220725020443_change_reviews_reference_to_pull_requests.rb
new file mode 100644
index 00000000..e0394391
--- /dev/null
+++ b/db/migrate/20220725020443_change_reviews_reference_to_pull_requests.rb
@@ -0,0 +1,6 @@
+class ChangeReviewsReferenceToPullRequests < ActiveRecord::Migration[5.2]
+  def change
+    remove_reference :reviews, :issue
+    add_reference :reviews, :pull_request
+  end
+end
diff --git a/spec/models/pull_requests_reviewer_spec.rb b/spec/models/pull_requests_reviewer_spec.rb
new file mode 100644
index 00000000..f3dfd9b9
--- /dev/null
+++ b/spec/models/pull_requests_reviewer_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe PullRequestsReviewer, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 5db43bf76889020b058106d6fbb45763d6a64f1a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 25 Jul 2022 16:21:03 +0800
Subject: [PATCH 124/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/base_controller.rb     |  1 +
 .../api/v1/projects/pulls/base_controller.rb  | 15 ------
 .../v1/projects/pulls/comments_controller.rb  |  2 +
 .../v1/projects/pulls/reviews_controller.rb   |  7 +++
 .../api/v1/projects/pulls_controller.rb       | 19 ++++++++
 app/controllers/concerns/api/pull_helper.rb   | 19 ++++++++
 .../api/v1/projects/pulls/list_service.rb     | 46 +++++++++++++++++++
 .../pulls/_simple_detail.json.jbuilder        | 25 ++++++++++
 .../api/v1/projects/pulls/index.json.jbuilder |  4 ++
 9 files changed, 123 insertions(+), 15 deletions(-)
 create mode 100644 app/controllers/api/v1/projects/pulls/comments_controller.rb
 create mode 100644 app/controllers/api/v1/projects/pulls/reviews_controller.rb
 create mode 100644 app/controllers/api/v1/projects/pulls_controller.rb
 create mode 100644 app/controllers/concerns/api/pull_helper.rb
 create mode 100644 app/services/api/v1/projects/pulls/list_service.rb
 create mode 100644 app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/pulls/index.json.jbuilder

diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index a66bfc52..4b3b8ab1 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -2,6 +2,7 @@ class Api::V1::BaseController < ApplicationController
 
   include Api::ProjectHelper
   include Api::UserHelper
+  include Api::PullHelper
 
   # before_action :doorkeeper_authorize!
   # skip_before_action :user_setup
diff --git a/app/controllers/api/v1/projects/pulls/base_controller.rb b/app/controllers/api/v1/projects/pulls/base_controller.rb
index 0d5ae08b..acb5e2a0 100644
--- a/app/controllers/api/v1/projects/pulls/base_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/base_controller.rb
@@ -2,19 +2,4 @@ class Api::V1::Projects::Pulls::BaseController < Api::V1::BaseController
   before_action :require_public_and_member_above
   before_action :load_pull_request
 
-  def load_pull_request
-    pull_request_id = params[:pull_id] || params[:id]
-    @pull_request = @project.pull_requests.where(gitea_number: pull_request_id).where.not(id: pull_request_id).take || PullRequest.find_by_id(pull_request_id)
-    @issue = @pull_request&.issue
-    if @pull_request
-      logger.info "###########pull_request founded"
-			@pull_request
-    else
-			logger.info "###########pull_request not found"
-      @pull_request = nil
-       render_not_found and return
-    end
-
-    @pull_request
-  end
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pulls/comments_controller.rb b/app/controllers/api/v1/projects/pulls/comments_controller.rb
new file mode 100644
index 00000000..8622c319
--- /dev/null
+++ b/app/controllers/api/v1/projects/pulls/comments_controller.rb
@@ -0,0 +1,2 @@
+class Api::V1::Projects::Pulls::CommentsController < Api::V1::Projects::Pulls::BaseController 
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pulls/reviews_controller.rb b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
new file mode 100644
index 00000000..e07f02e3
--- /dev/null
+++ b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
@@ -0,0 +1,7 @@
+class Api::V1::Projects::Pulls::ReviewsController < Api::V1::Projects::Pulls::BaseController 
+
+  def index 
+    @reviews = @pull_request.reviews 
+    @reviews = kaminari_paginate(@reviews)
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pulls_controller.rb b/app/controllers/api/v1/projects/pulls_controller.rb
new file mode 100644
index 00000000..fe39b2ad
--- /dev/null
+++ b/app/controllers/api/v1/projects/pulls_controller.rb
@@ -0,0 +1,19 @@
+class Api::V1::Projects::PullsController < Api::V1::BaseController
+  before_action :require_public_and_member_above
+
+  def index  
+    @pulls = Api::V1::Projects::Pulls::ListService.call(@project, query_params)
+    @pulls = kaminari_paginate(@pulls)
+  end
+
+  before_action :load_pull_request, only: [:show] 
+
+  def show 
+   
+  end
+
+  private 
+  def query_params 
+    params.permit(:status, :keyword, :priority_id, :issue_tag_id, :version_id, :reviewer_id, :sort_by, :sort_direction)
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/concerns/api/pull_helper.rb b/app/controllers/concerns/api/pull_helper.rb
new file mode 100644
index 00000000..e186cd6f
--- /dev/null
+++ b/app/controllers/concerns/api/pull_helper.rb
@@ -0,0 +1,19 @@
+module Api::PullHelper
+  extend ActiveSupport::Concern
+
+  def load_pull_request
+    pull_request_id = params[:pull_id] || params[:id]
+    @pull_request = @project.pull_requests.where(gitea_number: pull_request_id).where.not(id: pull_request_id).take || PullRequest.find_by_id(pull_request_id)
+    @issue = @pull_request&.issue
+    if @pull_request
+      logger.info "###########pull_request founded"
+			@pull_request
+    else
+			logger.info "###########pull_request not found"
+      @pull_request = nil
+       render_not_found and return
+    end
+
+    @pull_request
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/pulls/list_service.rb b/app/services/api/v1/projects/pulls/list_service.rb
new file mode 100644
index 00000000..6b18da2c
--- /dev/null
+++ b/app/services/api/v1/projects/pulls/list_service.rb
@@ -0,0 +1,46 @@
+class Api::V1::Projects::Pulls::ListService < ApplicationService
+  include ActiveModel::Model
+
+  attr_reader :project, :keyword, :status, :priority_id, :issue_tag_id, :version_id, :reviewer_id, :sort_by, :sort_direction 
+  attr_accessor :queried_pull_requests
+
+  validates :status, inclusion: {in: [0, 1, 2], message: "请输入正确的Status"}, allow_nil: true
+  validates :sort_by, inclusion: {in: PullRequest.column_names, message: '请输入正确的SortBy'}
+  validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}
+
+  def initialize(project, params={})
+    @project = project 
+    @keyword = params[:keyword]
+    @status = params[:status].to_i
+    @priority_id = params[:priority_id]
+    @issue_tag_id = params[:issue_tag_id]
+    @version_id = params[:version_id]
+    @reviewer_id = params[:reviewer_id]
+    @sort_by = params[:sort_by] || 'created_at'
+    @sort_direction = params[:sort_direction] || 'desc'
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid? 
+    pull_request_query_data
+
+    queried_pull_requests
+  end
+
+  private 
+  def pull_request_query_data 
+    pull_requests = @project.pull_requests
+
+    pull_requests = pull_requests.where(status: status) if status.present? 
+    pull_requests = pull_requests.where(issues: {priority_id: priority_id}) if priority_id.present?
+    pull_requests = pull_requests.where(issue_tags: {id: issue_tag_id}) if issue_tag_id.present? 
+    pull_requests = pull_requests.where(issues: {fixed_version_id: version_id}) if version_id.present?
+    pull_requests = pull_requests.where(users: {id: reviewer_id}) if reviewer_id.present? 
+    
+    q = pull_requests.ransack(title_or_body_cont: keyword)
+    scope = q.result.includes(:fork_project, :journals, :reviews, :reviewers, issue: [:journals, :priority, :version, :issue_tags])
+    scope = scope.order("pull_requests.#{sort_by} #{sort_direction}")
+
+    @queried_pull_requests = scope
+  end
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
new file mode 100644
index 00000000..e8c668c5
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
@@ -0,0 +1,25 @@
+json.(pull, :id, :head, :base, :is_original)
+json.index pull.gitea_number
+json.status pull.status == 1 ? "merged" : (pull.status == 2 ? "closed" : "open")
+
+fork_project = pull&.fork_project
+if fork_project.present?
+  json.fork_project do 
+    json.(fork_project, :id, :identifier)
+    json.login fork_project&.owner&.login
+  end
+end
+
+issue = pull&.issue
+json.issue do 
+  json.id issue&.id
+  json.author do 
+    json.partial! '/api/v1/users/simple_user', user: issue&.user
+  end
+  json.priority issue&.priority.try(:name)
+  json.version issue&.version.try(:name)
+  json.comments_count issue.journals.count 
+  json.issue_tags issue.get_issue_tags
+end
+
+json.comments_count pull.journals.count
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pulls/index.json.jbuilder b/app/views/api/v1/projects/pulls/index.json.jbuilder
new file mode 100644
index 00000000..412ea13d
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.total_count @pulls.total_count
+json.pulls @pulls.each do |pull|
+  json.partial! 'api/v1/projects/pulls/simple_detail', pull: pull
+end
\ No newline at end of file

From 5463c22518df6823d9feaa2458c8c420b7fd3bd0 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 25 Jul 2022 17:28:38 +0800
Subject: [PATCH 125/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=88=9B=E5=BB=BA=E5=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/base_controller.rb        |  6 +++---
 .../api/v1/projects/pulls/reviews_controller.rb  | 16 ++++++++++++++++
 app/models/review.rb                             |  2 +-
 .../v1/projects/pulls/reviews/create_service.rb  |  8 ++++----
 .../projects/issues/_simple_detail.json.jbuilder |  0
 .../projects/pulls/reviews/create.json.jbuilder  |  8 ++++++++
 config/routes/api.rb                             |  1 +
 7 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 app/views/api/v1/projects/issues/_simple_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/pulls/reviews/create.json.jbuilder

diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index 4b3b8ab1..c765906b 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -31,18 +31,18 @@ class Api::V1::BaseController < ApplicationController
   # 具有对仓库的管理权限
   def require_manager_above
     @project = load_project
-    return render_forbidden unless current_user.admin? && @project.manager?(current_user)
+    return render_forbidden if !current_user.admin? && !@project.manager?(current_user)
   end
 
   # 具有对仓库的操作权限
   def require_operate_above 
     @project = load_project
-    return render_forbidden unless current_user.admin? && @project.operator?(current_user)
+    return render_forbidden if !current_user.admin? && !@project.operator?(current_user)
   end
 
   # 具有对仓库的访问权限
   def require_public_and_member_above
     @project = load_project 
-    return render_forbidden unless @project.is_public || (current_user.admin? && @project.member?(current_user))
+    return render_forbidden if !@project.is_public && !current_user.admin? && !@project.member?(current_user)
   end
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pulls/reviews_controller.rb b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
index e07f02e3..ccb63783 100644
--- a/app/controllers/api/v1/projects/pulls/reviews_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
@@ -4,4 +4,20 @@ class Api::V1::Projects::Pulls::ReviewsController < Api::V1::Projects::Pulls::Ba
     @reviews = @pull_request.reviews 
     @reviews = kaminari_paginate(@reviews)
   end
+
+  before_action :require_reviewer, only: [:create]
+
+  def create 
+    @journal, @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
+  end
+
+  private 
+  def require_reviewer
+    puts @pull_request.reviewers.exists?(current_user.id)
+    return render_forbidden('您没有审查权限，请联系项目管理员') if !current_user.admin? && !@pull_request.reviewers.exists?(current_user.id)
+  end
+
+  def review_params 
+    params.require(:review).permit(:content, :commit_id, :status)
+  end
 end
\ No newline at end of file
diff --git a/app/models/review.rb b/app/models/review.rb
index 715e1168..efb50813 100644
--- a/app/models/review.rb
+++ b/app/models/review.rb
@@ -19,7 +19,7 @@
 
 class Review < ApplicationRecord
 
-  belongs_to :issue
+  belongs_to :pull_request
   belongs_to :reviewer, class_name: 'User', foreign_key: :reviewer_id
   has_one :journal, dependent: :destroy
 
diff --git a/app/services/api/v1/projects/pulls/reviews/create_service.rb b/app/services/api/v1/projects/pulls/reviews/create_service.rb
index 13ec9f7e..bef94487 100644
--- a/app/services/api/v1/projects/pulls/reviews/create_service.rb
+++ b/app/services/api/v1/projects/pulls/reviews/create_service.rb
@@ -24,17 +24,17 @@ class Api::V1::Projects::Pulls::Reviews::CreateService < ApplicationService
     end 
 
     return @journal, @review
-  rescue 
-    raise Error, '服务器错误，请联系系统管理员！'
+  # rescue 
+  #   raise Error, '服务器错误，请联系系统管理员！'
   end
 
   private 
   def create_review  
-    @review = issue.reviews.create!(status: status, content: content, commit_id: commit_id, reviewer_id: @current_user.id)
+    @review = pull_request.reviews.create!(status: status, content: content, commit_id: commit_id, reviewer_id: @current_user.id)
   end
 
   def create_journal
-    @journal = issue.journals.create!(notes: content, user_id: @current_user.id, review_id: @review.id)
+    @journal = pull_request.journals.create!(notes: content, user_id: @current_user.id, review_id: @review.id)
   end
 
 end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/issues/_simple_detail.json.jbuilder b/app/views/api/v1/projects/issues/_simple_detail.json.jbuilder
new file mode 100644
index 00000000..e69de29b
diff --git a/app/views/api/v1/projects/pulls/reviews/create.json.jbuilder b/app/views/api/v1/projects/pulls/reviews/create.json.jbuilder
new file mode 100644
index 00000000..2b9f0efe
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/reviews/create.json.jbuilder
@@ -0,0 +1,8 @@
+json.reviewer do 
+  json.partial! "api/v1/users/simple_user", user: @review.reviewer
+end
+json.pull_request do 
+  json.partial! "api/v1/projects/pulls/simple_detail", pull: @review.pull_request
+end
+json.(@review, :id, :commit_id, :content, :status)
+json.created_at format_time(@review.created_at)
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 8340097e..0dfe6112 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -25,6 +25,7 @@ defaults format: :json do
                   get :diff
                 end
               end
+              resources :reviews, only: [:index, :create] 
             end
 
             resources :versions 

From 3f5754a3a569dcddbe5495a342ff7a8ca6534a16 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 25 Jul 2022 18:23:06 +0800
Subject: [PATCH 126/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  2 +-
 .../v1/projects/pulls/reviews_controller.rb   |  1 -
 .../api/v1/projects/pulls_controller.rb       |  3 +-
 app/controllers/pull_requests_controller.rb   |  2 +-
 .../api/v1/projects/pulls/get_service.rb      | 32 +++++++++++++++++++
 .../api/v1/projects/pulls/show.json.jbuilder  | 29 +++++++++++++++++
 6 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 app/services/api/v1/projects/pulls/get_service.rb
 create mode 100644 app/views/api/v1/projects/pulls/show.json.jbuilder

diff --git a/Gemfile b/Gemfile
index dd8885df..c5f4f2ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,4 +135,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.10.4'
\ No newline at end of file
+gem 'gitea-client', '~> 0.10.5'
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pulls/reviews_controller.rb b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
index ccb63783..523137a8 100644
--- a/app/controllers/api/v1/projects/pulls/reviews_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
@@ -13,7 +13,6 @@ class Api::V1::Projects::Pulls::ReviewsController < Api::V1::Projects::Pulls::Ba
 
   private 
   def require_reviewer
-    puts @pull_request.reviewers.exists?(current_user.id)
     return render_forbidden('您没有审查权限，请联系项目管理员') if !current_user.admin? && !@pull_request.reviewers.exists?(current_user.id)
   end
 
diff --git a/app/controllers/api/v1/projects/pulls_controller.rb b/app/controllers/api/v1/projects/pulls_controller.rb
index fe39b2ad..a930df76 100644
--- a/app/controllers/api/v1/projects/pulls_controller.rb
+++ b/app/controllers/api/v1/projects/pulls_controller.rb
@@ -9,7 +9,8 @@ class Api::V1::Projects::PullsController < Api::V1::BaseController
   before_action :load_pull_request, only: [:show] 
 
   def show 
-   
+   @result_object = Api::V1::Projects::Pulls::GetService.call(@project, @pull_request, current_user&.gitea_token)
+   @last_review = @pull_request.reviews.take
   end
 
   private 
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 52da4ac4..8bbfdc23 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -176,7 +176,7 @@ class PullRequestsController < ApplicationController
     @issue_assign_to = @issue.get_assign_user
     @gitea_pull = Gitea::PullRequest::GetService.call(@owner.login, 
       @repository.identifier, @pull_request.gitea_number, current_user&.gitea_token)
-    @last_review = @pull_request.issue.reviews.take
+    @last_review = @pull_request.reviews.take
   end
 
   def pr_merge
diff --git a/app/services/api/v1/projects/pulls/get_service.rb b/app/services/api/v1/projects/pulls/get_service.rb
new file mode 100644
index 00000000..3c1bba99
--- /dev/null
+++ b/app/services/api/v1/projects/pulls/get_service.rb
@@ -0,0 +1,32 @@
+class Api::V1::Projects::Pulls::GetService < ApplicationService
+
+  attr_reader :project, :pull_request, :owner, :repo, :index, :token
+  attr_accessor :gitea_data 
+
+  def initialize(project, pull_request, token = nil)
+    @project = project 
+    @pull_request = pull_request 
+    @owner = project&.owner.login 
+    @repo = project&.identifier 
+    @index = pull_request.gitea_number
+    @token = token 
+  end
+
+  def call 
+    load_gitea_data 
+
+    gitea_data 
+  end
+
+  private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_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/views/api/v1/projects/pulls/show.json.jbuilder b/app/views/api/v1/projects/pulls/show.json.jbuilder
new file mode 100644
index 00000000..fce27e17
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/show.json.jbuilder
@@ -0,0 +1,29 @@
+json.partial! "api/v1/projects/pulls/simple_detail", pull: @pull_request
+json.merge_base @result_object['merge_base']
+json.base_commit_sha @result_object['base']['sha']
+json.head_commit_sha @result_object['head']['sha']
+json.commit_num @result_object['commit_num']
+json.changed_files @result_object['changed_files']
+json.is_locked @result_object['is_locked']
+json.mergeable @result_object['mergeable'] # 是否能合并
+json.merged @result_object['merged']
+json.merged_at @result_object['merged_at'].nil? ? '' : render_unix_time( @result_object['merged_at']) 
+json.merge_commit_sha @result_object['merge_commit_sha']
+json.merge_by do 
+  if @result_object['merged_by']
+    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(@result_object['merged_by']), name: @result_object['merged_by']['login'] }
+  else 
+    json.nil!
+  end
+end
+json.last_review do 
+  if @last_review.present? 
+    json.(@last_review, :id, :commit_id, :content, :status)
+    json.created_at format_time(@last_review.created_at)
+    json.reviewer do 
+      json.partial! "api/v1/users/simple_user", user: @last_review.reviewer
+    end
+  else 
+    json.nil! 
+  end
+end
\ No newline at end of file

From 1bbde165c23852064277a0a2fdd8f3c1d0d86048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 26 Jul 2022 10:44:12 +0800
Subject: [PATCH 127/208] =?UTF-8?q?reposyncer=E5=90=8C=E6=AD=A5=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ob_repository_syncs_controller.rb         | 111 ++++++++++++
 app/models/ob_repository_sync.rb              |  28 +++
 app/models/ob_repository_sync_job.rb          |  24 +++
 app/models/repository.rb                      |   2 +-
 .../ob_repository_sync/api_service.rb         | 166 ++++++++++++++++++
 .../ob_repository_syncs/index.json.jbuilder   |   8 +
 config/routes.rb                              |  10 ++
 ...220721034359_create_ob_repository_syncs.rb |  15 ++
 ...21034618_create_ob_repository_sync_jobs.rb |  14 ++
 9 files changed, 377 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/ob_repository_syncs_controller.rb
 create mode 100644 app/models/ob_repository_sync.rb
 create mode 100644 app/models/ob_repository_sync_job.rb
 create mode 100644 app/services/ob_repository_sync/api_service.rb
 create mode 100644 app/views/ob_repository_syncs/index.json.jbuilder
 create mode 100644 db/migrate/20220721034359_create_ob_repository_syncs.rb
 create mode 100644 db/migrate/20220721034618_create_ob_repository_sync_jobs.rb

diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb
new file mode 100644
index 00000000..0d14d25e
--- /dev/null
+++ b/app/controllers/ob_repository_syncs_controller.rb
@@ -0,0 +1,111 @@
+class ObRepositorySyncsController < ApplicationController
+  before_action :require_login
+  before_action :load_project
+  before_action :load_ob_repository_sync, except: [:create]
+  before_action :authenticate_user!
+
+  def index
+
+  end
+
+
+  def create
+    tip_exception "参数错误" if params[:github_address].blank? && params[:gitee_address].blank?
+    project_name ="#{@project.owner.name}:#{@project.identifier}"
+    service = ObRepositorySync::ApiService.new(project_name)
+    params.merge({ "gitlink_address": @project.repository.url })
+    res = service.create_projects(params)
+    tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
+    sync_id = res["data"]["id"]
+    ob_repository_sync = ObRepositorySync.find_or_initialize_by(project_id: @project.id)
+    ob_repository_sync.project_id = @project.id
+    ob_repository_sync.user_id = current_user.id
+    ob_repository_sync.name = project_name
+    ob_repository_sync.github_address = "#{params[:github_address]}"
+    ob_repository_sync.gitee_address = "#{params[:gitee_address]}"
+    ob_repository_sync.github_token = "#{params[:github_token]}"
+    ob_repository_sync.gitee_token = "#{params[:gitee_token]}"
+    ob_repository_sync.sync_id = sync_id
+    ob_repository_sync.save!
+    render_ok
+  end
+
+  def delete
+    service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
+    res = service.delete_project @ob_repository_sync.sync_id
+    tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
+    if res["code"].to_s == "200"
+      @ob_repository_sync.destroy!
+    end
+  end
+
+  def jobs
+    tip_exception "该项目未创建同步任务" if @ob_repository_sync.blank?
+    service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
+    res = service.get_projects_jobs
+    render_ok(count: res["data"]["total"], data: res["data"]["list"])
+  end
+
+  def create_jobs
+    service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
+    res = service.create_projects_jobs(params)
+    tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
+    job_id = res["data"]["id"]
+    job = ObRepositorySyncJob.new
+    job.ob_repository_sync_id = @ob_repository_sync.id
+    job.github_branch = "#{params[:github_branch]}"
+    job.gitee_branch = "#{params[:gitee_branch]}"
+    job.gitlink_branch = "#{params[:gitlink_branch]}"
+    job.job_type = "#{params[:type]}"
+    job.base = "#{params[:base]}"
+    job.job_id = job_id
+    job.save
+    render_ok
+  end
+
+
+  def delete_job
+    tip_exception "缺少参数job_id" if params[:job_id].blank?
+    service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
+    res = service.delete_job params[:job_id]
+    tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
+    @ob_repository_sync.destroy!
+    render_ok
+  end
+
+  def start_job
+    tip_exception "缺少参数job_id" if params[:job_id].blank?
+    service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
+    res = service.start_job params[:job_id]
+    tip_exception "启动错误: #{res["msg"]}" if res["code"].to_s != "200"
+    render_ok
+  end
+
+  def stop_job
+    tip_exception "缺少参数job_id" if params[:job_id].blank?
+    service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
+    res = service.stop_job params[:job_id]
+    tip_exception "停止错误: #{res["msg"]}" if res["code"].to_s != "200"
+    render_ok
+  end
+
+  def job_logs
+    tip_exception "该项目未创建同步任务" if @ob_repository_sync.blank?
+    tip_exception "缺少参数job_id" if params[:job_id].blank?
+    service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
+    @data = service.job_logs params[:job_id]
+    tip_exception "请求错误: #{res["msg"]}" if res["code"].to_s != "200"
+    render_ok(count: res["data"]["total"], data: res["data"]["list"])
+  end
+
+  private
+
+  def load_ob_repository_sync
+    @ob_repository_sync = ObRepositorySync.find_by(project_id: @project.id)
+  end
+
+  def authenticate_user!
+    return if @project.member?(current_user) || current_user.admin?
+    render_forbidden('你没有权限操作')
+  end
+end
diff --git a/app/models/ob_repository_sync.rb b/app/models/ob_repository_sync.rb
new file mode 100644
index 00000000..b938658e
--- /dev/null
+++ b/app/models/ob_repository_sync.rb
@@ -0,0 +1,28 @@
+# == Schema Information
+#
+# Table name: ob_repository_syncs
+#
+#  id             :integer          not null, primary key
+#  project_id     :integer
+#  user_id        :integer
+#  name           :string(255)
+#  github_address :string(255)
+#  gitee_address  :string(255)
+#  github_token   :string(255)
+#  gitee_token    :string(255)
+#  sync_id        :integer
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#
+# Indexes
+#
+#  index_ob_repository_syncs_on_project_id  (project_id)
+#  index_ob_repository_syncs_on_user_id     (user_id)
+#
+
+class ObRepositorySync < ApplicationRecord
+  belongs_to :project
+  belongs_to :user
+
+  has_many :ob_repository_sync_jobs,  dependent: :destroy
+end
diff --git a/app/models/ob_repository_sync_job.rb b/app/models/ob_repository_sync_job.rb
new file mode 100644
index 00000000..3961f0a2
--- /dev/null
+++ b/app/models/ob_repository_sync_job.rb
@@ -0,0 +1,24 @@
+# == Schema Information
+#
+# Table name: ob_repository_sync_jobs
+#
+#  id                    :integer          not null, primary key
+#  ob_repository_sync_id :integer
+#  github_branch         :string(255)
+#  gitee_branch          :string(255)
+#  gitlink_branch        :string(255)
+#  job_type              :string(255)
+#  base                  :string(255)
+#  job_id                :integer
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#
+# Indexes
+#
+#  index_ob_repository_sync_jobs_on_ob_repository_sync_id  (ob_repository_sync_id)
+#
+
+class ObRepositorySyncJob < ApplicationRecord
+  belongs_to :ob_repository_sync
+
+end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 12cc2fa3..03c4e98e 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -49,7 +49,7 @@ class Repository < ApplicationRecord
   end
 
   def url
-    self['url'].blank? ? "#{Rails.application.config_for(:configuration)['platform_url']}/#{self.owner&.login}/#{self.identifier}.git" : self['url']
+    self['url'].blank? ? "#{Gitea.gitea_config[:domain]}/#{self.owner&.login}/#{self.identifier}.git" : self['url']
   end
 
   # with repository is mirror
diff --git a/app/services/ob_repository_sync/api_service.rb b/app/services/ob_repository_sync/api_service.rb
new file mode 100644
index 00000000..7bed888e
--- /dev/null
+++ b/app/services/ob_repository_sync/api_service.rb
@@ -0,0 +1,166 @@
+class ObRepositorySync::ApiService < ApplicationService
+  attr_reader :project_name
+
+  def initialize(project_name)
+    @project_name = project_name
+  end
+
+  def call
+    true
+  end
+
+  def create_projects(params = {})
+    projects_body = {
+      "name": "#{@project_name}",
+      "github_address": "#{params[:github_address]}",
+      "gitee_address": "#{params[:gitee_address]}",
+      "github_token": "#{params[:github_token]}",
+      "gitee_token": "#{params[:gitee_token]}"
+    }
+    url = URI("#{domain}/cerobot/projects")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Post.new(url)
+    request["Content-Type"] = "application/json"
+    request.body = JSON.dump(projects_body)
+
+    response = http.request(request)
+    # Rails.logger.info "cerobot/projects response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    res
+  end
+
+  def delete_project sync_id
+    url = URI("#{domain}/cerobot/projects?id=#{sync_id}")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Delete.new(url)
+    request["Content-Type"] = "application/json"
+    response = http.request(request)
+    # Rails.logger.info "delete project response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    res
+  end
+
+  def get_projects_jobs
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Get.new(url)
+    request["Content-Type"] = "application/json"
+    response = http.request(request)
+    Rails.logger.info "cerobot/projects response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    res
+  end
+
+  def create_projects_jobs(params = {})
+    job_body = {
+      "github_branch": "#{params[:github_branch]}",
+      "gitee_branch": "#{params[:gitee_branch]}",
+      "gitlink_branch": "#{params[:gitlink_branch]}",
+      "type": "#{params[:type]}",
+      "base": "#{params[:base]}"
+    }
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Post.new(url)
+    request["Content-Type"] = "application/json"
+    request.body = JSON.dump(job_body)
+
+    response = http.request(request)
+    Rails.logger.info "cerobot/projects response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    res
+  end
+
+  def delete_job job_id
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs?id=#{job_id}")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Delete.new(url)
+    request["Content-Type"] = "application/json"
+    response = http.request(request)
+    Rails.logger.info "delete job response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    res
+  end
+
+  def start_job job_id
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs/#{job_id}/start")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Put.new(url)
+    request["Content-Type"] = "application/json"
+    response = http.request(request)
+    Rails.logger.info "start job response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    res
+  end
+
+  def stop_job job_id
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs/#{job_id}/stop")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Put.new(url)
+    request["Content-Type"] = "application/json"
+    response = http.request(request)
+    Rails.logger.info "stop job response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    res
+  end
+
+  def set_commit job_id, commit_id
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs/#{job_id}/set_commit?commit=#{commit_id}")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Put.new(url)
+    response = http.request(request)
+    Rails.logger.info "set_commit job response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    res
+  end
+
+  def job_logs job_id
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs/#{job_id}/logs")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Get.new(url)
+    request["Content-Type"] = "application/json"
+    response = http.request(request)
+    Rails.logger.info "set_commit job response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    if res["code"].to_s == "200"
+      res["data"]
+    else
+      []
+    end
+  end
+
+  def pull_requests
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/pullrequests")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Get.new(url)
+    request["Content-Type"] = "application/json"
+    response = http.request(request)
+    Rails.logger.info "pull_requests response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    if res["code"].to_s == "200"
+      res["data"]
+    else
+      []
+    end
+  end
+
+  def pull_requests_sync
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/pullrequests/sync")
+    http = Net::HTTP.new(url.host, url.port)
+    request = Net::HTTP::Get.new(url)
+    request["Content-Type"] = "application/json"
+    response = http.request(request)
+    Rails.logger.info "pull_requests_sync response.read_body======#{response.read_body}"
+    res = JSON.parse(response.body)
+    if res["code"].to_s == "200"
+      res["data"]
+    else
+      []
+    end
+  end
+
+  def domain
+    EduSetting.get("ob_repository_sync_api_domain") || "http://106.75.110.152:50087"
+  end
+
+end
diff --git a/app/views/ob_repository_syncs/index.json.jbuilder b/app/views/ob_repository_syncs/index.json.jbuilder
new file mode 100644
index 00000000..4b719aa8
--- /dev/null
+++ b/app/views/ob_repository_syncs/index.json.jbuilder
@@ -0,0 +1,8 @@
+json.status 0
+json.message "success"
+json.data do
+  if @ob_repository_sync
+    json.extract! @ob_repository_sync,  :user_id, :name, :github_address, :gitee_address, :github_token, :gitee_token,:sync_id, :created_at, :updated_at
+  end
+
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 73e06ea5..f32f1050 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -555,6 +555,16 @@ Rails.application.routes.draw do
       resources :project_trends, :path => :activity, only: [:index, :create]
       resources :issue_tags, :path => :labels, only: [:create, :edit, :update, :destroy, :index]
       resources :version_releases, :path => :releases, only: [:index,:new, :show, :create, :edit, :update, :destroy]
+      resources :ob_repository_syncs, :path => :synchronizes, only: [:index, :create] do
+        collection do
+          delete :delete
+          get :jobs
+          post :create_jobs
+          delete :delete_job
+          post :start_job
+          post :stop_job
+        end
+      end
 
       scope module: :ci do
         scope do
diff --git a/db/migrate/20220721034359_create_ob_repository_syncs.rb b/db/migrate/20220721034359_create_ob_repository_syncs.rb
new file mode 100644
index 00000000..e4b6b91a
--- /dev/null
+++ b/db/migrate/20220721034359_create_ob_repository_syncs.rb
@@ -0,0 +1,15 @@
+class CreateObRepositorySyncs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ob_repository_syncs do |t|
+      t.references :project
+      t.references :user
+      t.string :name
+      t.string :github_address
+      t.string :gitee_address
+      t.string :github_token
+      t.string :gitee_token
+      t.integer :sync_id
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20220721034618_create_ob_repository_sync_jobs.rb b/db/migrate/20220721034618_create_ob_repository_sync_jobs.rb
new file mode 100644
index 00000000..bd4aa1bf
--- /dev/null
+++ b/db/migrate/20220721034618_create_ob_repository_sync_jobs.rb
@@ -0,0 +1,14 @@
+class CreateObRepositorySyncJobs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ob_repository_sync_jobs do |t|
+      t.references :ob_repository_sync
+      t.string :github_branch
+      t.string :gitee_branch
+      t.string :gitlink_branch
+      t.string :job_type
+      t.string :base
+      t.integer :job_id
+      t.timestamps
+    end
+  end
+end

From 19ffd9fea1b71ed44894f5ccb18760a14e9a4adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 26 Jul 2022 10:55:42 +0800
Subject: [PATCH 128/208] =?UTF-8?q?fixed=20PullRequest=20=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?gitea=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb
index b3ab1e03..4ced61aa 100644
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@@ -37,7 +37,7 @@ class PullRequest < ApplicationRecord
   has_many :pull_request_tags, foreign_key: :pull_request_id
   has_many :project_trends, as: :trend, dependent: :destroy
   has_many :attachments, as: :container, dependent: :destroy
-  has_one :gitea_pull, foreign_key: :id, primary_key: :gitea_number, class_name: 'Gitea::Pull'
+  has_one :gitea_pull, foreign_key: :id, primary_key: :gitea_id, class_name: 'Gitea::Pull'
   has_many :journals, :as => :journalized, :dependent => :destroy
   has_many :journal_details, through: :journals
   has_many :reviews, dependent: :destroy

From bb3f5cec7613d615e64cd1d8e7e01633ca317f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 26 Jul 2022 11:40:49 +0800
Subject: [PATCH 129/208] =?UTF-8?q?fixed=20reposyncer=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ob_repository_syncs_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb
index 0d14d25e..013e6fe5 100644
--- a/app/controllers/ob_repository_syncs_controller.rb
+++ b/app/controllers/ob_repository_syncs_controller.rb
@@ -5,7 +5,7 @@ class ObRepositorySyncsController < ApplicationController
   before_action :authenticate_user!
 
   def index
-
+    render_ok(data: @ob_repository_sync)
   end
 
 

From 7a54c5f5363702f588892fd5a491e17d069db563 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 26 Jul 2022 14:14:25 +0800
Subject: [PATCH 130/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/docs/slate/source/includes/_pulls.md      | 369 ++++++---
 .../pulls/_simple_detail.json.jbuilder        |   4 +-
 .../api/v1/projects/pulls/show.json.jbuilder  |   3 +-
 public/docs/api.html                          | 725 +++++++++++++++---
 4 files changed, 911 insertions(+), 190 deletions(-)

diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index e7df6409..650ad8a0 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -1,84 +1,127 @@
 # Pulls
 
 
-## Get a pull request
+## 获取一个合并请求
 获取合并请求详情接口
 
 > 示例:
 
 ```shell
-curl -X GET http://localhost:3000/api/Jasder/gitlink/pulls/88.json
+curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/1.json
 ```
 
 ```javascript
-await octokit.request('GET /api/Jasder/gitlink/pulls/88.json')
+await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/1.json')
 ```
 
 ### HTTP 请求
-`GET /api/:owner/:repo/pulls/:id.json`
+`GET /api/v1/:owner/:repo/pulls/:index.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
 |owner             |是| |string |用户登录名  |
 |repo             |是| |string |项目标识identifier  |
-|id             |是|  | integer | pull id值 |
-
+|index             |是|  | integer | pull 序号 |
 
 
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|-|-|-|
+|id                   |int|合并请求ID|
+|head                 |int|合并请求源分支|
+|base                 |int|合并请求目标分支|
+|index                |int|合并请求序号|
+|status               |string|合并请求状态，open: 开启的, merged: 合并的, closed: 关闭的|
+|issue.id             |int|疑修ID|
+|issue.author         |object|疑修作者|
+|issue.priority       |string|疑修优先级|
+|issue.version        |string|疑修里程碑|
+|issue.journals_count |int|普通评论数量|
+|issue.issue_tags     |array|标记|
+|journals_count       |int|审查评论数量|
+|merge_base           |string|目标的commit ID|
+|base_commit_sha      |string|合并之后的第一个commit ID|
+|head_commit_sha      |string|源commit ID|
+|commit_num           |int|commit数量|
+|changed_files        |int|更改文件数量|
+|is_locked            |bool||
+|mergeable            |bool|是否能合并|
+|merged               |bool|是否合并|
+|merged_at            |string|合并时间|
+|merge_commit_sha     |string|合并之后的第一个commit ID|
+|merge_by             |object|被谁合并了|
+|last_review.id       |int|最后一个审查的id|
+|last_review.commit_id|string|最后一个审查对应的commit ID|
+|last_review.content  |string|最后一个审查的内容|
+|last_review.status   |string|最后一个审查的状态，common: 一般审查, approved: 通过, rejected: 拒绝通过|
+|last_review.created_at|string|审查创建的时间|
+|last_review.reviewer |object|审查创建人|
+|conflict_files       |array|有冲突的文件|
 
 > 返回的JSON示例:
 
 ```json
 {
-    "status": 0,
-    "message": "响应成功",
-    "project_name": "Gitlink",
-    "identifier": "forgeplus",
-    "project_identifier": "forgeplus",
-    "pr_time": "52分钟前",
-    "commits_count": 229,
-    "files_count": 328,
-    "comments_count": 0,
-    "comments_total_count": 0,
-    "pull_request": {
-        "id": 1189,
-        "base": "master",
-        "head": "develop",
-        "status": 0,
-        "fork_project_id": null,
-        "is_original": false,
-        "pull_request_staus": "open",
-        "fork_project_user": null,
-        "create_user": "jasder",
-        "mergeable": true,
-        "state": "open"
-    },
+    "id": 168,
+    "head": "new_branch",
+    "base": "master",
+    "is_original": false,
+    "index": 5,
+    "status": "merged",
     "issue": {
-        "id": 51888,
-        "subject": "FIx release v3.2.0",
-        "description": null,
-        "is_private": false,
-        "branch_name": null,
-        "project_author_name": "Gitlink",
-        "closed_on": "",
-        "created_at": "2021-10-12 15:51",
-        "assign_user_name": "victor",
-        "assign_user_login": "moshenglv",
-        "author_name": "段甲生",
-        "author_login": "jasder",
-        "author_picture": "images/avatars/User/36480?t=1615520120",
-        "issue_status": "新增",
-        "priority": "正常",
+        "id": 265,
+        "author": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "priority": null,
         "version": null,
+        "journals_count": 1,
         "issue_tags": null
     },
+    "journals_count": 0,
+    "merge_base": "4a277037093c1248e46d2946ee30b61cccdb9df9",
+    "base_commit_sha": "dbb510cd852a6bfd4d71a1f84921aa3170654590",
+    "head_commit_sha": "0f0e27918eb5deb8d514012d84d13db10eebe19a",
+    "commit_num": 1,
+    "changed_files": 1,
+    "is_locked": false,
+    "mergeable": true,
+    "merged": true,
+    "merged_at": 1658743004,
+    "merge_commit_sha": "dbb510cd852a6bfd4d71a1f84921aa3170654590",
+    "merge_by": {
+        "id": null,
+        "login": "yystopf",
+        "name": "yystopf",
+        "type": null,
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "last_review": {
+        "id": 5,
+        "commit_id": null,
+        "content": "新建一个审查",
+        "status": "common",
+        "created_at": "2022-07-25 17:08",
+        "reviewer": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        }
+    },
     "conflict_files": []
 }
 ```
 
-## 获取pull request文件列表
-获取pull request文件列表
+## 获取合并请求文件列表
+获取合并请求文件列表
 
 > 示例:
 
@@ -204,8 +247,8 @@ await octokit.request('GET /api/jasder/gitlink/pulls/1/files.json')
 ```
 
 
-## 获取pull request的commits列表
-获取pull request的commits列表
+## 获取合并请求的commits列表
+获取合并请求的commits列表
 
 > 示例:
 
@@ -433,21 +476,21 @@ await octokit.request('GET /api/Jason/test-txt/compare/master...Jason/test-txt:d
 ```
 
 
-##  List pull requests
+##  获取合并请求列表
 获取合并请求列表
 
 > 示例:
 
 ```shell
-curl -X GET http://localhost:3000/api/Jasder/gitlink/pulls.json
+curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls.json
 ```
 
 ```javascript
-await octokit.request('GET /api/Jasder/gitlink/pulls.json')
+await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls.json')
 ```
 
 ### HTTP 请求
-`GET /api/:owner/:repo/pulls.json`
+`GET /api/v1/:owner/:repo/pulls.json`
 
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
@@ -456,48 +499,86 @@ await octokit.request('GET /api/Jasder/gitlink/pulls.json')
 |repo             |是| |string |项目标识identifier  |
 
 
-
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|-|-|-|
+|total_count          |int|合并请求总数|
+|id                   |int|合并请求ID|
+|head                 |int|合并请求源分支|
+|base                 |int|合并请求目标分支|
+|index                |int|合并请求序号|
+|is_original          |bool|是否为fork仓库发来的合并请求|
+|status               |string|合并请求状态，open: 开启的, merged: 合并的, closed: 关闭的|
+|fork_project.id      |int|fork仓库的id|
+|fork_project.identifier|string|fork仓库的标识|
+|fork_project.login   |string|fork仓库拥有者的标识|
+|issue.id             |int|疑修ID|
+|issue.author         |object|疑修作者|
+|issue.priority       |string|疑修优先级|
+|issue.version        |string|疑修里程碑|
+|issue.journals_count |int|普通评论数量|
+|issue.issue_tags     |array|标记|
+|journals_count       |int|审查评论数量|
 
 > 返回的JSON示例:
 
 ```json
 {
-  "status": 0,
-  "message": "响应成功",
-  "open_count": 4,
-  "close_count": 51,
-  "merged_issues_size": 123,
-  "search_count": 4,
-  "limit": null,
-  "user_admin_or_member": true,
-  "user_admin_or_developer": true,
-  "project_name": "Gitlink",
-  "project_author_name": "Gitlink",
-  "issues": [
-    {
-      "pull_request_id": 1189,
-      "pull_request_status": 0,
-      "pull_request_head": "develop",
-      "pull_request_base": "master",
-      "pull_request_staus": "open",
-      "is_original": false,
-      "fork_project_id": null,
-      "fork_project_identifier": null,
-      "fork_project_user": null,
-      "id": 51888,
-      "name": "FIx release v3.2.0",
-      "pr_time": "59分钟前",
-      "assign_user_name": "victor",
-      "assign_user_login": "moshenglv",
-      "author_name": "段甲生",
-      "author_login": "jasder",
-      "avatar_url": "images/avatars/User/36480?t=1615520120",
-      "priority": "正常",
-      "version": null,
-      "journals_count": 0,
-      "issue_tags": null
-    }
-  ]
+    "total_count": 2,
+    "pulls": [
+        {
+            "id": 167,
+            "head": "master",
+            "base": "master",
+            "is_original": true,
+            "index": 4,
+            "status": "open",
+            "fork_project": {
+                "id": 491,
+                "identifier": "ceshi_commit",
+                "login": "testforge1"
+            },
+            "issue": {
+                "id": 264,
+                "author": {
+                    "id": 4,
+                    "type": "User",
+                    "name": "tes tforge1",
+                    "login": "testforge1",
+                    "image_url": "system/lets/letter_avatars/2/T/238_117_19/120.png"
+                },
+                "priority": null,
+                "version": null,
+                "journals_count": 0,
+                "issue_tags": null
+            },
+            "journals_count": 0
+        },
+        {
+            "id": 165,
+            "head": "master_1",
+            "base": "master",
+            "is_original": false,
+            "index": 3,
+            "status": "open",
+            "issue": {
+                "id": 262,
+                "author": {
+                    "id": 2,
+                    "type": "User",
+                    "name": "heh",
+                    "login": "yystopf",
+                    "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                },
+                "priority": null,
+                "version": null,
+                "journals_count": 0,
+                "issue_tags": null
+            },
+            "journals_count": 0
+        }
+    ]
 }
 ```
 
@@ -814,4 +895,112 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff
     "is_incomplete_line_too_long": false,
     "is_protected": false
 }
-```
\ No newline at end of file
+```
+
+## 为合并请求创建一个审查
+合并请求创建一个审查
+
+> 示例:
+
+```shell
+curl -X POST \
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
+```
+
+```javascript
+await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/reviews.json')
+```
+
+### HTTP 请求
+`POST /api/v1/:owner/:repo/pulls/:index/reviews.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner                |是| | string |用户登录名  |
+|repo                 |是| | string |项目标识identifier  |
+|index                |是| | integer|合并请求序号|
+|content              |否| | string |审查内容|
+|commit_id            |否| | string |当前合并请求的commit_id|
+|status               |是| | string |审查类型, common: 普通, approved: 通过, rejected: 拒绝|
+
+> 请求的JSON示例:
+
+```json
+{
+    "content": "新建一个审查",
+    "commit_id": "e506844b2467ce25a35dd46dad8236a1595a02da",
+    "status": "common"
+}
+```
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|reviewer                         |object |审查者 |
+|pull_request.id                  |integer|合并请求ID|
+|pull_request.head                |string|合并请求源分支|
+|pull_request.base                |string|合并请求目标分支|
+|pull_request.is_original         |string|合并请求是否从fork仓库所来|
+|pull_request.fork_project.id      |int|fork仓库的id|
+|pull_request.fork_project.identifier|string|fork仓库的标识|
+|pull_request.fork_project.login   |string|fork仓库拥有者的标识|
+|pull_request.index               |string|合并请求的序号|
+|pull_request.status              |string|合并请求的状态，open: 打开的, merged: 合并的, closed: 关闭的|
+|pull_request.issue.id            |integer|合并请求下疑修的ID|
+|pull_request.issue.author        |object|合并请求以及疑修的创建着|
+|pull_request.issue.priority      |string|疑修的优先级|
+|pull_request.issue.version       |string|疑修的里程碑|
+|pull_request.issue.journals_count|integer|普通评论数量|
+|pull_request.issue.issue_tags    |array|所属标记|
+|pull_request.journals_count      |integer|审查评论数量|
+|id                               |integer|审查ID|
+|commit_id                        |string|审查的commit ID|
+|content                          |string|审查的内容|
+|status                           |string|审查类型，common: 普通, approved: 通过，rejected: 拒绝通过|
+|created_at                       |string|审查创建时间|
+
+> 返回的JSON示例:
+
+```json
+{
+    "reviewer": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "pull_request": {
+        "id": 163,
+        "head": "master_1",
+        "base": "master",
+        "is_original": false,
+        "index": 1,
+        "status": "closed",
+        "issue": {
+            "id": 260,
+            "author": {
+                "id": 2,
+                "type": "User",
+                "name": "heh",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "priority": null,
+            "version": null,
+            "journals_count": 0,
+            "issue_tags": null
+        },
+        "journals_count": 6
+    },
+    "id": 10,
+    "commit_id": "e506844b2467ce25a35dd46dad8236a1595a02da",
+    "content": "新建一个审查",
+    "status": "common",
+    "created_at": "2022-07-26 11:45"
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
diff --git a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
index e8c668c5..93cba2e4 100644
--- a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
+++ b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
@@ -18,8 +18,8 @@ json.issue do
   end
   json.priority issue&.priority.try(:name)
   json.version issue&.version.try(:name)
-  json.comments_count issue.journals.count 
+  json.journals_count issue.journals.count 
   json.issue_tags issue.get_issue_tags
 end
 
-json.comments_count pull.journals.count
\ No newline at end of file
+json.journals_count pull.journals.count
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pulls/show.json.jbuilder b/app/views/api/v1/projects/pulls/show.json.jbuilder
index fce27e17..2553629e 100644
--- a/app/views/api/v1/projects/pulls/show.json.jbuilder
+++ b/app/views/api/v1/projects/pulls/show.json.jbuilder
@@ -26,4 +26,5 @@ json.last_review do
   else 
     json.nil! 
   end
-end
\ No newline at end of file
+end
+json.conflict_files @pull_request.conflict_files
\ No newline at end of file
diff --git a/public/docs/api.html b/public/docs/api.html
index 297c1dc8..967ed233 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -595,19 +595,19 @@
             <a href="#pulls" class="toc-h1 toc-link" data-title="Pulls">Pulls</a>
               <ul class="toc-list-h2">
                   <li>
-                    <a href="#get-a-pull-request" class="toc-h2 toc-link" data-title="Get a pull request">Get a pull request</a>
+                    <a href="#3dd92dce4a" class="toc-h2 toc-link" data-title="获取一个合并请求">获取一个合并请求</a>
                   </li>
                   <li>
-                    <a href="#pull-request" class="toc-h2 toc-link" data-title="获取pull request文件列表">获取pull request文件列表</a>
+                    <a href="#dd8282460a" class="toc-h2 toc-link" data-title="获取合并请求文件列表">获取合并请求文件列表</a>
                   </li>
                   <li>
-                    <a href="#pull-request-commits" class="toc-h2 toc-link" data-title="获取pull request的commits列表">获取pull request的commits列表</a>
+                    <a href="#commits" class="toc-h2 toc-link" data-title="获取合并请求的commits列表">获取合并请求的commits列表</a>
                   </li>
                   <li>
                     <a href="#compare-two-commits" class="toc-h2 toc-link" data-title="Compare two commits">Compare two commits</a>
                   </li>
                   <li>
-                    <a href="#list-pull-requests" class="toc-h2 toc-link" data-title="List pull requests">List pull requests</a>
+                    <a href="#6a019ede04" class="toc-h2 toc-link" data-title="获取合并请求列表">获取合并请求列表</a>
                   </li>
                   <li>
                     <a href="#12fc53a2d2" class="toc-h2 toc-link" data-title="获取合并请求版本列表">获取合并请求版本列表</a>
@@ -615,6 +615,9 @@
                   <li>
                     <a href="#diff" class="toc-h2 toc-link" data-title="获取合并请求版本Diff">获取合并请求版本Diff</a>
                   </li>
+                  <li>
+                    <a href="#60a608ec1c" class="toc-h2 toc-link" data-title="为合并请求创建一个审查">为合并请求创建一个审查</a>
+                  </li>
               </ul>
           </li>
           <li>
@@ -12015,16 +12018,16 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <aside class="success">
   Success Data.
 </aside>
-<h1 id='pulls'>Pulls</h1><h2 id='get-a-pull-request'>Get a pull request</h2>
+<h1 id='pulls'>Pulls</h1><h2 id='3dd92dce4a'>获取一个合并请求</h2>
 <p>获取合并请求详情接口</p>
 
 <blockquote>
 <p>示例:</p>
 </blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/Jasder/gitlink/pulls/88.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/Jasder/gitlink/pulls/88.json</span><span class="dl">'</span><span class="p">)</span>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/1.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi_commit/pulls/1.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http'>HTTP 请求</h3>
-<p><code>GET /api/:owner/:repo/pulls/:id.json</code></p>
+<p><code>GET /api/v1/:owner/:repo/pulls/:index.json</code></p>
 <h3 id='2eb6f47757'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -12050,11 +12053,175 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>项目标识identifier</td>
 </tr>
 <tr>
-<td>id</td>
+<td>index</td>
 <td>是</td>
 <td></td>
 <td>integer</td>
-<td>pull id值</td>
+<td>pull 序号</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+</tr>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>合并请求ID</td>
+</tr>
+<tr>
+<td>head</td>
+<td>int</td>
+<td>合并请求源分支</td>
+</tr>
+<tr>
+<td>base</td>
+<td>int</td>
+<td>合并请求目标分支</td>
+</tr>
+<tr>
+<td>index</td>
+<td>int</td>
+<td>合并请求序号</td>
+</tr>
+<tr>
+<td>status</td>
+<td>string</td>
+<td>合并请求状态，open: 开启的, merged: 合并的, closed: 关闭的</td>
+</tr>
+<tr>
+<td>issue.id</td>
+<td>int</td>
+<td>疑修ID</td>
+</tr>
+<tr>
+<td>issue.author</td>
+<td>object</td>
+<td>疑修作者</td>
+</tr>
+<tr>
+<td>issue.priority</td>
+<td>string</td>
+<td>疑修优先级</td>
+</tr>
+<tr>
+<td>issue.version</td>
+<td>string</td>
+<td>疑修里程碑</td>
+</tr>
+<tr>
+<td>issue.journals_count</td>
+<td>int</td>
+<td>普通评论数量</td>
+</tr>
+<tr>
+<td>issue.issue_tags</td>
+<td>array</td>
+<td>标记</td>
+</tr>
+<tr>
+<td>journals_count</td>
+<td>int</td>
+<td>审查评论数量</td>
+</tr>
+<tr>
+<td>merge_base</td>
+<td>string</td>
+<td>目标的commit ID</td>
+</tr>
+<tr>
+<td>base_commit_sha</td>
+<td>string</td>
+<td>合并之后的第一个commit ID</td>
+</tr>
+<tr>
+<td>head_commit_sha</td>
+<td>string</td>
+<td>源commit ID</td>
+</tr>
+<tr>
+<td>commit_num</td>
+<td>int</td>
+<td>commit数量</td>
+</tr>
+<tr>
+<td>changed_files</td>
+<td>int</td>
+<td>更改文件数量</td>
+</tr>
+<tr>
+<td>is_locked</td>
+<td>bool</td>
+<td></td>
+</tr>
+<tr>
+<td>mergeable</td>
+<td>bool</td>
+<td>是否能合并</td>
+</tr>
+<tr>
+<td>merged</td>
+<td>bool</td>
+<td>是否合并</td>
+</tr>
+<tr>
+<td>merged_at</td>
+<td>string</td>
+<td>合并时间</td>
+</tr>
+<tr>
+<td>merge_commit_sha</td>
+<td>string</td>
+<td>合并之后的第一个commit ID</td>
+</tr>
+<tr>
+<td>merge_by</td>
+<td>object</td>
+<td>被谁合并了</td>
+</tr>
+<tr>
+<td>last_review.id</td>
+<td>int</td>
+<td>最后一个审查的id</td>
+</tr>
+<tr>
+<td>last_review.commit_id</td>
+<td>string</td>
+<td>最后一个审查对应的commit ID</td>
+</tr>
+<tr>
+<td>last_review.content</td>
+<td>string</td>
+<td>最后一个审查的内容</td>
+</tr>
+<tr>
+<td>last_review.status</td>
+<td>string</td>
+<td>最后一个审查的状态，common: 一般审查, approved: 通过, rejected: 拒绝通过</td>
+</tr>
+<tr>
+<td>last_review.created_at</td>
+<td>string</td>
+<td>审查创建的时间</td>
+</tr>
+<tr>
+<td>last_review.reviewer</td>
+<td>object</td>
+<td>审查创建人</td>
+</tr>
+<tr>
+<td>conflict_files</td>
+<td>array</td>
+<td>有冲突的文件</td>
 </tr>
 </tbody></table>
 
@@ -12062,52 +12229,62 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <p>返回的JSON示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"响应成功"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"project_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Gitlink"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"forgeplus"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"project_identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"forgeplus"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"pr_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"52分钟前"</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"commits_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">229</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"files_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">328</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"comments_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"comments_total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-    </span><span class="nl">"pull_request"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">1189</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"develop"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"fork_project_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"pull_request_staus"</span><span class="p">:</span><span class="w"> </span><span class="s2">"open"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"fork_project_user"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"create_user"</span><span class="p">:</span><span class="w"> </span><span class="s2">"jasder"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"mergeable"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"open"</span><span class="w">
-    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">168</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"new_branch"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"index"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"merged"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"issue"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">51888</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"subject"</span><span class="p">:</span><span class="w"> </span><span class="s2">"FIx release v3.2.0"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"is_private"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"branch_name"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"project_author_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Gitlink"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"closed_on"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-10-12 15:51"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"assign_user_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"victor"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"assign_user_login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"moshenglv"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"author_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"段甲生"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"author_login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"jasder"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"author_picture"</span><span class="p">:</span><span class="w"> </span><span class="s2">"images/avatars/User/36480?t=1615520120"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"issue_status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新增"</span><span class="p">,</span><span class="w">
-        </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="s2">"正常"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">265</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
         </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
         </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
     </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"merge_base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"4a277037093c1248e46d2946ee30b61cccdb9df9"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"base_commit_sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"dbb510cd852a6bfd4d71a1f84921aa3170654590"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"head_commit_sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"0f0e27918eb5deb8d514012d84d13db10eebe19a"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_num"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"changed_files"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_locked"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"mergeable"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"merged"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"merged_at"</span><span class="p">:</span><span class="w"> </span><span class="mi">1658743004</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"merge_commit_sha"</span><span class="p">:</span><span class="w"> </span><span class="s2">"dbb510cd852a6bfd4d71a1f84921aa3170654590"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"merge_by"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/Y/241_125_89/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"last_review"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新建一个审查"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"common"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-25 17:08"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"reviewer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">},</span><span class="w">
     </span><span class="nl">"conflict_files"</span><span class="p">:</span><span class="w"> </span><span class="p">[]</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h2 id='pull-request'>获取pull request文件列表</h2>
-<p>获取pull request文件列表</p>
+</span></code></pre></div><h2 id='dd8282460a'>获取合并请求文件列表</h2>
+<p>获取合并请求文件列表</p>
 
 <blockquote>
 <p>示例:</p>
@@ -12145,7 +12322,7 @@ http://localhost:3000/api/Jason/gitlink/pulls/1/files.json
 <td>pull request&#39;s id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e'>返回字段说明:</h3>
+<h3 id='7447e4874e-2'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -12372,8 +12549,8 @@ http://localhost:3000/api/Jason/gitlink/pulls/1/files.json
     </span><span class="p">}</span><span class="w">
   </span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h2 id='pull-request-commits'>获取pull request的commits列表</h2>
-<p>获取pull request的commits列表</p>
+</span></code></pre></div><h2 id='commits'>获取合并请求的commits列表</h2>
+<p>获取合并请求的commits列表</p>
 
 <blockquote>
 <p>示例:</p>
@@ -12410,7 +12587,7 @@ http://localhost:3000/api/Jason/gitlink/pulls/1/files.json
 <td>pull request&#39;s id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-2'>返回字段说明:</h3>
+<h3 id='7447e4874e-3'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -12564,7 +12741,7 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
 <td>pull request&#39;s id</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-3'>返回字段说明:</h3>
+<h3 id='7447e4874e-4'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -12880,16 +13057,16 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
       </span><span class="p">}</span><span class="w">
     </span><span class="p">]</span><span class="w">
   </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h2 id='list-pull-requests'>List pull requests</h2>
+</span></code></pre></div><h2 id='6a019ede04'>获取合并请求列表</h2>
 <p>获取合并请求列表</p>
 
 <blockquote>
 <p>示例:</p>
 </blockquote>
-<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/Jasder/gitlink/pulls.json
-</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/Jasder/gitlink/pulls.json</span><span class="dl">'</span><span class="p">)</span>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi_commit/pulls.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-5'>HTTP 请求</h3>
-<p><code>GET /api/:owner/:repo/pulls.json</code></p>
+<p><code>GET /api/v1/:owner/:repo/pulls.json</code></p>
 <h3 id='2eb6f47757-5'>请求参数:</h3>
 <table><thead>
 <tr>
@@ -12915,47 +13092,164 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
 <td>项目标识identifier</td>
 </tr>
 </tbody></table>
+<h3 id='7447e4874e-5'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+</tr>
+<tr>
+<td>total_count</td>
+<td>int</td>
+<td>合并请求总数</td>
+</tr>
+<tr>
+<td>id</td>
+<td>int</td>
+<td>合并请求ID</td>
+</tr>
+<tr>
+<td>head</td>
+<td>int</td>
+<td>合并请求源分支</td>
+</tr>
+<tr>
+<td>base</td>
+<td>int</td>
+<td>合并请求目标分支</td>
+</tr>
+<tr>
+<td>index</td>
+<td>int</td>
+<td>合并请求序号</td>
+</tr>
+<tr>
+<td>is_original</td>
+<td>bool</td>
+<td>是否为fork仓库发来的合并请求</td>
+</tr>
+<tr>
+<td>status</td>
+<td>string</td>
+<td>合并请求状态，open: 开启的, merged: 合并的, closed: 关闭的</td>
+</tr>
+<tr>
+<td>fork_project.id</td>
+<td>int</td>
+<td>fork仓库的id</td>
+</tr>
+<tr>
+<td>fork_project.identifier</td>
+<td>string</td>
+<td>fork仓库的标识</td>
+</tr>
+<tr>
+<td>fork_project.login</td>
+<td>string</td>
+<td>fork仓库拥有者的标识</td>
+</tr>
+<tr>
+<td>issue.id</td>
+<td>int</td>
+<td>疑修ID</td>
+</tr>
+<tr>
+<td>issue.author</td>
+<td>object</td>
+<td>疑修作者</td>
+</tr>
+<tr>
+<td>issue.priority</td>
+<td>string</td>
+<td>疑修优先级</td>
+</tr>
+<tr>
+<td>issue.version</td>
+<td>string</td>
+<td>疑修里程碑</td>
+</tr>
+<tr>
+<td>issue.journals_count</td>
+<td>int</td>
+<td>普通评论数量</td>
+</tr>
+<tr>
+<td>issue.issue_tags</td>
+<td>array</td>
+<td>标记</td>
+</tr>
+<tr>
+<td>journals_count</td>
+<td>int</td>
+<td>审查评论数量</td>
+</tr>
+</tbody></table>
 
 <blockquote>
 <p>返回的JSON示例:</p>
 </blockquote>
 <div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
-  </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"响应成功"</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"open_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"close_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">51</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"merged_issues_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">123</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"search_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"limit"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"user_admin_or_member"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"user_admin_or_developer"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"project_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Gitlink"</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"project_author_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Gitlink"</span><span class="p">,</span><span class="w">
-  </span><span class="nl">"issues"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
-    </span><span class="p">{</span><span class="w">
-      </span><span class="nl">"pull_request_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">1189</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"pull_request_status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"pull_request_head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"develop"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"pull_request_base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"pull_request_staus"</span><span class="p">:</span><span class="w"> </span><span class="s2">"open"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"fork_project_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"fork_project_identifier"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"fork_project_user"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">51888</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"FIx release v3.2.0"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"pr_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"59分钟前"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"assign_user_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"victor"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"assign_user_login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"moshenglv"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"author_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"段甲生"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"author_login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"jasder"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"avatar_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"images/avatars/User/36480?t=1615520120"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="s2">"正常"</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
-    </span><span class="p">}</span><span class="w">
-  </span><span class="p">]</span><span class="w">
+    </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pulls"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">167</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"index"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"open"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"fork_project"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">491</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"identifier"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ceshi_commit"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"testforge1"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"issue"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">264</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"tes tforge1"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"testforge1"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/T/238_117_19/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">165</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master_1"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"index"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"open"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"issue"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">262</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h2 id='12fc53a2d2'>获取合并请求版本列表</h2>
 <p>获取合并请求版本列表</p>
@@ -12999,7 +13293,7 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
 <td>合并请求序号</td>
 </tr>
 </tbody></table>
-<h3 id='7447e4874e-4'>返回字段说明:</h3>
+<h3 id='7447e4874e-6'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -13621,7 +13915,244 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
     </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
     </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h1 id='issues'>Issues</h1><h1 id='organizations'>Organizations</h1><h1 id='teams'>Teams</h1><h1 id='errors'>Errors</h1>
+</span></code></pre></div><h2 id='60a608ec1c'>为合并请求创建一个审查</h2>
+<p>合并请求创建一个审查</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/pulls/1/reviews.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
+<p><code>POST /api/v1/:owner/:repo/pulls/:index/reviews.json</code></p>
+<h3 id='2eb6f47757-8'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>index</td>
+<td>是</td>
+<td></td>
+<td>integer</td>
+<td>合并请求序号</td>
+</tr>
+<tr>
+<td>content</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>审查内容</td>
+</tr>
+<tr>
+<td>commit_id</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>当前合并请求的commit_id</td>
+</tr>
+<tr>
+<td>status</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>审查类型, common: 普通, approved: 通过, rejected: 拒绝</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新建一个审查"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"e506844b2467ce25a35dd46dad8236a1595a02da"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"common"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h3 id='7447e4874e-7'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>reviewer</td>
+<td>object</td>
+<td>审查者</td>
+</tr>
+<tr>
+<td>pull_request.id</td>
+<td>integer</td>
+<td>合并请求ID</td>
+</tr>
+<tr>
+<td>pull_request.head</td>
+<td>string</td>
+<td>合并请求源分支</td>
+</tr>
+<tr>
+<td>pull_request.base</td>
+<td>string</td>
+<td>合并请求目标分支</td>
+</tr>
+<tr>
+<td>pull_request.is_original</td>
+<td>string</td>
+<td>合并请求是否从fork仓库所来</td>
+</tr>
+<tr>
+<td>pull_request.fork_project.id</td>
+<td>int</td>
+<td>fork仓库的id</td>
+</tr>
+<tr>
+<td>pull_request.fork_project.identifier</td>
+<td>string</td>
+<td>fork仓库的标识</td>
+</tr>
+<tr>
+<td>pull_request.fork_project.login</td>
+<td>string</td>
+<td>fork仓库拥有者的标识</td>
+</tr>
+<tr>
+<td>pull_request.index</td>
+<td>string</td>
+<td>合并请求的序号</td>
+</tr>
+<tr>
+<td>pull_request.status</td>
+<td>string</td>
+<td>合并请求的状态，open: 打开的, merged: 合并的, closed: 关闭的</td>
+</tr>
+<tr>
+<td>pull_request.issue.id</td>
+<td>integer</td>
+<td>合并请求下疑修的ID</td>
+</tr>
+<tr>
+<td>pull_request.issue.author</td>
+<td>object</td>
+<td>合并请求以及疑修的创建着</td>
+</tr>
+<tr>
+<td>pull_request.issue.priority</td>
+<td>string</td>
+<td>疑修的优先级</td>
+</tr>
+<tr>
+<td>pull_request.issue.version</td>
+<td>string</td>
+<td>疑修的里程碑</td>
+</tr>
+<tr>
+<td>pull_request.issue.journals_count</td>
+<td>integer</td>
+<td>普通评论数量</td>
+</tr>
+<tr>
+<td>pull_request.issue.issue_tags</td>
+<td>array</td>
+<td>所属标记</td>
+</tr>
+<tr>
+<td>pull_request.journals_count</td>
+<td>integer</td>
+<td>审查评论数量</td>
+</tr>
+<tr>
+<td>id</td>
+<td>integer</td>
+<td>审查ID</td>
+</tr>
+<tr>
+<td>commit_id</td>
+<td>string</td>
+<td>审查的commit ID</td>
+</tr>
+<tr>
+<td>content</td>
+<td>string</td>
+<td>审查的内容</td>
+</tr>
+<tr>
+<td>status</td>
+<td>string</td>
+<td>审查类型，common: 普通, approved: 通过，rejected: 拒绝通过</td>
+</tr>
+<tr>
+<td>created_at</td>
+<td>string</td>
+<td>审查创建时间</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"reviewer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"pull_request"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">163</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master_1"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"closed"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"issue"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">260</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">6</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">10</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"e506844b2467ce25a35dd46dad8236a1595a02da"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新建一个审查"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"common"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-26 11:45"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h1 id='issues'>Issues</h1><h1 id='organizations'>Organizations</h1><h1 id='teams'>Teams</h1><h1 id='errors'>Errors</h1>
 <aside class="notice">
 This error section is stored in a separate file in <code>includes/_errors.md</code>. Slate allows you to optionally separate out your docs into many files...just save them to the <code>includes</code> folder and add them to the top of your <code>index.md</code>'s frontmatter. Files are included in the order listed.
 </aside>

From e72273f3b2e366105a49b4ede3a68a6bc37485c0 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 26 Jul 2022 14:29:12 +0800
Subject: [PATCH 131/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E8=AF=A6=E6=83=85=E4=B8=ADreview?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=9C=80=E6=96=B0=E7=9A=84=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/projects/pulls_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/projects/pulls_controller.rb b/app/controllers/api/v1/projects/pulls_controller.rb
index a930df76..c93cd8bd 100644
--- a/app/controllers/api/v1/projects/pulls_controller.rb
+++ b/app/controllers/api/v1/projects/pulls_controller.rb
@@ -10,7 +10,7 @@ class Api::V1::Projects::PullsController < Api::V1::BaseController
 
   def show 
    @result_object = Api::V1::Projects::Pulls::GetService.call(@project, @pull_request, current_user&.gitea_token)
-   @last_review = @pull_request.reviews.take
+   @last_review = @pull_request.reviews.order(created_at: :desc).take
   end
 
   private 

From 6183f1f76d8af1446fedb5deca0e655fe6ecd3d0 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 26 Jul 2022 14:38:41 +0800
Subject: [PATCH 132/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91title=E5=92=8Cbody?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/docs/slate/source/includes/_pulls.md      |  6 ++++
 .../api/v1/projects/pulls/list_service.rb     |  2 +-
 .../pulls/_simple_detail.json.jbuilder        |  2 +-
 public/docs/api.html                          | 30 +++++++++++++++++++
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index 650ad8a0..dda761ca 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -30,6 +30,8 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/1.json')
 --------- | ----------- | -----------
 |-|-|-|
 |id                   |int|合并请求ID|
+|title                |string|合并请求标题|
+|body|                |string|合并请求内容|
 |head                 |int|合并请求源分支|
 |base                 |int|合并请求目标分支|
 |index                |int|合并请求序号|
@@ -505,6 +507,8 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls.json')
 |-|-|-|
 |total_count          |int|合并请求总数|
 |id                   |int|合并请求ID|
+|title                |string|合并请求标题|
+|body                 |string|合并请求内容|
 |head                 |int|合并请求源分支|
 |base                 |int|合并请求目标分支|
 |index                |int|合并请求序号|
@@ -939,6 +943,8 @@ await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/reviews.json')
 --------- | ----------- | -----------
 |reviewer                         |object |审查者 |
 |pull_request.id                  |integer|合并请求ID|
+|pull_request.title               |string|合并请求标题|
+|pull_request.body                |string|合并请求内容|
 |pull_request.head                |string|合并请求源分支|
 |pull_request.base                |string|合并请求目标分支|
 |pull_request.is_original         |string|合并请求是否从fork仓库所来|
diff --git a/app/services/api/v1/projects/pulls/list_service.rb b/app/services/api/v1/projects/pulls/list_service.rb
index 6b18da2c..4a1d6a2f 100644
--- a/app/services/api/v1/projects/pulls/list_service.rb
+++ b/app/services/api/v1/projects/pulls/list_service.rb
@@ -11,7 +11,7 @@ class Api::V1::Projects::Pulls::ListService < ApplicationService
   def initialize(project, params={})
     @project = project 
     @keyword = params[:keyword]
-    @status = params[:status].to_i
+    @status = params[:status].present? ? params[:status].to_i : nil
     @priority_id = params[:priority_id]
     @issue_tag_id = params[:issue_tag_id]
     @version_id = params[:version_id]
diff --git a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
index 93cba2e4..d0718085 100644
--- a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
+++ b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
@@ -1,4 +1,4 @@
-json.(pull, :id, :head, :base, :is_original)
+json.(pull, :id, :title, :body, :head, :base, :is_original)
 json.index pull.gitea_number
 json.status pull.status == 1 ? "merged" : (pull.status == 2 ? "closed" : "open")
 
diff --git a/public/docs/api.html b/public/docs/api.html
index 967ed233..ce1fea11 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -12079,6 +12079,16 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>合并请求ID</td>
 </tr>
 <tr>
+<td>title</td>
+<td>string</td>
+<td>合并请求标题</td>
+</tr>
+<tr>
+<td>body</td>
+<td></td>
+<td>string</td>
+</tr>
+<tr>
 <td>head</td>
 <td>int</td>
 <td>合并请求源分支</td>
@@ -13116,6 +13126,16 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
 <td>合并请求ID</td>
 </tr>
 <tr>
+<td>title</td>
+<td>string</td>
+<td>合并请求标题</td>
+</tr>
+<tr>
+<td>body</td>
+<td>string</td>
+<td>合并请求内容</td>
+</tr>
+<tr>
 <td>head</td>
 <td>int</td>
 <td>合并请求源分支</td>
@@ -14007,6 +14027,16 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
 <td>合并请求ID</td>
 </tr>
 <tr>
+<td>pull_request.title</td>
+<td>string</td>
+<td>合并请求标题</td>
+</tr>
+<tr>
+<td>pull_request.body</td>
+<td>string</td>
+<td>合并请求内容</td>
+</tr>
+<tr>
 <td>pull_request.head</td>
 <td>string</td>
 <td>合并请求源分支</td>

From a35db9fe80711bfa4ddfad9af6c1530ab8314b8e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 26 Jul 2022 16:45:53 +0800
Subject: [PATCH 133/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Areviewers?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/pull_requests_controller.rb   |  5 +
 app/docs/slate/source/includes/_pulls.md      | 98 +++++++++++++++++++
 .../api/v1/projects/pulls/list_service.rb     |  4 +-
 app/services/issues/list_query_service.rb     |  1 +
 .../pulls/_simple_detail.json.jbuilder        |  1 +
 app/views/pull_requests/_detail.json.jbuilder |  2 +-
 app/views/pull_requests/edit.json.jbuilder    |  1 +
 app/views/pull_requests/index.json.jbuilder   |  3 +-
 app/views/pull_requests/show.json.jbuilder    |  1 +
 9 files changed, 113 insertions(+), 3 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 8bbfdc23..c1643146 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -62,6 +62,8 @@ class PullRequestsController < ApplicationController
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
         @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
+        reviewers = User.where(id: params[:reviewer_ids])
+        @pull_request.reviewers = reviewers
         SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id) if Site.has_notice_menu?
         SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id) if Site.has_notice_menu?
         Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
@@ -107,6 +109,9 @@ class PullRequestsController < ApplicationController
             end 
           end
 
+          reviewers = User.where(id: params[:reviewer_ids])
+          @pull_request.reviewers = reviewers
+
           if @issue.update_attributes(@issue_params)
             if @pull_request.update_attributes(@local_params.compact)
               gitea_pull = Gitea::PullRequest::UpdateService.call(@owner.login, @repository.identifier,
diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index dda761ca..ccc6e091 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -60,6 +60,7 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/1.json')
 |last_review.status   |string|最后一个审查的状态，common: 一般审查, approved: 通过, rejected: 拒绝通过|
 |last_review.created_at|string|审查创建的时间|
 |last_review.reviewer |object|审查创建人|
+|reviewers            |array|指定审查用户标识数组|
 |conflict_files       |array|有冲突的文件|
 
 > 返回的JSON示例:
@@ -118,6 +119,9 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/1.json')
             "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
         }
     },
+    "reviewers": [
+        "yystopf"
+    ],
     "conflict_files": []
 }
 ```
@@ -586,6 +590,100 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls.json')
 }
 ```
 
+## 创建一个合并请求
+为仓库创建一个合并请求
+
+> 示例:
+
+```shell
+curl -X POST \
+http://localhost:3000/api/yystopf/ceshi/pulls.json
+```
+
+```javascript
+await octokit.request('POST /api/yystopf/ceshi/pulls.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/pulls.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner              |是| | string |用户登录名  |
+|repo               |是| | string |项目标识identifier  |
+|title              |是| | string |合并请求标题|
+|body               |否| | string |合并请求内容|
+|base               |是| | string |目标分支|
+|head               |是| | string |源分支|
+|is_original        |是| | bool   |是否为fork仓库发来的合并请求|
+|fork_project_id    |否| | integer|fork仓库ID|
+|reviewer_ids       |否| | array  |审查人员id数组|
+|assigned_to_id     |否| | integer|指派人员ID|
+|fixed_version_id   |否| | integer|里程碑ID|
+|issue_tag_ids      |否| | array  |标记ID数组|
+|priority_id        |否| | integer|优先级ID|
+|receivers_login    |否| | array  |@人员的login|
+
+> 请求的JSON示例:
+
+```json
+{
+    "title": "324",
+    "assigned_to_id": "2",
+    "fixed_version_id": "",
+    "issue_tag_ids": [],
+    "priority_id": "2",
+    "body": "312",
+    "head": "new_branch_1",
+    "base": "master",
+    "is_original": false,
+    "fork_project_id": "",
+    "files_count": 1,
+    "commits_count": 1,
+    "reviewer_ids": [],
+    "receivers_login": []
+}
+```
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "响应成功",
+    "pull_request_id": 169,
+    "pull_request_number": 6,
+    "pull_request_status": 0,
+    "pull_request_head": "new_branch_1",
+    "pull_request_base": "master",
+    "pull_request_staus": "open",
+    "is_original": false,
+    "fork_project_id": null,
+    "fork_project_identifier": null,
+    "fork_project_user": null,
+    "reviewers": [
+        "yystopf"
+    ],
+    "id": 266,
+    "name": "324",
+    "pr_time": "1分钟前",
+    "assign_user_name": "heh",
+    "assign_user_login": "yystopf",
+    "author_name": "heh",
+    "author_login": "yystopf",
+    "avatar_url": "system/lets/letter_avatars/2/H/188_239_142/120.png",
+    "priority": "正常",
+    "version": null,
+    "journals_count": 0,
+    "issue_tags": null
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
+
+
 ## 获取合并请求版本列表
 获取合并请求版本列表
 
diff --git a/app/services/api/v1/projects/pulls/list_service.rb b/app/services/api/v1/projects/pulls/list_service.rb
index 4a1d6a2f..def8a86b 100644
--- a/app/services/api/v1/projects/pulls/list_service.rb
+++ b/app/services/api/v1/projects/pulls/list_service.rb
@@ -1,7 +1,7 @@
 class Api::V1::Projects::Pulls::ListService < ApplicationService
   include ActiveModel::Model
 
-  attr_reader :project, :keyword, :status, :priority_id, :issue_tag_id, :version_id, :reviewer_id, :sort_by, :sort_direction 
+  attr_reader :project, :keyword, :status, :priority_id, :issue_tag_id, :version_id, :reviewer_id, :assign_user_id, :sort_by, :sort_direction 
   attr_accessor :queried_pull_requests
 
   validates :status, inclusion: {in: [0, 1, 2], message: "请输入正确的Status"}, allow_nil: true
@@ -16,6 +16,7 @@ class Api::V1::Projects::Pulls::ListService < ApplicationService
     @issue_tag_id = params[:issue_tag_id]
     @version_id = params[:version_id]
     @reviewer_id = params[:reviewer_id]
+    @assign_user_id = params[:assign_user_id]
     @sort_by = params[:sort_by] || 'created_at'
     @sort_direction = params[:sort_direction] || 'desc'
   end
@@ -36,6 +37,7 @@ class Api::V1::Projects::Pulls::ListService < ApplicationService
     pull_requests = pull_requests.where(issue_tags: {id: issue_tag_id}) if issue_tag_id.present? 
     pull_requests = pull_requests.where(issues: {fixed_version_id: version_id}) if version_id.present?
     pull_requests = pull_requests.where(users: {id: reviewer_id}) if reviewer_id.present? 
+    pull_requests = pull_requests.where(issues: {assigned_to_id: assign_user_id}) if assign_user_id.present?
     
     q = pull_requests.ransack(title_or_body_cont: keyword)
     scope = q.result.includes(:fork_project, :journals, :reviews, :reviewers, issue: [:journals, :priority, :version, :issue_tags])
diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb
index 73f0b438..bed8c483 100644
--- a/app/services/issues/list_query_service.rb
+++ b/app/services/issues/list_query_service.rb
@@ -15,6 +15,7 @@ class Issues::ListQueryService < ApplicationService
     end_time = params[:due_date]
 
     issues = all_issues.issue_index_includes
+    issues = issues.includes(pull_request: :reviewers)
     if status_type.to_s == "2"   #表示关闭中的
       issues = issues.where(status_id: 5)
     elsif status_type.to_s == "1"
diff --git a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
index d0718085..a4c3c03b 100644
--- a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
+++ b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
@@ -22,4 +22,5 @@ json.issue do
   json.issue_tags issue.get_issue_tags
 end
 
+json.reviewers pull.reviewers.pluck(:login)
 json.journals_count pull.journals.count
\ No newline at end of file
diff --git a/app/views/pull_requests/_detail.json.jbuilder b/app/views/pull_requests/_detail.json.jbuilder
index 5c934742..814c078e 100644
--- a/app/views/pull_requests/_detail.json.jbuilder
+++ b/app/views/pull_requests/_detail.json.jbuilder
@@ -9,7 +9,7 @@ json.is_original pr.is_original
 json.fork_project_id pr&.fork_project_id
 json.fork_project_identifier pr&.fork_project&.identifier
 json.fork_project_user pr&.fork_project&.owner.try(:login)
-
+json.reviewers pr&.reviewers.pluck(:login)
 
 json.id issue.id
 json.name issue.subject
diff --git a/app/views/pull_requests/edit.json.jbuilder b/app/views/pull_requests/edit.json.jbuilder
index c6f41559..683b1961 100644
--- a/app/views/pull_requests/edit.json.jbuilder
+++ b/app/views/pull_requests/edit.json.jbuilder
@@ -12,3 +12,4 @@ json.issue_tag_ids @issue&.issue_tags_value&.split(",")
 json.commits_count @pull_request.commits_count
 json.files_count @pull_request.files_count
 json.comments_count @pull_request.comments_count
+json.reviewers @pull_request.reviewers.pluck(:login)
\ No newline at end of file
diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder
index d37901ef..ace52945 100644
--- a/app/views/pull_requests/index.json.jbuilder
+++ b/app/views/pull_requests/index.json.jbuilder
@@ -24,7 +24,8 @@ json.issues do
     json.fork_project_identifier pr&.fork_project&.identifier
     json.fork_project_user pr&.fork_project&.owner.try(:login)
     json.fork_project_user_name pr&.fork_project&.owner.try(:show_real_name)
-    
+    json.reviewers pr.reviewers.pluck(:login)
+
     json.id issue.id
     json.name issue.subject
     json.pr_time time_from_now(pr.status == 1 ? pr.updated_at : issue.updated_on)
diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder
index 684a60e9..27c393de 100644
--- a/app/views/pull_requests/show.json.jbuilder
+++ b/app/views/pull_requests/show.json.jbuilder
@@ -30,6 +30,7 @@ json.pull_request do
   json.create_user @pull_request&.user&.login
   json.mergeable @gitea_pull["mergeable"]
   json.state @gitea_pull["state"]
+  json.reviewers @pull_request.reviewers.pluck(:login)
 end
 
 json.issue do

From df5efa0dc64836ca01f1975e26d3de6f05052fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 26 Jul 2022 17:08:05 +0800
Subject: [PATCH 134/208] =?UTF-8?q?fixed=20=E9=82=AE=E7=AE=B1=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E6=AD=A3=E5=88=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ob_repository_syncs_controller.rb | 3 ++-
 app/libs/custom_regexp.rb                         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb
index 013e6fe5..0f1c64b1 100644
--- a/app/controllers/ob_repository_syncs_controller.rb
+++ b/app/controllers/ob_repository_syncs_controller.rb
@@ -13,7 +13,7 @@ class ObRepositorySyncsController < ApplicationController
     tip_exception "参数错误" if params[:github_address].blank? && params[:gitee_address].blank?
     project_name ="#{@project.owner.name}:#{@project.identifier}"
     service = ObRepositorySync::ApiService.new(project_name)
-    params.merge({ "gitlink_address": @project.repository.url })
+    params = params.merge({ "gitlink_address": @project.repository.url })
     res = service.create_projects(params)
     tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
     sync_id = res["data"]["id"]
@@ -23,6 +23,7 @@ class ObRepositorySyncsController < ApplicationController
     ob_repository_sync.name = project_name
     ob_repository_sync.github_address = "#{params[:github_address]}"
     ob_repository_sync.gitee_address = "#{params[:gitee_address]}"
+    ob_repository_sync.gitlink_address = @project.repository.url
     ob_repository_sync.github_token = "#{params[:github_token]}"
     ob_repository_sync.gitee_token = "#{params[:gitee_token]}"
     ob_repository_sync.sync_id = sync_id
diff --git a/app/libs/custom_regexp.rb b/app/libs/custom_regexp.rb
index e778c549..889da4df 100644
--- a/app/libs/custom_regexp.rb
+++ b/app/libs/custom_regexp.rb
@@ -1,6 +1,6 @@
 module CustomRegexp
   PHONE = /1\d{10}/
-  EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/
+  EMAIL = /\A[a-zA-Z0-9]+([._\-\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/
   LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]{4,15}\z/ #只含有数字、字母、下划线不能以下划线开头和结尾
   LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/
   NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/

From d6b5dc326af7b35a3f2d9e729dc97d0e4f40b911 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 27 Jul 2022 14:52:49 +0800
Subject: [PATCH 135/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E7=9B=B8=E5=85=B3api=E6=A0=B9=E6=8D=AE=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E9=87=8D=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v1/projects/pulls/comments_controller.rb  |   2 -
 .../v1/projects/pulls/journals_controller.rb  |  39 ++++
 .../v1/projects/pulls/reviews_controller.rb   |   2 +-
 app/controllers/reviews_controller.rb         |   2 +-
 app/models/journal.rb                         |  13 ++
 .../projects/pulls/journals/create_service.rb |  48 +++++
 .../projects/pulls/journals/list_service.rb   |  45 ++++
 .../projects/pulls/journals/update_service.rb |  38 ++++
 .../projects/pulls/reviews/create_service.rb  |   7 +-
 .../api/v1/users/projects/list_service.rb     |   2 +-
 .../journals/_simple_detail.json.jbuilder     |  21 ++
 .../pulls/journals/create.json.jbuilder       |   1 +
 .../pulls/journals/index.json.jbuilder        |   4 +
 .../pulls/journals/update.json.jbuilder       |   1 +
 .../reviews/_simple_detail.json.jbuilder      |   8 +
 config/routes/api.rb                          |   1 +
 ...0220726090342_add_line_code_to_journals.rb |  13 ++
 public/docs/api.html                          | 202 +++++++++++++++++-
 18 files changed, 432 insertions(+), 17 deletions(-)
 delete mode 100644 app/controllers/api/v1/projects/pulls/comments_controller.rb
 create mode 100644 app/controllers/api/v1/projects/pulls/journals_controller.rb
 create mode 100644 app/services/api/v1/projects/pulls/journals/create_service.rb
 create mode 100644 app/services/api/v1/projects/pulls/journals/list_service.rb
 create mode 100644 app/services/api/v1/projects/pulls/journals/update_service.rb
 create mode 100644 app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder
 create mode 100644 app/views/api/v1/projects/pulls/journals/create.json.jbuilder
 create mode 100644 app/views/api/v1/projects/pulls/journals/index.json.jbuilder
 create mode 100644 app/views/api/v1/projects/pulls/journals/update.json.jbuilder
 create mode 100644 app/views/api/v1/projects/pulls/reviews/_simple_detail.json.jbuilder
 create mode 100644 db/migrate/20220726090342_add_line_code_to_journals.rb

diff --git a/app/controllers/api/v1/projects/pulls/comments_controller.rb b/app/controllers/api/v1/projects/pulls/comments_controller.rb
deleted file mode 100644
index 8622c319..00000000
--- a/app/controllers/api/v1/projects/pulls/comments_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Api::V1::Projects::Pulls::CommentsController < Api::V1::Projects::Pulls::BaseController 
-end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pulls/journals_controller.rb b/app/controllers/api/v1/projects/pulls/journals_controller.rb
new file mode 100644
index 00000000..76fa30c9
--- /dev/null
+++ b/app/controllers/api/v1/projects/pulls/journals_controller.rb
@@ -0,0 +1,39 @@
+class Api::V1::Projects::Pulls::JournalsController < Api::V1::Projects::Pulls::BaseController 
+
+  def index
+    @journals = Api::V1::Projects::Pulls::Journals::ListService.call(@project, @pull_request, params, current_user)
+    @journals = kaminari_paginate(@journals)
+  end
+
+  def create 
+    @journal = Api::V1::Projects::Pulls::Journals::CreateService.call(@project, @pull_request, create_params, current_user)
+  end
+
+  before_action :find_journal, only: [:update, :destroy]
+
+  def update 
+    @journal = Api::V1::Projects::Pulls::Journals::UpdateService.call(@project, @pull_request, @journal, update_params, current_user)
+  end
+
+  def destroy 
+    if @journal.destroy 
+      render_ok
+    else 
+      render_error("删除评论失败！")
+    end
+  end
+
+  private 
+  def create_params 
+    params.permit(:parent_id, :line_code, :note, :commit_id, :path, :type, :review_id, :diff => {})
+  end
+
+  def update_params 
+    params.permit(:note, :commit_id, :state)
+  end
+
+  def find_journal
+    @journal = Journal.find_by_id(params[:id])
+  end
+  
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/pulls/reviews_controller.rb b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
index 523137a8..039a6c4d 100644
--- a/app/controllers/api/v1/projects/pulls/reviews_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
@@ -8,7 +8,7 @@ class Api::V1::Projects::Pulls::ReviewsController < Api::V1::Projects::Pulls::Ba
   before_action :require_reviewer, only: [:create]
 
   def create 
-    @journal, @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
+    @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
   end
 
   private 
diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb
index e1201690..b5fedfae 100644
--- a/app/controllers/reviews_controller.rb
+++ b/app/controllers/reviews_controller.rb
@@ -5,7 +5,7 @@ class ReviewsController < ApplicationController
 
   def create 
     return render_forbidden('您不是审查人员，无法进行审查！') if current_user&.id != @pull_request.issue.assigned_to_id
-    @journal, @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
+    @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user)
   end
 
   private 
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 19fdce1c..48721bfd 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -13,6 +13,15 @@
 #  comments_count   :integer          default("0")
 #  reply_id         :integer
 #  review_id        :integer
+#  commit_id        :string(255)
+#  diff             :text(4294967295)
+#  line_code        :string(255)
+#  path             :string(255)
+#  state            :integer          default("0")
+#  resolve_at       :datetime
+#  resolveer_id     :integer
+#  need_respond     :boolean          default("0")
+#  updated_on       :datetime
 #
 # Indexes
 #
@@ -24,9 +33,12 @@
 #
 
 class Journal < ApplicationRecord
+  serialize :diff, JSON
   belongs_to :user
   belongs_to :issue, foreign_key: :journalized_id, :touch => true, optional: true
   belongs_to :journalized, polymorphic: true
+  belongs_to :review, optional: true
+  belongs_to :resolveer, class_name: 'User', foreign_key: :resolveer_id, optional: true
   has_many :journal_details, :dependent => :delete_all
   has_many :attachments, as: :container, dependent: :destroy
 
@@ -34,6 +46,7 @@ class Journal < ApplicationRecord
   scope :parent_journals, ->{where(parent_id: nil)}
   scope :children_journals, lambda{|journal_id| where(parent_id: journal_id)}
 
+  enum state: {opened: 0, resolved: 1, disabled: 2}
 
   def is_journal_detail?
     self.notes.blank? && self.journal_details.present?
diff --git a/app/services/api/v1/projects/pulls/journals/create_service.rb b/app/services/api/v1/projects/pulls/journals/create_service.rb
new file mode 100644
index 00000000..45b5ec03
--- /dev/null
+++ b/app/services/api/v1/projects/pulls/journals/create_service.rb
@@ -0,0 +1,48 @@
+class Api::V1::Projects::Pulls::Journals::CreateService < ApplicationService 
+  include ActiveModel::Model 
+
+  attr_reader :project, :pull_request, :issue, :parent_id, :line_code, :note, :commit_id, :path, :type, :diff, :review_id, :user
+  attr_accessor :journal
+
+  validates :type, inclusion: {in: %w(comment problem), message: '请输入正确的Type'}
+
+  def initialize(project, pull_request, params, user)
+    @project = project 
+    @pull_request = pull_request
+    @issue = pull_request&.issue 
+    @parent_id = params[:parent_id]
+    @line_code = params[:line_code]
+    @note = params[:note]
+    @commit_id = params[:commit_id]
+    @path = params[:path]
+    @type = params[:type]
+    @diff = params[:diff]
+    @review_id = params[:review_id]
+    @user = user
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(", ") unless valid?
+    check_review_is_exists
+    if type == 'problem'
+      create_problem_journal
+    else
+      create_comment_journal
+    end
+
+    journal
+  end
+
+  private 
+  def create_comment_journal 
+    @journal = pull_request.journals.create!(user_id: user&.id, notes: note, parent_id: parent_id, review_id: review_id, commit_id: commit_id, diff: diff, line_code: line_code, path: path)
+  end
+
+  def check_review_is_exists
+    raise Error, '合并请求审查不存在！' unless @pull_request.reviews.exists?(review_id)
+  end
+
+  def create_problem_journal 
+    @journal = pull_request.journals.create!(user_id: user&.id, notes: note, parent_id: parent_id, review_id: review_id, commit_id: commit_id, diff: diff, line_code: line_code, path: path, need_respond: true)
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/pulls/journals/list_service.rb b/app/services/api/v1/projects/pulls/journals/list_service.rb
new file mode 100644
index 00000000..dd69ead0
--- /dev/null
+++ b/app/services/api/v1/projects/pulls/journals/list_service.rb
@@ -0,0 +1,45 @@
+class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
+  include ActiveModel::Model
+  
+  attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :sort_by, :sort_direction, :user
+  attr_accessor :queried_journals
+
+  validates :sort_by, inclusion: {in: Journal.column_names, message: '请输入正确的SortBy'}
+  validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}
+  validates :need_respond, inclusion: {in: [true, false], message: '请输入正确的NeedRespond'}, allow_nil: true 
+  validates :state, inclusion: {in: %w(opened resolved disabled)}, allow_nil: true 
+
+  def initialize(project, pull_request, params, user)
+    @project = project 
+    @pull_request = pull_request
+    @keyword = params[:keyword]
+    @review_id = params[:review_id]
+    @need_respond = ActiveModel::Type::Boolean.new.cast(params[:need_respond])
+    @state = params[:state]
+    @sort_by = params[:sort_by] || 'created_on'
+    @sort_direction = params[:sort_direction] || 'asc'
+    @user = user
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid?
+    journal_query_data 
+
+    queried_journals
+  end 
+
+  private
+  def journal_query_data
+    journals = @pull_request.journals.parent_journals
+
+    journals = journals.where(review_id: review_id) if review_id.present?
+    journals = journals.where(need_respond: need_respond) if need_respond.present?
+    journals = journals.where(state: state) if state.present?
+
+    q = journals.ransack(notes_cont: keyword)
+    scope = q.result.includes(:review)
+    scope = scope.order("journals.#{sort_by} #{sort_direction}")
+
+    @queried_journals = scope
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/pulls/journals/update_service.rb b/app/services/api/v1/projects/pulls/journals/update_service.rb
new file mode 100644
index 00000000..fec4c7ff
--- /dev/null
+++ b/app/services/api/v1/projects/pulls/journals/update_service.rb
@@ -0,0 +1,38 @@
+class Api::V1::Projects::Pulls::Journals::UpdateService < ApplicationService 
+  include ActiveModel::Model 
+
+  attr_reader :project, :pull_request, :journal, :note, :commit_id, :state, :user
+  attr_accessor :updated_journal 
+
+  validates :state, inclusion: {in: %w(opened resolved disabled)}
+
+  def initialize(project, pull_request, journal, params, user)
+    @project = project
+    @pull_request = pull_request
+    @journal = journal
+    @note = params[:note]
+    @commit_id = params[:commit_id]
+    @state = params[:state] 
+    @user = user
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(", ") unless valid?
+
+    update_journal 
+
+    updated_journal
+  end
+
+  private 
+  def update_journal 
+    journal.attributes = {notes: note, commit_id: commit_id, state: state}
+    if state == 'resolved'
+      journal.resolve_at = Time.now 
+      journal.resolveer_id = user.id
+    end
+    return Error, '保存评论失败！' unless journal.save
+
+    @updated_journal = journal.reload
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/pulls/reviews/create_service.rb b/app/services/api/v1/projects/pulls/reviews/create_service.rb
index bef94487..1c45d9cf 100644
--- a/app/services/api/v1/projects/pulls/reviews/create_service.rb
+++ b/app/services/api/v1/projects/pulls/reviews/create_service.rb
@@ -20,10 +20,10 @@ class Api::V1::Projects::Pulls::Reviews::CreateService < ApplicationService
     raise Error, errors.full_messages.join(", ") unless valid?
     ActiveRecord::Base.transaction do 
       create_review 
-      create_journal
+      # create_journal
     end 
 
-    return @journal, @review
+    @review
   # rescue 
   #   raise Error, '服务器错误，请联系系统管理员！'
   end
@@ -33,8 +33,5 @@ class Api::V1::Projects::Pulls::Reviews::CreateService < ApplicationService
     @review = pull_request.reviews.create!(status: status, content: content, commit_id: commit_id, reviewer_id: @current_user.id)
   end
 
-  def create_journal
-    @journal = pull_request.journals.create!(notes: content, user_id: @current_user.id, review_id: @review.id)
-  end
 
 end
\ No newline at end of file
diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb
index 9a095c60..91e25a93 100644
--- a/app/services/api/v1/users/projects/list_service.rb
+++ b/app/services/api/v1/users/projects/list_service.rb
@@ -13,7 +13,7 @@ class Api::V1::Users::Projects::ListService < ApplicationService
   def initialize(observe_user, params, current_user=nil)
     @observe_user = observe_user
     @category = params[:category] || 'all'
-    @is_public = params[:is_public]
+    @is_public = ActiveModel::Type::Boolean.new.cast(params[:is_public])
     @project_type = params[:project_type]
     @sort_by = params[:sort_by] || 'updated_on'
     @sort_direction = params[:sort_direction] || 'desc'
diff --git a/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder
new file mode 100644
index 00000000..547db46e
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder
@@ -0,0 +1,21 @@
+json.(journal, :id, :notes, :commit_id, :line_code, :path, :diff, :need_respond, :state)
+json.user do 
+  json.partial! 'api/v1/users/simple_user', user: journal.user
+end
+json.review do 
+  if journal.review.present? 
+    json.partial! 'api/v1/projects/pulls/reviews/simple_detail', review: journal.review
+  else 
+    json.nil!
+  end
+end
+json.resolveer do 
+  if journal.resolveer.present? 
+    json.partial! 'api/v1/users/simple_user', user: journal.resolveer
+  else 
+    json.nil!
+  end
+end
+json.resolve_at format_time(journal.resolve_at)
+json.created_at format_time(journal.created_on)
+json.updated_at format_time(journal.updated_on)
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pulls/journals/create.json.jbuilder b/app/views/api/v1/projects/pulls/journals/create.json.jbuilder
new file mode 100644
index 00000000..32bedbf8
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/journals/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/projects/pulls/journals/simple_detail', journal: @journal
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pulls/journals/index.json.jbuilder b/app/views/api/v1/projects/pulls/journals/index.json.jbuilder
new file mode 100644
index 00000000..e71eb5f7
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/journals/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.total_count @journals.total_count 
+json.journals @journals.each do |journal|
+  json.partial! 'api/v1/projects/pulls/journals/simple_detail', journal: journal
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pulls/journals/update.json.jbuilder b/app/views/api/v1/projects/pulls/journals/update.json.jbuilder
new file mode 100644
index 00000000..32bedbf8
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/journals/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/projects/pulls/journals/simple_detail', journal: @journal
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pulls/reviews/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/reviews/_simple_detail.json.jbuilder
new file mode 100644
index 00000000..1ded19d6
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/reviews/_simple_detail.json.jbuilder
@@ -0,0 +1,8 @@
+json.reviewer do 
+  json.partial! "api/v1/users/simple_user", user: review.reviewer
+end
+json.pull_request do 
+  json.partial! "api/v1/projects/pulls/simple_detail", pull: review.pull_request
+end
+json.(review, :id, :commit_id, :content, :status)
+json.created_at format_time(review.created_at)
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 0dfe6112..d5f82ff7 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -25,6 +25,7 @@ defaults format: :json do
                   get :diff
                 end
               end
+              resources :journals, except: [:show, :edit]
               resources :reviews, only: [:index, :create] 
             end
 
diff --git a/db/migrate/20220726090342_add_line_code_to_journals.rb b/db/migrate/20220726090342_add_line_code_to_journals.rb
new file mode 100644
index 00000000..9eb2e45e
--- /dev/null
+++ b/db/migrate/20220726090342_add_line_code_to_journals.rb
@@ -0,0 +1,13 @@
+class AddLineCodeToJournals < ActiveRecord::Migration[5.2]
+  def change
+    add_column :journals, :commit_id, :string
+    add_column :journals, :diff, :text, :limit => 4294967295
+    add_column :journals, :line_code, :string
+    add_column :journals, :path, :string
+    add_column :journals, :state, :integer, default: 0
+    add_column :journals, :resolve_at, :datetime
+    add_column :journals, :resolveer_id, :integer, index: true
+    add_column :journals, :need_respond, :bool, default: false
+    add_column :journals, :updated_on, :datetime, index: true
+  end
+end
diff --git a/public/docs/api.html b/public/docs/api.html
index ce1fea11..0a684743 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -609,6 +609,9 @@
                   <li>
                     <a href="#6a019ede04" class="toc-h2 toc-link" data-title="获取合并请求列表">获取合并请求列表</a>
                   </li>
+                  <li>
+                    <a href="#035779233c" class="toc-h2 toc-link" data-title="创建一个合并请求">创建一个合并请求</a>
+                  </li>
                   <li>
                     <a href="#12fc53a2d2" class="toc-h2 toc-link" data-title="获取合并请求版本列表">获取合并请求版本列表</a>
                   </li>
@@ -12229,6 +12232,11 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 <td>审查创建人</td>
 </tr>
 <tr>
+<td>reviewers</td>
+<td>array</td>
+<td>指定审查用户标识数组</td>
+</tr>
+<tr>
 <td>conflict_files</td>
 <td>array</td>
 <td>有冲突的文件</td>
@@ -12291,6 +12299,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
             </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
         </span><span class="p">}</span><span class="w">
     </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"reviewers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="s2">"yystopf"</span><span class="w">
+    </span><span class="p">],</span><span class="w">
     </span><span class="nl">"conflict_files"</span><span class="p">:</span><span class="w"> </span><span class="p">[]</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div><h2 id='dd8282460a'>获取合并请求文件列表</h2>
@@ -13271,7 +13282,184 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
         </span><span class="p">}</span><span class="w">
     </span><span class="p">]</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h2 id='12fc53a2d2'>获取合并请求版本列表</h2>
+</span></code></pre></div><h2 id='035779233c'>创建一个合并请求</h2>
+<p>为仓库创建一个合并请求</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+http://localhost:3000/api/yystopf/ceshi/pulls.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/yystopf/ceshi/pulls.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
+<p><code>POST /api/:owner/:repo/pulls.json</code></p>
+<h3 id='2eb6f47757-6'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>title</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>合并请求标题</td>
+</tr>
+<tr>
+<td>body</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>合并请求内容</td>
+</tr>
+<tr>
+<td>base</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>目标分支</td>
+</tr>
+<tr>
+<td>head</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>源分支</td>
+</tr>
+<tr>
+<td>is_original</td>
+<td>是</td>
+<td></td>
+<td>bool</td>
+<td>是否为fork仓库发来的合并请求</td>
+</tr>
+<tr>
+<td>fork_project_id</td>
+<td>否</td>
+<td></td>
+<td>integer</td>
+<td>fork仓库ID</td>
+</tr>
+<tr>
+<td>reviewer_ids</td>
+<td>否</td>
+<td></td>
+<td>array</td>
+<td>审查人员id数组</td>
+</tr>
+<tr>
+<td>assigned_to_id</td>
+<td>否</td>
+<td></td>
+<td>integer</td>
+<td>指派人员ID</td>
+</tr>
+<tr>
+<td>fixed_version_id</td>
+<td>否</td>
+<td></td>
+<td>integer</td>
+<td>里程碑ID</td>
+</tr>
+<tr>
+<td>issue_tag_ids</td>
+<td>否</td>
+<td></td>
+<td>array</td>
+<td>标记ID数组</td>
+</tr>
+<tr>
+<td>priority_id</td>
+<td>否</td>
+<td></td>
+<td>integer</td>
+<td>优先级ID</td>
+</tr>
+<tr>
+<td>receivers_login</td>
+<td>否</td>
+<td></td>
+<td>array</td>
+<td>@人员的login</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"title"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"assigned_to_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"fixed_version_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"issue_tag_ids"</span><span class="p">:</span><span class="w"> </span><span class="p">[],</span><span class="w">
+    </span><span class="nl">"priority_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"body"</span><span class="p">:</span><span class="w"> </span><span class="s2">"312"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"new_branch_1"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"fork_project_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"files_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commits_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"reviewer_ids"</span><span class="p">:</span><span class="w"> </span><span class="p">[],</span><span class="w">
+    </span><span class="nl">"receivers_login"</span><span class="p">:</span><span class="w"> </span><span class="p">[]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"响应成功"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pull_request_id"</span><span class="p">:</span><span class="w"> </span><span class="mi">169</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pull_request_number"</span><span class="p">:</span><span class="w"> </span><span class="mi">6</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pull_request_status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pull_request_head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"new_branch_1"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pull_request_base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pull_request_staus"</span><span class="p">:</span><span class="w"> </span><span class="s2">"open"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"fork_project_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"fork_project_identifier"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"fork_project_user"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"reviewers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="s2">"yystopf"</span><span class="w">
+    </span><span class="p">],</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">266</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"pr_time"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1分钟前"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"assign_user_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"assign_user_login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"author_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"author_login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"avatar_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="s2">"正常"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='12fc53a2d2'>获取合并请求版本列表</h2>
 <p>获取合并请求版本列表</p>
 
 <blockquote>
@@ -13279,9 +13467,9 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
 </blockquote>
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi_commit/pulls/3/versions.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-6'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/pulls/:index/versions.json</code></p>
-<h3 id='2eb6f47757-6'>请求参数:</h3>
+<h3 id='2eb6f47757-7'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -13408,9 +13596,9 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
 <span class="nt">-d</span> <span class="s2">"filepath=ceshi_dir_1/new_file_1"</span> <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-7'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
 <p><code>GET /api/v1/:owner/:repo/pulls/:index/versions/:version_id/diff.json</code></p>
-<h3 id='2eb6f47757-7'>请求参数:</h3>
+<h3 id='2eb6f47757-8'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -13944,9 +14132,9 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/pulls/1/reviews.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-8'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/pulls/:index/reviews.json</code></p>
-<h3 id='2eb6f47757-8'>请求参数:</h3>
+<h3 id='2eb6f47757-9'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>

From a2549f7ff1181edd9aa523a17816826c4b6fcdac Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 27 Jul 2022 16:07:15 +0800
Subject: [PATCH 136/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E5=8F=8A=E5=AE=A1=E6=9F=A5=E7=9B=B8=E5=85=B3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v1/projects/pulls/journals_controller.rb  |    3 +-
 app/docs/slate/source/includes/_pulls.md      |  598 +++++++++-
 app/models/journal.rb                         |    1 +
 .../projects/pulls/journals/list_service.rb   |   12 +-
 .../journals/_simple_detail.json.jbuilder     |    2 +-
 .../pulls/reviews/index.json.jbuilder         |    4 +
 public/docs/api.html                          | 1049 ++++++++++++++++-
 7 files changed, 1657 insertions(+), 12 deletions(-)
 create mode 100644 app/views/api/v1/projects/pulls/reviews/index.json.jbuilder

diff --git a/app/controllers/api/v1/projects/pulls/journals_controller.rb b/app/controllers/api/v1/projects/pulls/journals_controller.rb
index 76fa30c9..d3247497 100644
--- a/app/controllers/api/v1/projects/pulls/journals_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/journals_controller.rb
@@ -33,7 +33,8 @@ class Api::V1::Projects::Pulls::JournalsController < Api::V1::Projects::Pulls::B
   end
 
   def find_journal
-    @journal = Journal.find_by_id(params[:id])
+    @journal = @pull_request.journals.find_by_id(params[:id])
+    return render_not_found unless @journal.present?
   end
   
 end
\ No newline at end of file
diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index ccc6e091..adc6e3cc 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -501,10 +501,17 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls.json')
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
-|owner             |是| |string |用户登录名  |
-|repo             |是| |string |项目标识identifier  |
-
-
+|owner             |是|            |string |用户登录名  |
+|repo              |是|            |string |项目标识identifier  |
+|keyword           |否|            |string |搜索关键词|
+|status            |否|            | int | 合并请求类型 0: 开启的, 1: 合并的 2: 关闭的，不传则为全部的 |
+|priority_id       |否|            | int | 优先级ID |
+|issue_tag_id      |否|            |int|标记ID|
+|version_id        |否|            |int|里程碑ID|
+|reviewer_id       |否|            |int| 审查人员ID|
+|assign_user_id    |否|            |int| 指派人员ID|
+|sort_by           |否| created_at |string| 排序字段，created_at: 创建时间, updated_at: 更新时间|
+|sort_direction    |否| desc       |string| 排序类型 desc: 倒序 asc: 正序|
 ### 返回字段说明:
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
@@ -999,6 +1006,108 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff
 }
 ```
 
+## 获取合并请求审查列表
+获取合并请求版本审查列表
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/reviews.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/reviews.json')
+```
+
+### HTTP 请求
+`GET /api/v1/:owner/:repo/pulls/:index/reviews.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner            |是|          |string |用户登录名  |
+|repo             |是|          |string |项目标识identifier  |
+|index            |是|          | int   |合并请求序号|
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|total_count            |int      |审查总数|
+|reviews.reviewer                         |object |审查者 |
+|reviews.pull_request.id                  |integer|合并请求ID|
+|reviews.pull_request.title               |string|合并请求标题|
+|reviews.pull_request.body                |string|合并请求内容|
+|reviews.pull_request.head                |string|合并请求源分支|
+|reviews.pull_request.base                |string|合并请求目标分支|
+|reviews.pull_request.is_original         |string|合并请求是否从fork仓库所来|
+|reviews.pull_request.fork_project.id      |int|fork仓库的id|
+|reviews.pull_request.fork_project.identifier|string|fork仓库的标识|
+|reviews.pull_request.fork_project.login   |string|fork仓库拥有者的标识|
+|reviews.pull_request.index               |string|合并请求的序号|
+|reviews.pull_request.status              |string|合并请求的状态，open: 打开的, merged: 合并的, closed: 关闭的|
+|reviews.pull_request.issue.id            |integer|合并请求下疑修的ID|
+|reviews.pull_request.issue.author        |object|合并请求以及疑修的创建着|
+|reviews.pull_request.issue.priority      |string|疑修的优先级|
+|reviews.pull_request.issue.version       |string|疑修的里程碑|
+|reviews.pull_request.issue.journals_count|integer|普通评论数量|
+|reviews.pull_request.issue.issue_tags    |array|所属标记|
+|reviews.pull_request.journals_count      |integer|审查评论数量|
+|reviews.id                               |integer|审查ID|
+|reviews.commit_id                        |string|审查的commit ID|
+|reviews.content                          |string|审查的内容|
+|reviews.status                           |string|审查类型，common: 普通, approved: 通过，rejected: 拒绝通过|
+|reviews.created_at                       |string|审查创建时间|
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 1,
+    "reviews": [
+        {
+            "reviewer": {
+                "id": 2,
+                "type": "User",
+                "name": "heh",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "pull_request": {
+                "id": 163,
+                "title": "新合并请求1",
+                "body": null,
+                "head": "master_1",
+                "base": "master",
+                "is_original": false,
+                "index": 1,
+                "status": "closed",
+                "issue": {
+                    "id": 260,
+                    "author": {
+                        "id": 2,
+                        "type": "User",
+                        "name": "heh",
+                        "login": "yystopf",
+                        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                    },
+                    "priority": null,
+                    "version": null,
+                    "journals_count": 0,
+                    "issue_tags": null
+                },
+                "reviewers": [],
+                "journals_count": 8
+            },
+            "id": 5,
+            "commit_id": null,
+            "content": "新建一个审查",
+            "status": "common",
+            "created_at": "2022-07-25 17:08"
+        }
+    ]
+}
+```
+
 ## 为合并请求创建一个审查
 合并请求创建一个审查
 
@@ -1108,3 +1217,484 @@ await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/reviews.json')
 <aside class="success">
   Success Data.
 </aside>
+
+
+## 获取合并请求评论列表
+获取合并请求版本评论列表
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/journals.json
+```
+
+```javascript
+await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/journals.json')
+```
+
+### HTTP 请求
+`GET /api/v1/:owner/:repo/pulls/:index/journals.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner            |是|          |string |用户登录名  |
+|repo             |是|          |string |项目标识identifier  |
+|index            |是|          | int   |合并请求序号|
+|keyword          |否|          |string |搜索关键词|
+|review_id        |否|          |integer|审查ID|
+|need_respond     |否|          |bool   |是否需要回应|
+|state            |否|          |string |状态, opened: 开启的, resolved: 已解决的, disabled: 无效的|
+|parent_id        |否|          |integer|父评论ID|
+|sort_by          |否|created_on|string |排序字段 created_on: 创建时间, updated_on: 更新时间|
+|sort_direction   |否|asc       |string |排序类型 desc: 倒序, asc: 正序|
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|total_count            |int      |评论总数|
+|journals.id            |int      |评论ID|
+|journals.notes         |string   |评论内容|
+|journals.commit_id     |string   |CommitID|
+|journals.line_code     |string   |评论行数|
+|journals.path          |string   |评论文件路径|
+|journals.diff          |object   |评论文件diff内容|
+|journals.need_respond  |bool     |评论是否要回应|
+|journals.state         |string   |评论状态，opened: 开启的, resolved: 已解决的, disabled: 无效的 |
+|journals.parent_id     |int      |父评论ID|
+|journals.user          |object   |评论创建者|
+|journals.review        |object   |评论所属评审|
+|journals.resolveer     |object   |评论解决者|
+|journals.resolve_at    |int      |评论解决时间|
+|journals.created_at    |int      |评论创建时间|
+|journals.updated_at    |int      |评论更新时间|
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 1,
+    "journals": [
+        {
+            "id": 200,
+            "note": "测试评论修改",
+            "commit_id": null,
+            "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29",
+            "path": "Gemfile.lock",
+            "diff": {},
+            "need_respond": true,
+            "state": "resolved",
+            "parent_id": nil,
+            "user": {
+                "id": 2,
+                "type": "User",
+                "name": "heh",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "review": {
+                "reviewer": {
+                    "id": 2,
+                    "type": "User",
+                    "name": "heh",
+                    "login": "yystopf",
+                    "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                },
+                "pull_request": {
+                    "id": 163,
+                    "title": "新合并请求1",
+                    "body": null,
+                    "head": "master_1",
+                    "base": "master",
+                    "is_original": false,
+                    "index": 1,
+                    "status": "closed",
+                    "issue": {
+                        "id": 260,
+                        "author": {
+                            "id": 2,
+                            "type": "User",
+                            "name": "heh",
+                            "login": "yystopf",
+                            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                        },
+                        "priority": null,
+                        "version": null,
+                        "journals_count": 0,
+                        "issue_tags": null
+                    },
+                    "reviewers": [],
+                    "journals_count": 9
+                },
+                "id": 10,
+                "commit_id": "1",
+                "content": "新建一个审查",
+                "status": "common",
+                "created_at": "2022-07-26 11:45"
+            },
+            "resolveer": {
+                "id": 2,
+                "type": "User",
+                "name": "heh",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "resolve_at": "2022-07-27 14:50",
+            "created_at": "2022-07-27 14:31",
+            "updated_at": "2022-07-27 14:50"
+        }
+    ]
+}
+```
+
+## 创建一个合并请求评论
+为仓库创建一个合并请求的评论
+
+> 示例:
+
+```shell
+curl -X POST \
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals.json
+```
+
+```javascript
+await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/journals.json')
+```
+
+### HTTP 请求
+`POST /api/v1/:owner/:repo/pulls/:index/journals.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner              |是| | string |用户登录名  |
+|repo               |是| | string |项目标识identifier  |
+|index              |是| | integer|合并请求序号|
+|type               |是| | string |评论类型 comment: 普通, problem: 需要回应的评论|
+|note               |否| | string |评论内容|
+|review_id          |是| | string |审查ID|
+|line_code          |否| | string |行号|
+|commit_id          |否| | bool   |commitID|
+|path               |否| | integer|文件路径|
+|parent_id          |否| | integer|父评论ID|
+|diff               |否| | array  |文件diff内容|
+
+> 请求的JSON示例:
+
+```json
+{
+    "type": "problem",
+    "note": "测试评论",
+    "review_id": "10",
+    "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29",
+    "commit_id": "70eede447ccc01c1902260fd377af5d90be28e0d",
+    "path": "Gemfile.lock",
+    "diff": {
+        "name": "README.md",
+        "oldname": "README.md",
+        "addition": 1,
+        "deletion": 2,
+        "type": 2,
+        "is_created": false,
+        "is_deleted": false,
+        "is_bin": false,
+        "is_lfs_file": false,
+        "is_renamed": false,
+        "is_ambiguous": false,
+        "is_submodule": false,
+        "sections": [
+            {
+                "file_name": "README.md",
+                "name": "",
+                "lines": [
+                    {
+                        "left_index": 0,
+                        "right_index": 0,
+                        "match": 0,
+                        "type": 4,
+                        "content": "@@ -1,2 +1 @@",
+                        "section_path": "README.md",
+                        "section_last_left_index": 0,
+                        "section_last_right_index": 0,
+                        "section_left_index": 1,
+                        "section_right_index": 1,
+                        "section_left_hunk_size": 2,
+                        "section_right_hunk_size": 0
+                    },
+                    {
+                        "left_index": 1,
+                        "right_index": 0,
+                        "match": 3,
+                        "type": 3,
+                        "content": "-# ceshi_commit"
+                    },
+                    {
+                        "left_index": 2,
+                        "right_index": 0,
+                        "match": -1,
+                        "type": 3,
+                        "content": "-"
+                    },
+                    {
+                        "left_index": 0,
+                        "right_index": 1,
+                        "match": 1,
+                        "type": 2,
+                        "content": "+adsa"
+                    }
+                ]
+            },
+            {
+                "file_name": "README.md",
+                "name": "",
+                "lines": [
+                    {
+                        "left_index": 0,
+                        "right_index": 0,
+                        "match": 0,
+                        "type": 4,
+                        "content": " ",
+                        "section_path": "README.md",
+                        "section_last_left_index": 0,
+                        "section_last_right_index": 1,
+                        "section_left_index": 3,
+                        "section_right_index": 2,
+                        "section_left_hunk_size": 0,
+                        "section_right_hunk_size": 0
+                    }
+                ]
+            }
+        ],
+        "is_incomplete": false,
+        "is_incomplete_line_too_long": false,
+        "is_protected": false
+    }
+}
+```
+
+> 返回的JSON示例:
+
+```json
+{
+    "id": 200,
+    "note": "测试评论修改",
+    "commit_id": null,
+    "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29",
+    "path": "Gemfile.lock",
+    "diff": {},
+    "need_respond": true,
+    "state": "resolved",
+    "user": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "review": {
+        "reviewer": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "pull_request": {
+            "id": 163,
+            "title": "新合并请求1",
+            "body": null,
+            "head": "master_1",
+            "base": "master",
+            "is_original": false,
+            "index": 1,
+            "status": "closed",
+            "issue": {
+                "id": 260,
+                "author": {
+                    "id": 2,
+                    "type": "User",
+                    "name": "heh",
+                    "login": "yystopf",
+                    "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                },
+                "priority": null,
+                "version": null,
+                "journals_count": 0,
+                "issue_tags": null
+            },
+            "reviewers": [],
+            "journals_count": 9
+        },
+        "id": 10,
+        "commit_id": "1",
+        "content": "新建一个审查",
+        "status": "common",
+        "created_at": "2022-07-26 11:45"
+    },
+    "resolveer": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "resolve_at": "2022-07-27 14:50",
+    "created_at": "2022-07-27 14:31",
+    "updated_at": "2022-07-27 14:50"
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
+
+## 修改一个合并请求评论
+修改一个仓库合并请求的评论
+
+> 示例:
+
+```shell
+curl -X PATCH \
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals/200.json
+```
+
+```javascript
+await octokit.request('PATCH /api/v1/yystopf/ceshi/pulls/1/journals/200.json')
+```
+
+### HTTP 请求
+`PATCH /api/v1/:owner/:repo/pulls/:index/journals/:id.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner              |是| | string |用户登录名  |
+|repo               |是| | string |项目标识identifier  |
+|index              |是| | integer|合并请求序号|
+|id                 |是| | integer|评论ID|
+|note               |是| | string |评论内容|
+|commit_id          |是| | string |commitID|
+|state              |是| | string |评论状态, opened: 开启的, resolved: 已解决的, disabled: 无效的|
+
+> 请求的JSON示例:
+
+```json
+{
+    "note": "测试评论",
+    "commit_id": "70eede447ccc01c1902260fd377af5d90be28e0d",
+    "state": "resolved"
+}
+```
+
+> 返回的JSON示例:
+
+```json
+{
+    "id": 200,
+    "note": "测试评论修改",
+    "commit_id": null,
+    "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29",
+    "path": "Gemfile.lock",
+    "diff": {},
+    "need_respond": true,
+    "state": "resolved",
+    "user": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "review": {
+        "reviewer": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "pull_request": {
+            "id": 163,
+            "title": "新合并请求1",
+            "body": null,
+            "head": "master_1",
+            "base": "master",
+            "is_original": false,
+            "index": 1,
+            "status": "closed",
+            "issue": {
+                "id": 260,
+                "author": {
+                    "id": 2,
+                    "type": "User",
+                    "name": "heh",
+                    "login": "yystopf",
+                    "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                },
+                "priority": null,
+                "version": null,
+                "journals_count": 0,
+                "issue_tags": null
+            },
+            "reviewers": [],
+            "journals_count": 9
+        },
+        "id": 10,
+        "commit_id": "1",
+        "content": "新建一个审查",
+        "status": "common",
+        "created_at": "2022-07-26 11:45"
+    },
+    "resolveer": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "resolve_at": "2022-07-27 14:50",
+    "created_at": "2022-07-27 14:31",
+    "updated_at": "2022-07-27 14:50"
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
+
+## 删除合并请求的一个评论
+删除合并请求的一个评论
+
+> 示例:
+
+```shell
+curl -X DELETE \
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals/200.json
+```
+
+```javascript
+await octokit.request('DELETE /api/v1/yystopf/ceshi/pulls/1/journals/200.json')
+```
+
+### HTTP 请求
+`DELETE /api/v1/:owner/:repo/pulls/:index/journals/:id.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner                |是| | string |用户登录名  |
+|repo                 |是| | string |项目标识identifier  |
+|index                |是| | integer|合并请求序号|
+|id                   |是| | integer|评论ID  |
+
+### 返回字段说明:
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 48721bfd..e0dbf36d 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -34,6 +34,7 @@
 
 class Journal < ApplicationRecord
   serialize :diff, JSON
+  alias_attribute :note, :notes
   belongs_to :user
   belongs_to :issue, foreign_key: :journalized_id, :touch => true, optional: true
   belongs_to :journalized, polymorphic: true
diff --git a/app/services/api/v1/projects/pulls/journals/list_service.rb b/app/services/api/v1/projects/pulls/journals/list_service.rb
index dd69ead0..30b650f0 100644
--- a/app/services/api/v1/projects/pulls/journals/list_service.rb
+++ b/app/services/api/v1/projects/pulls/journals/list_service.rb
@@ -1,7 +1,7 @@
 class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
   include ActiveModel::Model
   
-  attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :sort_by, :sort_direction, :user
+  attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :parent_id, :sort_by, :sort_direction, :user
   attr_accessor :queried_journals
 
   validates :sort_by, inclusion: {in: Journal.column_names, message: '请输入正确的SortBy'}
@@ -16,6 +16,7 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
     @review_id = params[:review_id]
     @need_respond = ActiveModel::Type::Boolean.new.cast(params[:need_respond])
     @state = params[:state]
+    @parent_id = params[:parent_id]
     @sort_by = params[:sort_by] || 'created_on'
     @sort_direction = params[:sort_direction] || 'asc'
     @user = user
@@ -30,14 +31,19 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
 
   private
   def journal_query_data
-    journals = @pull_request.journals.parent_journals
+    journals = @pull_request.journals
+    if parent_id.present?
+      journals = journals.where(parent_id: parent_id)
+    else
+      journals = journals.parent_journals
+    end
 
     journals = journals.where(review_id: review_id) if review_id.present?
     journals = journals.where(need_respond: need_respond) if need_respond.present?
     journals = journals.where(state: state) if state.present?
 
     q = journals.ransack(notes_cont: keyword)
-    scope = q.result.includes(:review)
+    scope = q.result.includes(:user, :resolveer, review: [:reviewer, pull_request: :issue])
     scope = scope.order("journals.#{sort_by} #{sort_direction}")
 
     @queried_journals = scope
diff --git a/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder
index 547db46e..d418ffdc 100644
--- a/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder
+++ b/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder
@@ -1,4 +1,4 @@
-json.(journal, :id, :notes, :commit_id, :line_code, :path, :diff, :need_respond, :state)
+json.(journal, :id, :note, :commit_id, :line_code, :path, :diff, :need_respond, :state, :parent_id)
 json.user do 
   json.partial! 'api/v1/users/simple_user', user: journal.user
 end
diff --git a/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder b/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder
new file mode 100644
index 00000000..04792d5c
--- /dev/null
+++ b/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.total_count @reviews.total_count
+json.reviews @reviews.each do |review|
+  json.partial! 'api/v1/projects/pulls/reviews/simple_detail', review: review
+end
\ No newline at end of file
diff --git a/public/docs/api.html b/public/docs/api.html
index 0a684743..50b1c12a 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -618,9 +618,24 @@
                   <li>
                     <a href="#diff" class="toc-h2 toc-link" data-title="获取合并请求版本Diff">获取合并请求版本Diff</a>
                   </li>
+                  <li>
+                    <a href="#f0f67559aa" class="toc-h2 toc-link" data-title="获取合并请求审查列表">获取合并请求审查列表</a>
+                  </li>
                   <li>
                     <a href="#60a608ec1c" class="toc-h2 toc-link" data-title="为合并请求创建一个审查">为合并请求创建一个审查</a>
                   </li>
+                  <li>
+                    <a href="#ceab9b6b8b" class="toc-h2 toc-link" data-title="获取合并请求评论列表">获取合并请求评论列表</a>
+                  </li>
+                  <li>
+                    <a href="#af36175b18" class="toc-h2 toc-link" data-title="创建一个合并请求评论">创建一个合并请求评论</a>
+                  </li>
+                  <li>
+                    <a href="#bda9985d82" class="toc-h2 toc-link" data-title="修改一个合并请求评论">修改一个合并请求评论</a>
+                  </li>
+                  <li>
+                    <a href="#cb07aeef2e" class="toc-h2 toc-link" data-title="删除合并请求的一个评论">删除合并请求的一个评论</a>
+                  </li>
               </ul>
           </li>
           <li>
@@ -13112,6 +13127,69 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
 <td>string</td>
 <td>项目标识identifier</td>
 </tr>
+<tr>
+<td>keyword</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>搜索关键词</td>
+</tr>
+<tr>
+<td>status</td>
+<td>否</td>
+<td></td>
+<td>int</td>
+<td>合并请求类型 0: 开启的, 1: 合并的 2: 关闭的，不传则为全部的</td>
+</tr>
+<tr>
+<td>priority_id</td>
+<td>否</td>
+<td></td>
+<td>int</td>
+<td>优先级ID</td>
+</tr>
+<tr>
+<td>issue_tag_id</td>
+<td>否</td>
+<td></td>
+<td>int</td>
+<td>标记ID</td>
+</tr>
+<tr>
+<td>version_id</td>
+<td>否</td>
+<td></td>
+<td>int</td>
+<td>里程碑ID</td>
+</tr>
+<tr>
+<td>reviewer_id</td>
+<td>否</td>
+<td></td>
+<td>int</td>
+<td>审查人员ID</td>
+</tr>
+<tr>
+<td>assign_user_id</td>
+<td>否</td>
+<td></td>
+<td>int</td>
+<td>指派人员ID</td>
+</tr>
+<tr>
+<td>sort_by</td>
+<td>否</td>
+<td>created_at</td>
+<td>string</td>
+<td>排序字段，created_at: 创建时间, updated_at: 更新时间</td>
+</tr>
+<tr>
+<td>sort_direction</td>
+<td>否</td>
+<td>desc</td>
+<td>string</td>
+<td>排序类型 desc: 倒序 asc: 正序</td>
+</tr>
 </tbody></table>
 <h3 id='7447e4874e-5'>返回字段说明:</h3>
 <table><thead>
@@ -14123,6 +14201,231 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
     </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
     </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
 </span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='f0f67559aa'>获取合并请求审查列表</h2>
+<p>获取合并请求版本审查列表</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/reviews.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi_commit/pulls/3/reviews.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
+<p><code>GET /api/v1/:owner/:repo/pulls/:index/reviews.json</code></p>
+<h3 id='2eb6f47757-9'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>index</td>
+<td>是</td>
+<td></td>
+<td>int</td>
+<td>合并请求序号</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-7'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>total_count</td>
+<td>int</td>
+<td>审查总数</td>
+</tr>
+<tr>
+<td>reviews.reviewer</td>
+<td>object</td>
+<td>审查者</td>
+</tr>
+<tr>
+<td>reviews.pull_request.id</td>
+<td>integer</td>
+<td>合并请求ID</td>
+</tr>
+<tr>
+<td>reviews.pull_request.title</td>
+<td>string</td>
+<td>合并请求标题</td>
+</tr>
+<tr>
+<td>reviews.pull_request.body</td>
+<td>string</td>
+<td>合并请求内容</td>
+</tr>
+<tr>
+<td>reviews.pull_request.head</td>
+<td>string</td>
+<td>合并请求源分支</td>
+</tr>
+<tr>
+<td>reviews.pull_request.base</td>
+<td>string</td>
+<td>合并请求目标分支</td>
+</tr>
+<tr>
+<td>reviews.pull_request.is_original</td>
+<td>string</td>
+<td>合并请求是否从fork仓库所来</td>
+</tr>
+<tr>
+<td>reviews.pull_request.fork_project.id</td>
+<td>int</td>
+<td>fork仓库的id</td>
+</tr>
+<tr>
+<td>reviews.pull_request.fork_project.identifier</td>
+<td>string</td>
+<td>fork仓库的标识</td>
+</tr>
+<tr>
+<td>reviews.pull_request.fork_project.login</td>
+<td>string</td>
+<td>fork仓库拥有者的标识</td>
+</tr>
+<tr>
+<td>reviews.pull_request.index</td>
+<td>string</td>
+<td>合并请求的序号</td>
+</tr>
+<tr>
+<td>reviews.pull_request.status</td>
+<td>string</td>
+<td>合并请求的状态，open: 打开的, merged: 合并的, closed: 关闭的</td>
+</tr>
+<tr>
+<td>reviews.pull_request.issue.id</td>
+<td>integer</td>
+<td>合并请求下疑修的ID</td>
+</tr>
+<tr>
+<td>reviews.pull_request.issue.author</td>
+<td>object</td>
+<td>合并请求以及疑修的创建着</td>
+</tr>
+<tr>
+<td>reviews.pull_request.issue.priority</td>
+<td>string</td>
+<td>疑修的优先级</td>
+</tr>
+<tr>
+<td>reviews.pull_request.issue.version</td>
+<td>string</td>
+<td>疑修的里程碑</td>
+</tr>
+<tr>
+<td>reviews.pull_request.issue.journals_count</td>
+<td>integer</td>
+<td>普通评论数量</td>
+</tr>
+<tr>
+<td>reviews.pull_request.issue.issue_tags</td>
+<td>array</td>
+<td>所属标记</td>
+</tr>
+<tr>
+<td>reviews.pull_request.journals_count</td>
+<td>integer</td>
+<td>审查评论数量</td>
+</tr>
+<tr>
+<td>reviews.id</td>
+<td>integer</td>
+<td>审查ID</td>
+</tr>
+<tr>
+<td>reviews.commit_id</td>
+<td>string</td>
+<td>审查的commit ID</td>
+</tr>
+<tr>
+<td>reviews.content</td>
+<td>string</td>
+<td>审查的内容</td>
+</tr>
+<tr>
+<td>reviews.status</td>
+<td>string</td>
+<td>审查类型，common: 普通, approved: 通过，rejected: 拒绝通过</td>
+</tr>
+<tr>
+<td>reviews.created_at</td>
+<td>string</td>
+<td>审查创建时间</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"reviews"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"reviewer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"pull_request"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">163</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"title"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新合并请求1"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"body"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master_1"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"closed"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"issue"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">260</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+                    </span><span class="p">},</span><span class="w">
+                    </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"reviewers"</span><span class="p">:</span><span class="w"> </span><span class="p">[],</span><span class="w">
+                </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">8</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新建一个审查"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"common"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-25 17:08"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
 </span></code></pre></div><h2 id='60a608ec1c'>为合并请求创建一个审查</h2>
 <p>合并请求创建一个审查</p>
 
@@ -14132,9 +14435,9 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
 <div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
 http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
 </code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/pulls/1/reviews.json</span><span class="dl">'</span><span class="p">)</span>
-</code></pre></div><h3 id='http-9'>HTTP 请求</h3>
+</code></pre></div><h3 id='http-10'>HTTP 请求</h3>
 <p><code>POST /api/v1/:owner/:repo/pulls/:index/reviews.json</code></p>
-<h3 id='2eb6f47757-9'>请求参数:</h3>
+<h3 id='2eb6f47757-10'>请求参数:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -14196,7 +14499,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
     </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"e506844b2467ce25a35dd46dad8236a1595a02da"</span><span class="p">,</span><span class="w">
     </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"common"</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre></div><h3 id='7447e4874e-7'>返回字段说明:</h3>
+</span></code></pre></div><h3 id='7447e4874e-8'>返回字段说明:</h3>
 <table><thead>
 <tr>
 <th>参数</th>
@@ -14370,6 +14673,746 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
 <aside class="success">
   Success Data.
 </aside>
+<h2 id='ceab9b6b8b'>获取合并请求评论列表</h2>
+<p>获取合并请求版本评论列表</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/journals.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/v1/yystopf/ceshi_commit/pulls/3/journals.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-11'>HTTP 请求</h3>
+<p><code>GET /api/v1/:owner/:repo/pulls/:index/journals.json</code></p>
+<h3 id='2eb6f47757-11'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>index</td>
+<td>是</td>
+<td></td>
+<td>int</td>
+<td>合并请求序号</td>
+</tr>
+<tr>
+<td>keyword</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>搜索关键词</td>
+</tr>
+<tr>
+<td>review_id</td>
+<td>否</td>
+<td></td>
+<td>integer</td>
+<td>审查ID</td>
+</tr>
+<tr>
+<td>need_respond</td>
+<td>否</td>
+<td></td>
+<td>bool</td>
+<td>是否需要回应</td>
+</tr>
+<tr>
+<td>state</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>状态, opened: 开启的, resolved: 已解决的, disabled: 无效的</td>
+</tr>
+<tr>
+<td>parent_id</td>
+<td>否</td>
+<td></td>
+<td>integer</td>
+<td>父评论ID</td>
+</tr>
+<tr>
+<td>sort_by</td>
+<td>否</td>
+<td>created_on</td>
+<td>string</td>
+<td>排序字段 created_on: 创建时间, updated_on: 更新时间</td>
+</tr>
+<tr>
+<td>sort_direction</td>
+<td>否</td>
+<td>asc</td>
+<td>string</td>
+<td>排序类型 desc: 倒序, asc: 正序</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-9'>返回字段说明:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>total_count</td>
+<td>int</td>
+<td>评论总数</td>
+</tr>
+<tr>
+<td>journals.id</td>
+<td>int</td>
+<td>评论ID</td>
+</tr>
+<tr>
+<td>journals.notes</td>
+<td>string</td>
+<td>评论内容</td>
+</tr>
+<tr>
+<td>journals.commit_id</td>
+<td>string</td>
+<td>CommitID</td>
+</tr>
+<tr>
+<td>journals.line_code</td>
+<td>string</td>
+<td>评论行数</td>
+</tr>
+<tr>
+<td>journals.path</td>
+<td>string</td>
+<td>评论文件路径</td>
+</tr>
+<tr>
+<td>journals.diff</td>
+<td>object</td>
+<td>评论文件diff内容</td>
+</tr>
+<tr>
+<td>journals.need_respond</td>
+<td>bool</td>
+<td>评论是否要回应</td>
+</tr>
+<tr>
+<td>journals.state</td>
+<td>string</td>
+<td>评论状态，opened: 开启的, resolved: 已解决的, disabled: 无效的</td>
+</tr>
+<tr>
+<td>journals.parent_id</td>
+<td>int</td>
+<td>父评论ID</td>
+</tr>
+<tr>
+<td>journals.user</td>
+<td>object</td>
+<td>评论创建者</td>
+</tr>
+<tr>
+<td>journals.review</td>
+<td>object</td>
+<td>评论所属评审</td>
+</tr>
+<tr>
+<td>journals.resolveer</td>
+<td>object</td>
+<td>评论解决者</td>
+</tr>
+<tr>
+<td>journals.resolve_at</td>
+<td>int</td>
+<td>评论解决时间</td>
+</tr>
+<tr>
+<td>journals.created_at</td>
+<td>int</td>
+<td>评论创建时间</td>
+</tr>
+<tr>
+<td>journals.updated_at</td>
+<td>int</td>
+<td>评论更新时间</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"total_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"journals"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">200</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"note"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试评论修改"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"line_code"</span><span class="p">:</span><span class="w"> </span><span class="s2">"70eede447ccc01c1902260fd377af5d90be28e0d_0_29"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Gemfile.lock"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"diff"</span><span class="p">:</span><span class="w"> </span><span class="p">{},</span><span class="w">
+            </span><span class="nl">"need_respond"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"resolved"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"parent_id"</span><span class="p">:</span><span class="w"> </span><span class="err">nil</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"review"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"reviewer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"pull_request"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">163</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"title"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新合并请求1"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"body"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master_1"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"closed"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"issue"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">260</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+                        </span><span class="p">},</span><span class="w">
+                        </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+                    </span><span class="p">},</span><span class="w">
+                    </span><span class="nl">"reviewers"</span><span class="p">:</span><span class="w"> </span><span class="p">[],</span><span class="w">
+                    </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">9</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">10</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新建一个审查"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"common"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-26 11:45"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"resolveer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"resolve_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-27 14:50"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-27 14:31"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"updated_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-27 14:50"</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='af36175b18'>创建一个合并请求评论</h2>
+<p>为仓库创建一个合并请求的评论</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/v1/yystopf/ceshi/pulls/1/journals.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-12'>HTTP 请求</h3>
+<p><code>POST /api/v1/:owner/:repo/pulls/:index/journals.json</code></p>
+<h3 id='2eb6f47757-12'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>index</td>
+<td>是</td>
+<td></td>
+<td>integer</td>
+<td>合并请求序号</td>
+</tr>
+<tr>
+<td>type</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>评论类型 comment: 普通, problem: 需要回应的评论</td>
+</tr>
+<tr>
+<td>note</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>评论内容</td>
+</tr>
+<tr>
+<td>review_id</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>审查ID</td>
+</tr>
+<tr>
+<td>line_code</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>行号</td>
+</tr>
+<tr>
+<td>commit_id</td>
+<td>否</td>
+<td></td>
+<td>bool</td>
+<td>commitID</td>
+</tr>
+<tr>
+<td>path</td>
+<td>否</td>
+<td></td>
+<td>integer</td>
+<td>文件路径</td>
+</tr>
+<tr>
+<td>parent_id</td>
+<td>否</td>
+<td></td>
+<td>integer</td>
+<td>父评论ID</td>
+</tr>
+<tr>
+<td>diff</td>
+<td>否</td>
+<td></td>
+<td>array</td>
+<td>文件diff内容</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"problem"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"note"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试评论"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"review_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"10"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"line_code"</span><span class="p">:</span><span class="w"> </span><span class="s2">"70eede447ccc01c1902260fd377af5d90be28e0d_0_29"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"70eede447ccc01c1902260fd377af5d90be28e0d"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Gemfile.lock"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"diff"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"oldname"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"addition"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"deletion"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_created"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_deleted"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_bin"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_lfs_file"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_renamed"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_ambiguous"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_submodule"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"sections"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+            </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                    </span><span class="p">{</span><span class="w">
+                        </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"@@ -1,2 +1 @@"</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_last_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_last_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_left_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_right_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+                    </span><span class="p">},</span><span class="w">
+                    </span><span class="p">{</span><span class="w">
+                        </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"-# ceshi_commit"</span><span class="w">
+                    </span><span class="p">},</span><span class="w">
+                    </span><span class="p">{</span><span class="w">
+                        </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">-1</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"-"</span><span class="w">
+                    </span><span class="p">},</span><span class="w">
+                    </span><span class="p">{</span><span class="w">
+                        </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"+adsa"</span><span class="w">
+                    </span><span class="p">}</span><span class="w">
+                </span><span class="p">]</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"lines"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+                    </span><span class="p">{</span><span class="w">
+                        </span><span class="nl">"left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"match"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">" "</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"README.md"</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_last_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_last_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_left_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_right_index"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_left_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                        </span><span class="nl">"section_right_hunk_size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+                    </span><span class="p">}</span><span class="w">
+                </span><span class="p">]</span><span class="w">
+            </span><span class="p">}</span><span class="w">
+        </span><span class="p">],</span><span class="w">
+        </span><span class="nl">"is_incomplete"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_incomplete_line_too_long"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"is_protected"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
+    </span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">200</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"note"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试评论修改"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"line_code"</span><span class="p">:</span><span class="w"> </span><span class="s2">"70eede447ccc01c1902260fd377af5d90be28e0d_0_29"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Gemfile.lock"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"diff"</span><span class="p">:</span><span class="w"> </span><span class="p">{},</span><span class="w">
+    </span><span class="nl">"need_respond"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"resolved"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"review"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"reviewer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"pull_request"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">163</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"title"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新合并请求1"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"body"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master_1"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"closed"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"issue"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">260</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"reviewers"</span><span class="p">:</span><span class="w"> </span><span class="p">[],</span><span class="w">
+            </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">9</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">10</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新建一个审查"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"common"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-26 11:45"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"resolveer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"resolve_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-27 14:50"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-27 14:31"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"updated_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-27 14:50"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='bda9985d82'>修改一个合并请求评论</h2>
+<p>修改一个仓库合并请求的评论</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> PATCH <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals/200.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">PATCH /api/v1/yystopf/ceshi/pulls/1/journals/200.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-13'>HTTP 请求</h3>
+<p><code>PATCH /api/v1/:owner/:repo/pulls/:index/journals/:id.json</code></p>
+<h3 id='2eb6f47757-13'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>index</td>
+<td>是</td>
+<td></td>
+<td>integer</td>
+<td>合并请求序号</td>
+</tr>
+<tr>
+<td>id</td>
+<td>是</td>
+<td></td>
+<td>integer</td>
+<td>评论ID</td>
+</tr>
+<tr>
+<td>note</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>评论内容</td>
+</tr>
+<tr>
+<td>commit_id</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>commitID</td>
+</tr>
+<tr>
+<td>state</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>评论状态, opened: 开启的, resolved: 已解决的, disabled: 无效的</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>请求的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"note"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试评论"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"70eede447ccc01c1902260fd377af5d90be28e0d"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"resolved"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">200</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"note"</span><span class="p">:</span><span class="w"> </span><span class="s2">"测试评论修改"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"line_code"</span><span class="p">:</span><span class="w"> </span><span class="s2">"70eede447ccc01c1902260fd377af5d90be28e0d_0_29"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Gemfile.lock"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"diff"</span><span class="p">:</span><span class="w"> </span><span class="p">{},</span><span class="w">
+    </span><span class="nl">"need_respond"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"resolved"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"user"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"review"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"reviewer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"pull_request"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">163</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"title"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新合并请求1"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"body"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"head"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master_1"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"base"</span><span class="p">:</span><span class="w"> </span><span class="s2">"master"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"is_original"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"index"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"closed"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"issue"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">260</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"author"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+                    </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+                    </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+                </span><span class="p">},</span><span class="w">
+                </span><span class="nl">"priority"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"version"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+                </span><span class="nl">"issue_tags"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+            </span><span class="p">},</span><span class="w">
+            </span><span class="nl">"reviewers"</span><span class="p">:</span><span class="w"> </span><span class="p">[],</span><span class="w">
+            </span><span class="nl">"journals_count"</span><span class="p">:</span><span class="w"> </span><span class="mi">9</span><span class="w">
+        </span><span class="p">},</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">10</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"commit_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"新建一个审查"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"common"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-26 11:45"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"resolveer"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"User"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"heh"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"login"</span><span class="p">:</span><span class="w"> </span><span class="s2">"yystopf"</span><span class="p">,</span><span class="w">
+        </span><span class="nl">"image_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"system/lets/letter_avatars/2/H/188_239_142/120.png"</span><span class="w">
+    </span><span class="p">},</span><span class="w">
+    </span><span class="nl">"resolve_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-27 14:50"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-27 14:31"</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"updated_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-07-27 14:50"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='cb07aeef2e'>删除合并请求的一个评论</h2>
+<p>删除合并请求的一个评论</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals/200.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/v1/yystopf/ceshi/pulls/1/journals/200.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-14'>HTTP 请求</h3>
+<p><code>DELETE /api/v1/:owner/:repo/pulls/:index/journals/:id.json</code></p>
+<h3 id='2eb6f47757-14'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+<tr>
+<td>index</td>
+<td>是</td>
+<td></td>
+<td>integer</td>
+<td>合并请求序号</td>
+</tr>
+<tr>
+<td>id</td>
+<td>是</td>
+<td></td>
+<td>integer</td>
+<td>评论ID</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-10'>返回字段说明:</h3>
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
 <h1 id='issues'>Issues</h1><h1 id='organizations'>Organizations</h1><h1 id='teams'>Teams</h1><h1 id='errors'>Errors</h1>
 <aside class="notice">
 This error section is stored in a separate file in <code>includes/_errors.md</code>. Slate allows you to optionally separate out your docs into many files...just save them to the <code>includes</code> folder and add them to the top of your <code>index.md</code>'s frontmatter. Files are included in the order listed.

From b3d78741a3dca55e8ca3228bd2568b22af9d506d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Thu, 28 Jul 2022 09:31:14 +0800
Subject: [PATCH 137/208] =?UTF-8?q?fixed=20reposyncer=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0gitlink?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ob_repository_syncs_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb
index 0f1c64b1..10732093 100644
--- a/app/controllers/ob_repository_syncs_controller.rb
+++ b/app/controllers/ob_repository_syncs_controller.rb
@@ -13,8 +13,8 @@ class ObRepositorySyncsController < ApplicationController
     tip_exception "参数错误" if params[:github_address].blank? && params[:gitee_address].blank?
     project_name ="#{@project.owner.name}:#{@project.identifier}"
     service = ObRepositorySync::ApiService.new(project_name)
-    params = params.merge({ "gitlink_address": @project.repository.url })
-    res = service.create_projects(params)
+    project_params = params.merge({ "gitlink_address": @project.repository.url })
+    res = service.create_projects(project_params)
     tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
     sync_id = res["data"]["id"]
     ob_repository_sync = ObRepositorySync.find_or_initialize_by(project_id: @project.id)

From 6e54203ebb5d2e81edd9a308726dbe9e14899ca3 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Jul 2022 13:56:31 +0800
Subject: [PATCH 138/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=8F=90=E4=BA=A4=E6=96=87=E4=BB=B6=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E4=BB=A5=E5=8F=8A=E6=95=B0=E6=8D=AE=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/contents/batch_create_service.rb |  3 ++-
 .../v1/projects/contents/batch.json.jbuilder  | 20 +++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

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 d987f931..ec4aec8d 100644
--- a/app/services/api/v1/projects/contents/batch_create_service.rb
+++ b/app/services/api/v1/projects/contents/batch_create_service.rb
@@ -13,7 +13,6 @@ class Api::V1::Projects::Contents::BatchCreateService < ApplicationService
 
 
   def initialize(project, params, token=nil)
-    puts params
     @project = project 
     @owner = project&.owner.login 
     @repo = project&.identifier
@@ -63,6 +62,7 @@ class Api::V1::Projects::Contents::BatchCreateService < ApplicationService
           committer: Time.at(committer_timeunix.to_i)
         },
         message: message,
+        branch: branch,
         new_branch: new_branch,
         signoff: false
       }
@@ -77,6 +77,7 @@ class Api::V1::Projects::Contents::BatchCreateService < ApplicationService
   end
 
   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 
     raise Error, '创建文件失败！' unless @gitea_data.is_a?(Hash)
   end
diff --git a/app/views/api/v1/projects/contents/batch.json.jbuilder b/app/views/api/v1/projects/contents/batch.json.jbuilder
index a9ef08fa..fa41bfb9 100644
--- a/app/views/api/v1/projects/contents/batch.json.jbuilder
+++ b/app/views/api/v1/projects/contents/batch.json.jbuilder
@@ -3,12 +3,16 @@ json.commit do
   json.authored_time render_unix_time(@result_object['commit']['author']['date'])
   json.commited_time render_unix_time(@result_object['commit']['committer']['date'])
 end
-json.contents @result_object['contents'].each do |content|
-  json.name content['name']
-  json.path content['path']
-  json.sha content['sha']
-  json.type content['type'] 
-  json.size content['size']
-  json.encoding content['encoding']
-  json.content content['content']
+if @result_object['contents'].is_a?(Array) 
+  json.contents @result_object['contents'].each do |content|
+    json.name content['name']
+    json.path content['path']
+    json.sha content['sha']
+    json.type content['type'] 
+    json.size content['size']
+    json.encoding content['encoding']
+    json.content content['content']
+  end
+else 
+  json.contents []
 end
\ No newline at end of file

From f417e4286477dfc6d749961f4e4dc4e62c3c1116 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Jul 2022 14:02:37 +0800
Subject: [PATCH 139/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/api/v1/projects/contents/batch_create_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ec4aec8d..5fa88011 100644
--- a/app/services/api/v1/projects/contents/batch_create_service.rb
+++ b/app/services/api/v1/projects/contents/batch_create_service.rb
@@ -79,7 +79,7 @@ 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 
-    raise Error, '创建文件失败！' unless @gitea_data.is_a?(Hash)
+    raise Error, '提交文件失败！' unless @gitea_data.is_a?(Hash)
   end
 
   def check_branch_exist 

From 35c6cb98db6ba0532cfeabed4d1f76168e14675b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Jul 2022 14:25:33 +0800
Subject: [PATCH 140/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=8F=90=E4=BA=A4=E6=96=87=E4=BB=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=80=89=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/contents_controller.rb    |  6 +++-
 .../slate/source/includes/_repositories.md    | 30 ++++++++---------
 .../projects/contents/batch_create_service.rb |  4 +--
 public/docs/api.html                          | 32 +++++++++----------
 4 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/app/controllers/api/v1/projects/contents_controller.rb b/app/controllers/api/v1/projects/contents_controller.rb
index a4e65051..44ab8c54 100644
--- a/app/controllers/api/v1/projects/contents_controller.rb
+++ b/app/controllers/api/v1/projects/contents_controller.rb
@@ -2,7 +2,11 @@ class Api::V1::Projects::ContentsController < Api::V1::BaseController
   before_action :require_operate_above, only: [:batch]
 
   def batch 
-    @result_object = Api::V1::Projects::Contents::BatchCreateService.call(@project, batch_content_params, current_user&.gitea_token)
+    @batch_content_params = batch_content_params
+    # 处理下author和committer信息，如果没传则默认为当前用户信息
+    @batch_content_params.merge!(author_email: current_user.mail, author_name: current_user.login) if batch_content_params[:author_email].blank? && batch_content_params[:author_name].blank?
+    @batch_content_params.merge!(committer_email: current_user.mail, committer_name: current_user.login) if batch_content_params[:committer_email].blank? && batch_content_params[:committer_name].blank?
+    @result_object = Api::V1::Projects::Contents::BatchCreateService.call(@project, @batch_content_params, current_user&.gitea_token)
     puts @result_object
   end
 
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index a07f2351..a9fa42e2 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -1126,21 +1126,21 @@ await octokit.request('POST /api/v1/yystopf/ceshi/contents/batch.json')
 ### 请求参数:
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
-|owner             |是|      |string |用户登录名  |
-|repo              |是|      |string |项目标识identifier  |
-|files.action_type |是|      |string|操作类型 create: 创建 update: 更新 delete: 删除|
-|files.content     |是|      |string|文件内容|
-|files.encoding    |是|      |string|文件编码方式 text 文本 base64 加密|
-|files.file_path   |是|      |string|文件路径|
-|author_email      |是|      |string|作者邮箱|
-|author_name       |是|      |string|作者名称|
-|author_timeunix   |是|      |int|编码时间，精确到秒|
-|committer_email   |是|      |string|提交者邮箱|
-|committer_name    |是|      |string|提交者名称|
-|committer_timeunix|是|      |int|提交时间戳，精确到秒|
-|branch            |是|      |string|提交分支|
-|new_branch        |否|      |string|如果需要创建新分支，这个需要填|
-|message           |是|      |string|提交信息|
+|owner             |是|            |string |用户登录名  |
+|repo              |是|            |string |项目标识identifier  |
+|files.action_type |是|            |string|操作类型 create: 创建 update: 更新 delete: 删除|
+|files.content     |是|            |string|文件内容|
+|files.encoding    |是|            |string|文件编码方式 text 文本 base64 加密|
+|files.file_path   |是|            |string|文件路径|
+|author_email      |否| 当前用户邮箱 |string|作者邮箱，不填时需要与作者名称同时为空|
+|author_name       |否| 当前用户标识 |string|作者名称，不填时需要与作者邮箱同时为空|
+|author_timeunix   |否| 当前时间戳   |int|编码时间，精确到秒|
+|committer_email   |否| 当前用户邮箱 |string|提交者邮箱，不填时需要与提交者名称同时为空|
+|committer_name    |否| 当前用户标识 |string|提交者名称，不填时需要与提交者邮箱同时为空|
+|committer_timeunix|否| 当前时间戳   |int|提交时间戳，精确到秒|
+|branch            |是|            |string|提交分支|
+|new_branch        |否|            |string|如果需要创建新分支，这个需要填|
+|message           |是|            |string|提交信息|
 
 > 请求的JSON示例:
 
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 5fa88011..464f8eec 100644
--- a/app/services/api/v1/projects/contents/batch_create_service.rb
+++ b/app/services/api/v1/projects/contents/batch_create_service.rb
@@ -20,11 +20,11 @@ class Api::V1::Projects::Contents::BatchCreateService < ApplicationService
     @files = params[:files]
     @author_email = params[:author_email]
     @author_name = params[:author_name]
-    @author_timeunix = params[:author_timeunix]
+    @author_timeunix = params[:author_timeunix] || Time.now.to_i
     @branch = params[:branch]
     @committer_email = params[:committer_email]
     @committer_name = params[:committer_name]
-    @committer_timeunix = params[:committer_timeunix]
+    @committer_timeunix = params[:committer_timeunix] || Time.now.to_i
     @message = params[:message]
     @new_branch = params[:new_branch]
   end
diff --git a/public/docs/api.html b/public/docs/api.html
index 50b1c12a..bcc4da5c 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -9164,43 +9164,43 @@ http://localhost:3000/api/v1/yystopf/ceshi/contents/batch.json
 </tr>
 <tr>
 <td>author_email</td>
-<td>是</td>
-<td></td>
+<td>否</td>
+<td>当前用户邮箱</td>
 <td>string</td>
-<td>作者邮箱</td>
+<td>作者邮箱，不填时需要与作者名称同时为空</td>
 </tr>
 <tr>
 <td>author_name</td>
-<td>是</td>
-<td></td>
+<td>否</td>
+<td>当前用户标识</td>
 <td>string</td>
-<td>作者名称</td>
+<td>作者名称，不填时需要与作者邮箱同时为空</td>
 </tr>
 <tr>
 <td>author_timeunix</td>
-<td>是</td>
-<td></td>
+<td>否</td>
+<td>当前时间戳</td>
 <td>int</td>
 <td>编码时间，精确到秒</td>
 </tr>
 <tr>
 <td>committer_email</td>
-<td>是</td>
-<td></td>
+<td>否</td>
+<td>当前用户邮箱</td>
 <td>string</td>
-<td>提交者邮箱</td>
+<td>提交者邮箱，不填时需要与提交者名称同时为空</td>
 </tr>
 <tr>
 <td>committer_name</td>
-<td>是</td>
-<td></td>
+<td>否</td>
+<td>当前用户标识</td>
 <td>string</td>
-<td>提交者名称</td>
+<td>提交者名称，不填时需要与提交者邮箱同时为空</td>
 </tr>
 <tr>
 <td>committer_timeunix</td>
-<td>是</td>
-<td></td>
+<td>否</td>
+<td>当前时间戳</td>
 <td>int</td>
 <td>提交时间戳，精确到秒</td>
 </tr>

From d5c141f89207a8b22c3eebfa43be9d3b5ec18703 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Jul 2022 15:19:31 +0800
Subject: [PATCH 141/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Apulls?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9load?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/projects/{ => pulls}/pulls_controller.rb | 2 +-
 app/services/api/v1/projects/contents/batch_create_service.rb   | 2 +-
 app/views/api/v1/projects/pulls/{ => pulls}/index.json.jbuilder | 0
 app/views/api/v1/projects/pulls/{ => pulls}/show.json.jbuilder  | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename app/controllers/api/v1/projects/{ => pulls}/pulls_controller.rb (88%)
 rename app/views/api/v1/projects/pulls/{ => pulls}/index.json.jbuilder (100%)
 rename app/views/api/v1/projects/pulls/{ => pulls}/show.json.jbuilder (100%)

diff --git a/app/controllers/api/v1/projects/pulls_controller.rb b/app/controllers/api/v1/projects/pulls/pulls_controller.rb
similarity index 88%
rename from app/controllers/api/v1/projects/pulls_controller.rb
rename to app/controllers/api/v1/projects/pulls/pulls_controller.rb
index c93cd8bd..1a7c574d 100644
--- a/app/controllers/api/v1/projects/pulls_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/pulls_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::Projects::PullsController < Api::V1::BaseController
+class Api::V1::Projects::Pulls::PullsController < Api::V1::BaseController
   before_action :require_public_and_member_above
 
   def index  
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 464f8eec..92bd30a9 100644
--- a/app/services/api/v1/projects/contents/batch_create_service.rb
+++ b/app/services/api/v1/projects/contents/batch_create_service.rb
@@ -86,7 +86,7 @@ class Api::V1::Projects::Contents::BatchCreateService < ApplicationService
     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, '分支不存在！' unless result['branch_name'].include?(branch)
-    raise Error, '分支已存在！' if result['branch_name'].include?(new_branch) && new_branch.nil?
+    raise Error, '分支已存在！' if result['branch_name'].include?(new_branch) && !new_branch.nil?
   end
 
 end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/pulls/index.json.jbuilder b/app/views/api/v1/projects/pulls/pulls/index.json.jbuilder
similarity index 100%
rename from app/views/api/v1/projects/pulls/index.json.jbuilder
rename to app/views/api/v1/projects/pulls/pulls/index.json.jbuilder
diff --git a/app/views/api/v1/projects/pulls/show.json.jbuilder b/app/views/api/v1/projects/pulls/pulls/show.json.jbuilder
similarity index 100%
rename from app/views/api/v1/projects/pulls/show.json.jbuilder
rename to app/views/api/v1/projects/pulls/pulls/show.json.jbuilder

From 4ccf8ea5fff14ba7a2bd6941d48181cc331d6480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Thu, 28 Jul 2022 16:42:21 +0800
Subject: [PATCH 142/208] =?UTF-8?q?CloudIDEA=E6=96=87=E4=BB=B6=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E5=B7=B2=E8=AF=BB=E6=9C=AA=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/mark_files_controller.rb      | 29 +++++++++++++++++++
 app/models/mark_file.rb                       |  5 ++++
 app/models/pull_request.rb                    |  1 +
 app/views/mark_files/index.json.jbuilder      | 12 ++++++++
 config/routes.rb                              |  3 +-
 .../20220728022339_create_mark_files.rb       | 15 ++++++++++
 6 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/mark_files_controller.rb
 create mode 100644 app/models/mark_file.rb
 create mode 100644 app/views/mark_files/index.json.jbuilder
 create mode 100644 db/migrate/20220728022339_create_mark_files.rb

diff --git a/app/controllers/mark_files_controller.rb b/app/controllers/mark_files_controller.rb
new file mode 100644
index 00000000..88856c35
--- /dev/null
+++ b/app/controllers/mark_files_controller.rb
@@ -0,0 +1,29 @@
+class MarkFilesController < ApplicationController
+  before_action :require_login
+  before_action :load_project 
+  before_action :load_pull_request
+
+  def index
+    @files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gitea_number, current_user&.gitea_token)
+
+    MarkFile.bulk_insert(*%i[pull_request_id, file_path_sha file_path created_at updated_at]) do |worker|
+      @files_result['Files'].echo do |file|
+        worker.add(pull_request_id: @pull_request.id, file_path_sha: SecureRandom.uuid.gsub("-", ""), file_path: file['Name'])
+      end
+    end
+    @mark_files = MarkFile.where(pull_request_id: @pull_request.id)
+  end
+
+  def create
+  end
+
+  private 
+  def review_params 
+    params.require(:review).permit(:content, :commit_id, :status)
+  end
+
+  def load_pull_request
+    @pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || PullRequest.find_by_id(params[:id])
+  end
+
+end
\ No newline at end of file
diff --git a/app/models/mark_file.rb b/app/models/mark_file.rb
new file mode 100644
index 00000000..c6c83462
--- /dev/null
+++ b/app/models/mark_file.rb
@@ -0,0 +1,5 @@
+class MarkFile < ApplicationRecord
+  belongs_to :pull_request
+
+
+end
diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb
index 4ced61aa..270e7dc7 100644
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@@ -43,6 +43,7 @@ class PullRequest < ApplicationRecord
   has_many :reviews, dependent: :destroy
   has_many :pull_requests_reviewers, dependent: :destroy
   has_many :reviewers, through: :pull_requests_reviewers
+  has_many :mark_files, dependent: :destroy
 
   scope :merged_and_closed, ->{where.not(status: 0)}
   scope :opening, -> {where(status: 0)}
diff --git a/app/views/mark_files/index.json.jbuilder b/app/views/mark_files/index.json.jbuilder
new file mode 100644
index 00000000..18bf90b5
--- /dev/null
+++ b/app/views/mark_files/index.json.jbuilder
@@ -0,0 +1,12 @@
+json.status 0
+json.message 'success'
+json.count @mark_files.count
+json.files do
+  json.array! @mark_files do |file|
+    json.sha file.file_path_sha
+    json.name file.file_path
+    json.mark_as_read file.mark_as_read
+    json.updated_after_read file.updated_after_read
+  end
+
+end
diff --git a/config/routes.rb b/config/routes.rb
index f32f1050..5f8f9f74 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -528,7 +528,8 @@ Rails.application.routes.draw do
           post :refuse_merge
           get :files
           get :commits
-          resources :reviews, only: [:create] 
+          resources :reviews, only: [:create]
+          resources :mark_files, only:  [:index, :create]
         end
         collection do
           post :check_can_merge
diff --git a/db/migrate/20220728022339_create_mark_files.rb b/db/migrate/20220728022339_create_mark_files.rb
new file mode 100644
index 00000000..45f4b1cb
--- /dev/null
+++ b/db/migrate/20220728022339_create_mark_files.rb
@@ -0,0 +1,15 @@
+class CreateMarkFiles < ActiveRecord::Migration[5.2]
+  def change
+    create_table :mark_files do |t|
+      t.references :pull_request
+      t.integer :user_id
+      t.string :file_path_sha
+      t.string :file_path
+      t.boolean :mark_as_read, default: false
+      t.boolean :updated_after_read, default: false
+      t.timestamps
+    end
+
+    add_index :mark_files, :file_path_sha
+  end
+end

From 579b45dfa4572462dc28a4f44a62ae8421be35f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Thu, 28 Jul 2022 17:19:39 +0800
Subject: [PATCH 143/208] =?UTF-8?q?fixed=20=E7=B2=BE=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=8D=E5=8C=85=E5=90=AB=E7=A7=81=E6=9C=89=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/gitea/repository/languages/list_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/gitea/repository/languages/list_service.rb b/app/services/gitea/repository/languages/list_service.rb
index 88d5dcbe..9c96d56e 100644
--- a/app/services/gitea/repository/languages/list_service.rb
+++ b/app/services/gitea/repository/languages/list_service.rb
@@ -10,7 +10,7 @@ class Gitea::Repository::Languages::ListService < Gitea::ClientService
   def initialize(owner, repo, token)
     @owner = owner
     @repo  = repo
-    @args  = token
+    @token  = token
   end
 
   def call

From b22909a654a19d5c861acd4720b3fb46b7b06105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Thu, 28 Jul 2022 17:20:22 +0800
Subject: [PATCH 144/208] =?UTF-8?q?fixed=20=E8=AF=AD=E8=A8=80=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3token=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/gitea/repository/languages/list_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/gitea/repository/languages/list_service.rb b/app/services/gitea/repository/languages/list_service.rb
index 9c96d56e..355c149d 100644
--- a/app/services/gitea/repository/languages/list_service.rb
+++ b/app/services/gitea/repository/languages/list_service.rb
@@ -10,7 +10,7 @@ class Gitea::Repository::Languages::ListService < Gitea::ClientService
   def initialize(owner, repo, token)
     @owner = owner
     @repo  = repo
-    @token  = token
+    @token = token
   end
 
   def call

From f12cfabee3d6e6ba8037680d8eabc1b2821987af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Thu, 28 Jul 2022 17:30:09 +0800
Subject: [PATCH 145/208] =?UTF-8?q?fixed=20=E7=B2=BE=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=8D=E5=8C=85=E5=90=AB=E7=A7=81=E6=9C=89=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users/is_pinned_projects_controller.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users/is_pinned_projects_controller.rb b/app/controllers/users/is_pinned_projects_controller.rb
index 1ddadd27..ff45120f 100644
--- a/app/controllers/users/is_pinned_projects_controller.rb
+++ b/app/controllers/users/is_pinned_projects_controller.rb
@@ -1,7 +1,10 @@
 class Users::IsPinnedProjectsController < Users::BaseController 
   before_action :private_user_resources!, only: [:pin]
-  def index 
-    @is_pinned_projects = observed_user.pinned_projects.order(position: :desc, created_at: :asc).includes(project: [:project_category, :project_language, :repository]).order(position: :desc)
+  def index
+    @is_pinned_projects = observed_user.pinned_projects.left_joins(:project)
+                                       .where("projects.is_public = TRUE")
+                                       .order(position: :desc, created_at: :asc)
+                                       .includes(project: [:project_category, :project_language, :repository]).order(position: :desc)
     @is_pinned_projects = kaminari_paginate(@is_pinned_projects)
   end 
   

From df57312056589974d2d622c0604eca6ad9e0eebf Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 29 Jul 2022 17:29:25 +0800
Subject: [PATCH 146/208] =?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/trace/client_service.rb | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/services/trace/client_service.rb b/app/services/trace/client_service.rb
index 72ffa8ca..67da5d7a 100644
--- a/app/services/trace/client_service.rb
+++ b/app/services/trace/client_service.rb
@@ -8,8 +8,11 @@ class Trace::ClientService < ApplicationService
   def authed_post(token, url, params={})
     puts "[trace][POST] request params: #{params}"
     puts "[trace][POST] request token: #{token}"
-    conn.headers['Authorization'] = token
-    conn.post(full_url(url), params[:data]) 
+    conn.post do |req|
+      req.url full_url(url, 'post')
+      req.headers['Authorization'] = token
+      req.body = params[:data].as_json
+    end
   end
 
   def get(url, params={})
@@ -42,8 +45,11 @@ class Trace::ClientService < ApplicationService
   def authed_delete(token, url, params={})
     puts "[trace][DELETE] request params: #{params}"
     puts "[trace][DELETE] request token: #{token}"
-    conn.headers['Authorization'] = token
-    conn.delete(full_url(url), params[:data])
+    conn.delete do |req|
+      req.url full_url(url, 'delete')
+      req.headers['Authorization'] = token
+      req.body = params[:data].as_json
+    end
   end
 
   def patch(url, params={})
@@ -54,8 +60,11 @@ class Trace::ClientService < ApplicationService
   def authed_patch(token, url, params={})
     puts "[trace][PATCH] request params: #{params}"
     puts "[trace][PATCH] request token: #{token}"
-    conn.headers['Authorization'] = token
-    conn.patch(full_url(url), params[:data])
+    conn.patch do |req|
+      req.url full_url(url, 'patch')
+      req.headers['Authorization'] = token
+      req.body = params[:data].as_json
+    end
   end
 
   def put(url, params={})
@@ -66,8 +75,11 @@ class Trace::ClientService < ApplicationService
   def authed_put(token, url, params={})
     puts "[trace][PUT] request params: #{params}"
     puts "[trace][PUT] request token: #{token}"
-    conn.headers['Authorization'] = token
-    conn.put(full_url(url), params[:data])
+    conn.put do |req|
+      req.url full_url(url, 'put')
+      req.headers['Authorization'] = token
+      req.body = params[:data].as_json
+    end
   end
 
   def conn 

From 096b0b954d2c6474f9677792e027d509ecee43e2 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 1 Aug 2022 17:14:32 +0800
Subject: [PATCH 147/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20fork=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E5=8D=8F=E4=BD=9C=E8=80=85=E5=8F=AF=E4=BB=A5=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=96=87=E4=BB=B6=E8=87=B3=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/base_controller.rb              | 7 +++++++
 app/controllers/api/v1/projects/contents_controller.rb | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index c765906b..b937d798 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -40,6 +40,13 @@ class Api::V1::BaseController < ApplicationController
     return render_forbidden if !current_user.admin? && !@project.operator?(current_user)
   end
 
+  # 具有仓库的操作权限或者fork仓库的操作权限
+  def require_operate_above_or_fork_project 
+    @project = load_project
+    puts !current_user.admin? && !@project.operator?(current_user) && !(@project.fork_project.present? && @project.fork_project.operator?(current_user))
+    return render_forbidden if !current_user.admin? && !@project.operator?(current_user) && !(@project.fork_project.present? && @project.fork_project.operator?(current_user))
+  end
+
   # 具有对仓库的访问权限
   def require_public_and_member_above
     @project = load_project 
diff --git a/app/controllers/api/v1/projects/contents_controller.rb b/app/controllers/api/v1/projects/contents_controller.rb
index 44ab8c54..1c59164a 100644
--- a/app/controllers/api/v1/projects/contents_controller.rb
+++ b/app/controllers/api/v1/projects/contents_controller.rb
@@ -1,13 +1,13 @@
 class Api::V1::Projects::ContentsController < Api::V1::BaseController 
-  before_action :require_operate_above, only: [:batch]
+  before_action :require_operate_above_or_fork_project, only: [:batch]
 
   def batch 
     @batch_content_params = batch_content_params
     # 处理下author和committer信息，如果没传则默认为当前用户信息
     @batch_content_params.merge!(author_email: current_user.mail, author_name: current_user.login) if batch_content_params[:author_email].blank? && batch_content_params[:author_name].blank?
     @batch_content_params.merge!(committer_email: current_user.mail, committer_name: current_user.login) if batch_content_params[:committer_email].blank? && batch_content_params[:committer_name].blank?
-    @result_object = Api::V1::Projects::Contents::BatchCreateService.call(@project, @batch_content_params, current_user&.gitea_token)
-    puts @result_object
+
+    @result_object = Api::V1::Projects::Contents::BatchCreateService.call(@project, @batch_content_params, @project.owner.gitea_token)
   end
 
   private 

From 8bf4e9b8d23029070ca525192de3eed3074cf8e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 2 Aug 2022 18:10:01 +0800
Subject: [PATCH 148/208] fixed Repository.url

---
 app/models/repository.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 03c4e98e..c6016400 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -49,7 +49,7 @@ class Repository < ApplicationRecord
   end
 
   def url
-    self['url'].blank? ? "#{Gitea.gitea_config[:domain]}/#{self.owner&.login}/#{self.identifier}.git" : self['url']
+    self['url'].blank? ? "#{GiteaService.gitea_config[:domain]}/#{self.owner&.login}/#{self.identifier}.git" : self['url']
   end
 
   # with repository is mirror

From ab5d273f9888339cc72512a12239f2bcd696b8bb Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 2 Aug 2022 19:03:54 +0800
Subject: [PATCH 149/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=89=88?=
 =?UTF-8?q?=E6=9C=ACdiff=E6=96=B0=E5=A2=9Ediff=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/_simple_gitea_diff_detail.json.jbuilder      | 1 +
 .../api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder b/app/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder
index 5dff0b89..f313d2ed 100644
--- a/app/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder
+++ b/app/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder
@@ -14,6 +14,7 @@ json.files diff['Files'].each do |file|
   json.is_renamed file['IsRenamed']
   json.is_ambiguous file['IsAmbiguous']
   json.is_submodule file['IsSubmodule']
+  json.diff file['Diff']
   json.sections file['Sections'] do |section|
     json.file_name section['FileName']
     json.name section['Name']
diff --git a/app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder b/app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder
index 13f83333..9bbcafd5 100644
--- a/app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder
+++ b/app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder
@@ -10,6 +10,7 @@ json.name file['Name']
   json.is_renamed file['IsRenamed']
   json.is_ambiguous file['IsAmbiguous']
   json.is_submodule file['IsSubmodule']
+  json.diff file['Diff']
   json.sections file['Sections'] do |section|
     json.file_name section['FileName']
     json.name section['Name']

From fea11bdc2ec9b0a5c44d3863cc0832571187c6c7 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 3 Aug 2022 14:20:25 +0800
Subject: [PATCH 150/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Awebhook=20ty?=
 =?UTF-8?q?pe=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/webhooks_controller.rb           |  7 ++++++-
 app/docs/slate/source/includes/_pulls.md             |  1 +
 app/docs/slate/source/includes/_repositories.md      |  2 +-
 .../api/v1/projects/webhooks/create_service.rb       |  7 ++++---
 .../projects/webhooks/_simple_detail.json.jbuilder   |  2 +-
 .../webhooks/_simple_gitea_detail.json.jbuilder      |  1 +
 public/docs/api.html                                 | 12 ++++++++++++
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/projects/webhooks_controller.rb b/app/controllers/api/v1/projects/webhooks_controller.rb
index bb2c2172..1dec26d2 100644
--- a/app/controllers/api/v1/projects/webhooks_controller.rb
+++ b/app/controllers/api/v1/projects/webhooks_controller.rb
@@ -5,11 +5,12 @@ class Api::V1::Projects::WebhooksController < Api::V1::BaseController
   def index 
     # @result_object = Api::V1::Projects::Webhooks::ListService.call(@project, current_user&.gitea_token)
     @webhooks = @project.webhooks
+    @webhooks = @webhooks.where(type: params[:type]) if params[:type].present?
     @webhooks = kaminari_paginate(@webhooks)
   end
 
   def create 
-    @result_object = Api::V1::Projects::Webhooks::CreateService.call(@project, webhook_params, current_user&.gitea_token)
+    @result_object = Api::V1::Projects::Webhooks::CreateService.call(@project, create_webhook_params, current_user&.gitea_token)
   end
 
   def show 
@@ -44,6 +45,10 @@ class Api::V1::Projects::WebhooksController < Api::V1::BaseController
   end
 
   private 
+  def create_webhook_params 
+    params.require(:webhook).permit(:active, :branch_filter, :http_method, :url, :content_type, :secret, :type, events: [])
+  end
+
   def webhook_params 
     params.require(:webhook).permit(:active, :branch_filter, :http_method, :url, :content_type, :secret, events: [])
   end
diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index adc6e3cc..671c7fbd 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -903,6 +903,7 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff
 |is_renamed|bool|是否重命名|
 |is_ambiguous|bool||
 |is_submodule|bool|是否为子模块|
+|diff|string|git diff内容|
 |sections.file_name|string|文件名称|
 |sections.name|string||
 |sections.lines.left_index|int|文件变动之前所在行数|
diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md
index a9fa42e2..b0632509 100644
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@@ -2283,7 +2283,7 @@ await octokit.request('POST /api/v1/yystopf/ceshi/webhooks.json')
 |webhook.active       |是| | bool | 是否激活|
 |webhook.branch_filter|否| |string|分支过滤|
 |webhook.events       |否| |array|触发事件|
-
+|webhook.type         |否| gitea |string| hook类型，gitea slack discord dingtalk telegram msteams feishu matrix jianmu|
 触发事件字段说明 
 
 参数| 含义|
diff --git a/app/services/api/v1/projects/webhooks/create_service.rb b/app/services/api/v1/projects/webhooks/create_service.rb
index bef0a340..edc8b226 100644
--- a/app/services/api/v1/projects/webhooks/create_service.rb
+++ b/app/services/api/v1/projects/webhooks/create_service.rb
@@ -1,14 +1,14 @@
 class Api::V1::Projects::Webhooks::CreateService < ApplicationService
   include ActiveModel::Model
 
-  attr_reader :project, :token, :owner, :repo, :active, :branch_filter, :content_type, :url, :http_method, :secret, :events
+  attr_reader :project, :token, :owner, :repo, :active, :branch_filter, :content_type, :url, :http_method, :secret, :events, :type
   attr_accessor :gitea_data
 
   validates :url, format: { with: URI::regexp(%w[http https]), message: "请输入正确的地址" }
   validates :active, inclusion: {in: [true, false]}
   validates :http_method, inclusion: { in: %w(POST GET), message: "请输入正确的请求方式"}
   validates :content_type, inclusion: { in: %w(json form), message: "请输入正确的Content Type"} 
-
+  validates :type, inclusion: {in: %w(gitea slack discord dingtalk telegram msteams feishu matrix jianmu), message: "请输入正确的Webhook Type"}
   def initialize(project, params, token=nil)
     @project = project
     @owner = project&.owner.login 
@@ -20,6 +20,7 @@ class Api::V1::Projects::Webhooks::CreateService < ApplicationService
     @http_method = params[:http_method]
     @secret = params[:secret]
     @events = params[:events]
+    @type = params[:type] || "gitea"
     @token = token
   end
 
@@ -52,7 +53,7 @@ class Api::V1::Projects::Webhooks::CreateService < ApplicationService
         secret: secret
       },
       events: events || [],
-      type: 'gitea',
+      type: type,
     }
   end
 
diff --git a/app/views/api/v1/projects/webhooks/_simple_detail.json.jbuilder b/app/views/api/v1/projects/webhooks/_simple_detail.json.jbuilder
index 145b3e59..6926cfd3 100644
--- a/app/views/api/v1/projects/webhooks/_simple_detail.json.jbuilder
+++ b/app/views/api/v1/projects/webhooks/_simple_detail.json.jbuilder
@@ -1,3 +1,3 @@
-json.(webhook, :id, :url, :http_method, :is_active)
+json.(webhook, :id, :url, :http_method, :is_active, :type)
 json.last_status webhook.last_status
 json.create_time Time.at(webhook.created_unix).strftime("%Y-%m-%d %H:%M:%S")
\ No newline at end of file
diff --git a/app/views/api/v1/projects/webhooks/_simple_gitea_detail.json.jbuilder b/app/views/api/v1/projects/webhooks/_simple_gitea_detail.json.jbuilder
index ca180d8b..96c9eac1 100644
--- a/app/views/api/v1/projects/webhooks/_simple_gitea_detail.json.jbuilder
+++ b/app/views/api/v1/projects/webhooks/_simple_gitea_detail.json.jbuilder
@@ -1,4 +1,5 @@
 json.id webhook["id"]
+json.type webhook["type"]
 json.content_type webhook['config']['content_type']
 json.http_method webhook['config']['http_method']
 json.url webhook['config']['url']
diff --git a/public/docs/api.html b/public/docs/api.html
index bcc4da5c..a9909eb9 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -11364,6 +11364,13 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks.json
 <td>array</td>
 <td>触发事件</td>
 </tr>
+<tr>
+<td>webhook.type</td>
+<td>否</td>
+<td>gitea</td>
+<td>string</td>
+<td>hook类型，gitea slack discord dingtalk telegram msteams feishu matrix jianmu</td>
+</tr>
 </tbody></table>
 
 <p>触发事件字段说明 </p>
@@ -14032,6 +14039,11 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
 <td>是否为子模块</td>
 </tr>
 <tr>
+<td>diff</td>
+<td>string</td>
+<td>git diff内容</td>
+</tr>
+<tr>
 <td>sections.file_name</td>
 <td>string</td>
 <td>文件名称</td>

From 96d34d0237f20b38293fba47aef551974d32a1e9 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 3 Aug 2022 15:31:04 +0800
Subject: [PATCH 151/208] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=AE=A1=E6=9F=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/projects/pulls/reviews_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/projects/pulls/reviews_controller.rb b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
index 039a6c4d..11df824e 100644
--- a/app/controllers/api/v1/projects/pulls/reviews_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
@@ -13,7 +13,7 @@ class Api::V1::Projects::Pulls::ReviewsController < Api::V1::Projects::Pulls::Ba
 
   private 
   def require_reviewer
-    return render_forbidden('您没有审查权限，请联系项目管理员') if !current_user.admin? && !@pull_request.reviewers.exists?(current_user.id)
+    return render_forbidden('您没有审查权限，请联系项目管理员') if !current_user.admin? && !@pull_request.reviewers.exists?(current_user.id) && !@project.manager?(current_user)
   end
 
   def review_params 

From 024bc289defc5ba36d311cca07620ef491574561 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 3 Aug 2022 17:13:45 +0800
Subject: [PATCH 152/208] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=20=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E8=AF=84=E8=AE=BA=E5=BF=85=E9=80=89?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BB=A5=E5=8F=8A=E5=AE=A1=E6=9F=A5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8E=BB=E6=8E=89=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/pulls/reviews_controller.rb          | 3 ++-
 app/docs/slate/source/includes/_pulls.md                 | 3 ++-
 .../api/v1/projects/pulls/journals/create_service.rb     | 2 +-
 .../api/v1/projects/pulls/reviews/index.json.jbuilder    | 3 ++-
 public/docs/api.html                                     | 9 ++++++++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/projects/pulls/reviews_controller.rb b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
index 11df824e..622296c6 100644
--- a/app/controllers/api/v1/projects/pulls/reviews_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/reviews_controller.rb
@@ -2,7 +2,8 @@ class Api::V1::Projects::Pulls::ReviewsController < Api::V1::Projects::Pulls::Ba
 
   def index 
     @reviews = @pull_request.reviews 
-    @reviews = kaminari_paginate(@reviews)
+    @reviews = @reviews.where(status: params[:status]) if params[:status].present?
+    # @reviews = kaminari_paginate(@reviews)
   end
 
   before_action :require_reviewer, only: [:create]
diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index 671c7fbd..9733f958 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -1029,6 +1029,7 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/reviews.json')
 |owner            |是|          |string |用户登录名  |
 |repo             |是|          |string |项目标识identifier  |
 |index            |是|          | int   |合并请求序号|
+|status           |否|          |string |审查类型， common: 评论类型, approved: 已通过, rejected: 已拒绝|
 
 ### 返回字段说明:
 参数  | 类型 | 字段说明
@@ -1373,7 +1374,7 @@ await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/journals.json')
 |index              |是| | integer|合并请求序号|
 |type               |是| | string |评论类型 comment: 普通, problem: 需要回应的评论|
 |note               |否| | string |评论内容|
-|review_id          |是| | string |审查ID|
+|review_id          |否| | string |审查ID|
 |line_code          |否| | string |行号|
 |commit_id          |否| | bool   |commitID|
 |path               |否| | integer|文件路径|
diff --git a/app/services/api/v1/projects/pulls/journals/create_service.rb b/app/services/api/v1/projects/pulls/journals/create_service.rb
index 45b5ec03..7b0401c9 100644
--- a/app/services/api/v1/projects/pulls/journals/create_service.rb
+++ b/app/services/api/v1/projects/pulls/journals/create_service.rb
@@ -23,7 +23,7 @@ class Api::V1::Projects::Pulls::Journals::CreateService < ApplicationService
 
   def call 
     raise Error, errors.full_messages.join(", ") unless valid?
-    check_review_is_exists
+    check_review_is_exists if review_id.present?
     if type == 'problem'
       create_problem_journal
     else
diff --git a/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder b/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder
index 04792d5c..567df1b7 100644
--- a/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder
+++ b/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder
@@ -1,4 +1,5 @@
-json.total_count @reviews.total_count
+# json.total_count @reviews.total_count
+json.total_count @reviews.count
 json.reviews @reviews.each do |review|
   json.partial! 'api/v1/projects/pulls/reviews/simple_detail', review: review
 end
\ No newline at end of file
diff --git a/public/docs/api.html b/public/docs/api.html
index a9909eb9..943f8c36 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -14254,6 +14254,13 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
 <td>int</td>
 <td>合并请求序号</td>
 </tr>
+<tr>
+<td>status</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>审查类型， common: 评论类型, approved: 已通过, rejected: 已拒绝</td>
+</tr>
 </tbody></table>
 <h3 id='7447e4874e-7'>返回字段说明:</h3>
 <table><thead>
@@ -15000,7 +15007,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals.json
 </tr>
 <tr>
 <td>review_id</td>
-<td>是</td>
+<td>否</td>
 <td></td>
 <td>string</td>
 <td>审查ID</td>

From a9811768d42718c5c614623314471a9e98a4a0b7 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 4 Aug 2022 15:46:19 +0800
Subject: [PATCH 153/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E8=AF=84=E8=AE=BA=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/docs/slate/source/includes/_pulls.md                      | 2 +-
 app/services/api/v1/projects/pulls/journals/create_service.rb | 2 +-
 public/docs/api.html                                          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index 9733f958..ecc9c285 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -1372,7 +1372,7 @@ await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/journals.json')
 |owner              |是| | string |用户登录名  |
 |repo               |是| | string |项目标识identifier  |
 |index              |是| | integer|合并请求序号|
-|type               |是| | string |评论类型 comment: 普通, problem: 需要回应的评论|
+|type               |否|comment| string |评论类型 comment: 普通, problem: 需要回应的评论|
 |note               |否| | string |评论内容|
 |review_id          |否| | string |审查ID|
 |line_code          |否| | string |行号|
diff --git a/app/services/api/v1/projects/pulls/journals/create_service.rb b/app/services/api/v1/projects/pulls/journals/create_service.rb
index 7b0401c9..df207771 100644
--- a/app/services/api/v1/projects/pulls/journals/create_service.rb
+++ b/app/services/api/v1/projects/pulls/journals/create_service.rb
@@ -15,7 +15,7 @@ class Api::V1::Projects::Pulls::Journals::CreateService < ApplicationService
     @note = params[:note]
     @commit_id = params[:commit_id]
     @path = params[:path]
-    @type = params[:type]
+    @type = params[:type] || "comment"
     @diff = params[:diff]
     @review_id = params[:review_id]
     @user = user
diff --git a/public/docs/api.html b/public/docs/api.html
index 943f8c36..c2e6e427 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -14993,8 +14993,8 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals.json
 </tr>
 <tr>
 <td>type</td>
-<td>是</td>
-<td></td>
+<td>否</td>
+<td>comment</td>
 <td>string</td>
 <td>评论类型 comment: 普通, problem: 需要回应的评论</td>
 </tr>

From f8268accc00f25a402b76cd7a1af7e715760e68a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 4 Aug 2022 17:28:14 +0800
Subject: [PATCH 154/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=20=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E4=B8=8B=E9=A1=B9=E7=9B=AE=E5=8D=8F=E4=BD=9C=E8=80=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/members_controller.rb |  5 ++++
 app/views/members/index.json.jbuilder | 34 ++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 92ad4ccb..b4d8e1f9 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -26,6 +26,9 @@ class MembersController < ApplicationController
 
     @total_count = scope.size
     @members = paginate(scope)
+    if @project.owner.is_a?(Organization) && (params[:page].to_i == 1 || params[:page].blank?)
+      @current_user_header_team = Team.joins(:team_users, :team_projects).where(team_projects: {project_id: @project.id}, team_users: {user_id: current_user.id}).order(authorize: :desc).take
+    end
   end
 
   def remove
@@ -65,6 +68,8 @@ class MembersController < ApplicationController
   end
 
   def check_member_not_exists!
+    @current_user_header_team = Team.joins(:team_users, :team_projects).where(team_projects: {project_id: @project.id}, team_users: {user_id: current_user.id}).order(authorize: :desc).take
+    return render_error("用户为组织成员，请到组织下操作！") if @current_user_header_team.present? 
     return render_error("user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists?
   end
 
diff --git a/app/views/members/index.json.jbuilder b/app/views/members/index.json.jbuilder
index 457c5027..ba08d021 100644
--- a/app/views/members/index.json.jbuilder
+++ b/app/views/members/index.json.jbuilder
@@ -1,9 +1,31 @@
 json.total_count @total_count
-json.members @members do |member|
-  if member.user.present?
-    json.partial! 'member', user: member.user
-    json.is_owner @project.owner?(member.user)
-    json.role member.roles.last.name
-    json.role_name t("roles.#{member.roles.last.name}")
+json.members do 
+  if @current_user_header_team.present?
+    json.child! do
+      json.partial! 'member', user: current_user
+      json.is_owner @project.owner?(current_user)
+      case @current_user_header_team.authorize
+      when 'read'
+        json.role 'Reporter'
+        json.role_name t("roles.Reporter")
+      when 'write'
+        json.role 'Developer'
+        json.role_name t("roles.Developer")
+      when 'admin'
+        json.role 'Manager'
+        json.role_name t("roles.Manager")
+      when 'owner'
+        json.role 'Manager'
+        json.role_name t("roles.Manager")
+      end
+    end
+  end
+  @members.each do |member| 
+    json.child! do
+      json.partial! 'member', user: member.user
+      json.is_owner @project.owner?(member.user)
+      json.role member.roles.last.name
+      json.role_name t("roles.#{member.roles.last.name}")
+    end
   end
 end

From d20a7b13180449024a450386245b095b6f21f3a6 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 5 Aug 2022 10:50:41 +0800
Subject: [PATCH 155/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8D=8F=E4=BD=9C=E8=80=85=E6=B7=BB=E5=8A=A0=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=88=90=E5=91=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/members_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index b4d8e1f9..d7f0204c 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -64,12 +64,13 @@ class MembersController < ApplicationController
   end
 
   def check_member_exists!
-    return render_error("user_id为#{params[:user_id]}的用户已经是项目成员") if member_exists?
+    @current_user_header_team = Team.joins(:team_users, :team_projects).where(team_projects: {project_id: @project.id}, team_users: {user_id: current_user.id}).order(authorize: :desc).take
+    return render_error("user_id为#{params[:user_id]}的用户已经是项目成员") if member_exists? || (params[:user_id].to_i == current_user.id && @current_user_header_team.present?)
   end
 
   def check_member_not_exists!
     @current_user_header_team = Team.joins(:team_users, :team_projects).where(team_projects: {project_id: @project.id}, team_users: {user_id: current_user.id}).order(authorize: :desc).take
-    return render_error("用户为组织成员，请到组织下操作！") if @current_user_header_team.present? 
+    return render_error("用户为组织成员，请到组织下操作！") if (params[:user_id].to_i == current_user.id && @current_user_header_team.present?) && !member_exists?
     return render_error("user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists?
   end
 

From b8be0c23cb63655ac4c1340105c11081421985dc Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 5 Aug 2022 11:05:29 +0800
Subject: [PATCH 156/208] =?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/controllers/members_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index d7f0204c..5c8ed963 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -26,7 +26,7 @@ class MembersController < ApplicationController
 
     @total_count = scope.size
     @members = paginate(scope)
-    if @project.owner.is_a?(Organization) && (params[:page].to_i == 1 || params[:page].blank?)
+    if @project.owner.is_a?(Organization) && (params[:page].to_i == 1 || params[:page].blank?) && !@project.members.exists?(user_id: current_user.id)
       @current_user_header_team = Team.joins(:team_users, :team_projects).where(team_projects: {project_id: @project.id}, team_users: {user_id: current_user.id}).order(authorize: :desc).take
     end
   end

From 4b05838498b361717e020f5a11d22ab90eda6416 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 9 Aug 2022 09:48:02 +0800
Subject: [PATCH 157/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E8=AF=84=E8=AE=BA=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?path=E5=8F=82=E6=95=B0=E7=AD=9B=E9=80=89=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=86=E9=A1=B5=E6=9C=80=E5=A4=9A=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E200=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/pulls/journals_controller.rb           | 2 +-
 app/docs/slate/source/includes/_pulls.md                   | 1 +
 .../api/v1/projects/pulls/journals/list_service.rb         | 4 +++-
 .../api/v1/projects/pulls/journals/index.json.jbuilder     | 2 +-
 public/docs/api.html                                       | 7 +++++++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/projects/pulls/journals_controller.rb b/app/controllers/api/v1/projects/pulls/journals_controller.rb
index d3247497..4f46a916 100644
--- a/app/controllers/api/v1/projects/pulls/journals_controller.rb
+++ b/app/controllers/api/v1/projects/pulls/journals_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::Projects::Pulls::JournalsController < Api::V1::Projects::Pulls::B
 
   def index
     @journals = Api::V1::Projects::Pulls::Journals::ListService.call(@project, @pull_request, params, current_user)
-    @journals = kaminari_paginate(@journals)
+    @journals = @journals.limit(200)
   end
 
   def create 
diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index ecc9c285..85b77e18 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -1248,6 +1248,7 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/journals.json')
 |need_respond     |否|          |bool   |是否需要回应|
 |state            |否|          |string |状态, opened: 开启的, resolved: 已解决的, disabled: 无效的|
 |parent_id        |否|          |integer|父评论ID|
+|path             |否|          |string |评论文件路径|
 |sort_by          |否|created_on|string |排序字段 created_on: 创建时间, updated_on: 更新时间|
 |sort_direction   |否|asc       |string |排序类型 desc: 倒序, asc: 正序|
 
diff --git a/app/services/api/v1/projects/pulls/journals/list_service.rb b/app/services/api/v1/projects/pulls/journals/list_service.rb
index 30b650f0..010fb365 100644
--- a/app/services/api/v1/projects/pulls/journals/list_service.rb
+++ b/app/services/api/v1/projects/pulls/journals/list_service.rb
@@ -1,7 +1,7 @@
 class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
   include ActiveModel::Model
   
-  attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :parent_id, :sort_by, :sort_direction, :user
+  attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :parent_id, :path, :sort_by, :sort_direction, :user
   attr_accessor :queried_journals
 
   validates :sort_by, inclusion: {in: Journal.column_names, message: '请输入正确的SortBy'}
@@ -19,6 +19,7 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
     @parent_id = params[:parent_id]
     @sort_by = params[:sort_by] || 'created_on'
     @sort_direction = params[:sort_direction] || 'asc'
+    @path = params[:path]
     @user = user
   end
 
@@ -41,6 +42,7 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
     journals = journals.where(review_id: review_id) if review_id.present?
     journals = journals.where(need_respond: need_respond) if need_respond.present?
     journals = journals.where(state: state) if state.present?
+    journals = journals.where(path: path) if path.present?
 
     q = journals.ransack(notes_cont: keyword)
     scope = q.result.includes(:user, :resolveer, review: [:reviewer, pull_request: :issue])
diff --git a/app/views/api/v1/projects/pulls/journals/index.json.jbuilder b/app/views/api/v1/projects/pulls/journals/index.json.jbuilder
index e71eb5f7..1cb9a4eb 100644
--- a/app/views/api/v1/projects/pulls/journals/index.json.jbuilder
+++ b/app/views/api/v1/projects/pulls/journals/index.json.jbuilder
@@ -1,4 +1,4 @@
-json.total_count @journals.total_count 
+json.total_count @journals.count 
 json.journals @journals.each do |journal|
   json.partial! 'api/v1/projects/pulls/journals/simple_detail', journal: journal
 end
\ No newline at end of file
diff --git a/public/docs/api.html b/public/docs/api.html
index c2e6e427..9689aabe 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -14769,6 +14769,13 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
 <td>父评论ID</td>
 </tr>
 <tr>
+<td>path</td>
+<td>否</td>
+<td></td>
+<td>string</td>
+<td>评论文件路径</td>
+</tr>
+<tr>
 <td>sort_by</td>
 <td>否</td>
 <td>created_on</td>

From 8ec3e4bbaa7ed39a59af125afdc45c95005d6bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 10 Aug 2022 16:06:11 +0800
Subject: [PATCH 158/208] =?UTF-8?q?fixed=20Gitea::PullRequest::FilesServic?=
 =?UTF-8?q?e=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/gitea/pull_request/files_service.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/services/gitea/pull_request/files_service.rb b/app/services/gitea/pull_request/files_service.rb
index a8cb2662..f7a2bd75 100644
--- a/app/services/gitea/pull_request/files_service.rb
+++ b/app/services/gitea/pull_request/files_service.rb
@@ -1,6 +1,6 @@
 # List pull requests files
 class Gitea::PullRequest::FilesService < Gitea::ClientService
-  attr_reader :owner, :repo, :pull_number, :token
+  attr_reader :owner, :repo, :pull_number, :token, :params
 
   # GET /repos/{owner}/{repo}/pulls/{pull_number}/files
   # owner: 用户
@@ -8,22 +8,23 @@ class Gitea::PullRequest::FilesService < Gitea::ClientService
   # pull_number: pull request主键id
   # eg:
   # Gitea::PullRequest::FilesService.call('jasder', 'repo_identifier', 1)
-  def initialize(owner, repo, pull_number, token=nil)
+  def initialize(owner, repo, pull_number, token=nil, params={})
     @owner  = owner
     @repo   = repo
     @token  = token
     @pull_number = pull_number
+    @params = params
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params.merge(token: token))
     render_result(response)
   end
 
   private
-  def params
-    Hash.new.merge(token: token)
-  end
+  # def params
+  #   Hash.new.merge(token: token)
+  # end
   
   def url
     "/repos/#{owner}/#{repo}/pulls/#{pull_number}/files".freeze

From 32db15aad585d6d7005e6ba35e71d1cbb3f2fc0b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 11 Aug 2022 09:29:12 +0800
Subject: [PATCH 159/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20commit=E6=89=BE?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E8=BF=94=E5=9B=9E404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index fdec82b6..32bb1f0e 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -137,6 +137,7 @@ class RepositoriesController < ApplicationController
     else
       @commit      = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
       @commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token, {diff: true})
+      render_error(@commit[:message], @commit[:status]) if @commit.has_key?(:status) || @commit_diff.has_key?(:status)
     end
   end
 

From 48846a7e31810a6d9cb631701c7902023358965d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 10 Aug 2022 16:07:20 +0800
Subject: [PATCH 160/208] =?UTF-8?q?fixed=20=E5=B7=B2=E8=AF=BB=E6=9C=AA?=
 =?UTF-8?q?=E8=AF=BB=E6=A0=87=E8=AE=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/mark_files_controller.rb | 41 ++++++++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/controllers/mark_files_controller.rb b/app/controllers/mark_files_controller.rb
index 88856c35..a7ec304f 100644
--- a/app/controllers/mark_files_controller.rb
+++ b/app/controllers/mark_files_controller.rb
@@ -4,17 +4,44 @@ class MarkFilesController < ApplicationController
   before_action :load_pull_request
 
   def index
-    @files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gitea_number, current_user&.gitea_token)
-
-    MarkFile.bulk_insert(*%i[pull_request_id, file_path_sha file_path created_at updated_at]) do |worker|
-      @files_result['Files'].echo do |file|
-        worker.add(pull_request_id: @pull_request.id, file_path_sha: SecureRandom.uuid.gsub("-", ""), file_path: file['Name'])
-      end
-    end
+    @files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gitea_number, current_user&.gitea_token, { "only-file-name": true })
     @mark_files = MarkFile.where(pull_request_id: @pull_request.id)
   end
 
   def create
+    # unless @pull_request.mark_files.present?
+    #   MarkFile.bulk_insert(*%i[pull_request_id, file_path_sha file_path created_at updated_at]) do |worker|
+    #     @files_result['Files'].each do |file|
+    #       worker.add(pull_request_id: @pull_request.id, file_path_sha: SecureRandom.uuid.gsub("-", ""), file_path: file['Name'])
+    #     end
+    #   end
+    # end
+  end
+
+  def mark_file_as_unread
+    tip_exception "参数错误" if params[:file_path_sha].blank?
+    file_path = Base64.strict_decode64(params[:file_path_sha].to_s)
+    mark_file = @pull_request.mark_files.find_or_initialize_by(file_path_sha: params[:file_path_sha])
+    mark_file.file_path = file_path
+    mark_file.user_id = current_user.id
+    mark_file.mark_as_read = false
+    mark_file.save
+    render_ok
+  rescue Exception => e
+    tip_exception "参数解析错误"
+  end
+
+  def mark_file_as_read
+    tip_exception "参数错误" if params[:file_path_sha].blank?
+    file_path = Base64.strict_decode64(params[:file_path_sha].to_s)
+    mark_file = @pull_request.mark_files.find_or_initialize_by(file_path_sha: params[:file_path_sha])
+    mark_file.file_path = file_path
+    mark_file.user_id = current_user.id
+    mark_file.mark_as_read = true
+    mark_file.save
+    render_ok
+  rescue Exception => e
+    tip_exception "参数解析错误"
   end
 
   private 

From 7e48e5e8b80b94d652833a19297333655532abd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 10 Aug 2022 16:54:00 +0800
Subject: [PATCH 161/208] =?UTF-8?q?fixed=20=E6=B6=88=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/admins/message_templates_controller.rb b/app/controllers/admins/message_templates_controller.rb
index af77858e..dbe63a66 100644
--- a/app/controllers/admins/message_templates_controller.rb
+++ b/app/controllers/admins/message_templates_controller.rb
@@ -11,7 +11,7 @@ class Admins::MessageTemplatesController < Admins::BaseController
   end
 
   def create 
-    @message_template = MessageTemplate::CustomTip.new(ignore_params)
+    @message_template = MessageTemplate::CustomTip.new(message_template_params)
 
     if @message_template.save!
       redirect_to admins_message_templates_path 

From 964bef789654962b835beeb5fd46597ab1dffdec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 10 Aug 2022 17:20:29 +0800
Subject: [PATCH 162/208] =?UTF-8?q?fixed=20=E6=B6=88=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=85=8D=E7=BD=AEtype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/message_templates_controller.rb | 5 +++--
 app/models/message_template.rb                         | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admins/message_templates_controller.rb b/app/controllers/admins/message_templates_controller.rb
index dbe63a66..79a4bbc8 100644
--- a/app/controllers/admins/message_templates_controller.rb
+++ b/app/controllers/admins/message_templates_controller.rb
@@ -10,7 +10,7 @@ class Admins::MessageTemplatesController < Admins::BaseController
     @message_template = MessageTemplate::CustomTip.new
   end
 
-  def create 
+  def create
     @message_template = MessageTemplate::CustomTip.new(message_template_params)
 
     if @message_template.save!
@@ -47,7 +47,8 @@ class Admins::MessageTemplatesController < Admins::BaseController
 
   private 
   def message_template_params
-    params.require(@message_template.type.split("::").join("_").underscore.to_sym).permit!
+    type = @message_template.present? ? @message_template.type : "MessageTemplate::CustomTip"
+    params.require(type.split("::").join("_").underscore.to_sym).permit!
   end
 
   def get_template
diff --git a/app/models/message_template.rb b/app/models/message_template.rb
index 50de7d8e..ec761ddc 100644
--- a/app/models/message_template.rb
+++ b/app/models/message_template.rb
@@ -13,6 +13,7 @@
 #
 
 class MessageTemplate < ApplicationRecord
+  self.inheritance_column = nil
   PLATFORM = 'GitLink'
 
   def self.build_init_data

From ad8fed944037360539367470536902698404ea69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 10 Aug 2022 17:23:27 +0800
Subject: [PATCH 163/208] =?UTF-8?q?fixed=20=E6=B6=88=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=85=8D=E7=BD=AEtype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/message_template.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/message_template.rb b/app/models/message_template.rb
index ec761ddc..bc6c5a71 100644
--- a/app/models/message_template.rb
+++ b/app/models/message_template.rb
@@ -114,6 +114,6 @@ class MessageTemplate < ApplicationRecord
   end
 
   def simple_type 
-    self.type.split("::")[-1]
+    self.type.to_s.split("::")[-1]
   end
 end

From 5c4930a362a2d5b89b8503e66fb41a7674ecbdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 10 Aug 2022 17:25:55 +0800
Subject: [PATCH 164/208] =?UTF-8?q?fixed=20=E6=B6=88=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=85=8D=E7=BD=AEtype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/admins/message_templates_controller.rb b/app/controllers/admins/message_templates_controller.rb
index 79a4bbc8..291a1b3f 100644
--- a/app/controllers/admins/message_templates_controller.rb
+++ b/app/controllers/admins/message_templates_controller.rb
@@ -12,7 +12,7 @@ class Admins::MessageTemplatesController < Admins::BaseController
 
   def create
     @message_template = MessageTemplate::CustomTip.new(message_template_params)
-
+    @message_template.type = "MessageTemplate::CustomTip"
     if @message_template.save!
       redirect_to admins_message_templates_path 
       flash[:success] = "创建消息模板成功"

From 716b29c25fa35df9046abf41cbf3c06c5c57f0fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 10 Aug 2022 17:43:27 +0800
Subject: [PATCH 165/208] =?UTF-8?q?fixed=20=E6=B6=88=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=85=8D=E7=BD=AEtype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/message_templates_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admins/message_templates_controller.rb b/app/controllers/admins/message_templates_controller.rb
index 291a1b3f..87a3ccfe 100644
--- a/app/controllers/admins/message_templates_controller.rb
+++ b/app/controllers/admins/message_templates_controller.rb
@@ -7,7 +7,7 @@ class Admins::MessageTemplatesController < Admins::BaseController
   end
 
   def new 
-    @message_template = MessageTemplate::CustomTip.new
+    @message_template = MessageTemplate.new
   end
 
   def create
@@ -47,8 +47,9 @@ class Admins::MessageTemplatesController < Admins::BaseController
 
   private 
   def message_template_params
-    type = @message_template.present? ? @message_template.type : "MessageTemplate::CustomTip"
-    params.require(type.split("::").join("_").underscore.to_sym).permit!
+    # type = @message_template.present? ? @message_template.type : "MessageTemplate::CustomTip"
+    # params.require(type.split("::").join("_").underscore.to_sym).permit!
+    params.require(:message_template).permit!
   end
 
   def get_template

From 6ec7a1329316dc0072aab898c4d42b333a3e1624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Thu, 11 Aug 2022 09:31:40 +0800
Subject: [PATCH 166/208] =?UTF-8?q?fixed=20reposyncer=20=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=B7=B2=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ob_repository_syncs_controller.rb         | 27 ++++++++++++++-----
 .../ob_repository_sync/api_service.rb         | 14 +++++-----
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb
index 10732093..ebae8e42 100644
--- a/app/controllers/ob_repository_syncs_controller.rb
+++ b/app/controllers/ob_repository_syncs_controller.rb
@@ -13,7 +13,8 @@ class ObRepositorySyncsController < ApplicationController
     tip_exception "参数错误" if params[:github_address].blank? && params[:gitee_address].blank?
     project_name ="#{@project.owner.name}:#{@project.identifier}"
     service = ObRepositorySync::ApiService.new(project_name)
-    project_params = params.merge({ "gitlink_address": @project.repository.url })
+    domain  = GiteaService.gitea_config[:domain]
+    project_params = params.merge({ "gitlink_address": "#{domain}/#{@project.owner&.login}/#{@project.identifier}.git" })
     res = service.create_projects(project_params)
     tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
     sync_id = res["data"]["id"]
@@ -23,7 +24,6 @@ class ObRepositorySyncsController < ApplicationController
     ob_repository_sync.name = project_name
     ob_repository_sync.github_address = "#{params[:github_address]}"
     ob_repository_sync.gitee_address = "#{params[:gitee_address]}"
-    ob_repository_sync.gitlink_address = @project.repository.url
     ob_repository_sync.github_token = "#{params[:github_token]}"
     ob_repository_sync.gitee_token = "#{params[:gitee_token]}"
     ob_repository_sync.sync_id = sync_id
@@ -38,16 +38,30 @@ class ObRepositorySyncsController < ApplicationController
     if res["code"].to_s == "200"
       @ob_repository_sync.destroy!
     end
+    render_ok
   end
 
   def jobs
     tip_exception "该项目未创建同步任务" if @ob_repository_sync.blank?
     service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
     res = service.get_projects_jobs
-    render_ok(count: res["data"]["total"], data: res["data"]["list"])
+    data = res["data"]["list"]
+    if params[:type] && params[:type].to_s.downcase == "github"
+      data = data.select { |row| row["github_branch"].present? }
+    elsif params[:type] && params[:type].to_s.downcase == "gitee"
+      data = data.select { |row| row["gitee_branch"].present? }
+    end
+    render_ok(count: res["data"]["total"], data: data)
   end
 
   def create_jobs
+    tip_exception "必须配置一个分支" if params[:github_branch].blank? && params[:gitee_branch].blank? && params[:gitlink_branch].blank?
+    ob_jobs = ObRepositorySyncJob.where(ob_repository_sync_id: @ob_repository_sync.id)
+    ob_jobs = ob_jobs.where(job_type: params[:job_type]) if params[:job_type].present?
+    ob_jobs = ob_jobs.where(github_branch: params[:github_branch]) if params[:github_branch].present?
+    ob_jobs = ob_jobs.where(gitee_branch: params[:gitee_branch]) if params[:gitee_branch].present?
+    ob_jobs = ob_jobs.where(gitlink_branch: params[:gitlink_branch]) if params[:gitlink_branch].present?
+    tip_exception "该分支组合已配置，不能重复！" if ob_jobs.count > 0
     service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
     res = service.create_projects_jobs(params)
     tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
@@ -57,7 +71,7 @@ class ObRepositorySyncsController < ApplicationController
     job.github_branch = "#{params[:github_branch]}"
     job.gitee_branch = "#{params[:gitee_branch]}"
     job.gitlink_branch = "#{params[:gitlink_branch]}"
-    job.job_type = "#{params[:type]}"
+    job.job_type = "#{params[:job_type]}"
     job.base = "#{params[:base]}"
     job.job_id = job_id
     job.save
@@ -70,7 +84,8 @@ class ObRepositorySyncsController < ApplicationController
     service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
     res = service.delete_job params[:job_id]
     tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
-    @ob_repository_sync.destroy!
+    job = ObRepositorySyncJob.find_by(ob_repository_sync_id: @ob_repository_sync.id, job_id: params[:job_id])
+    job.destroy! if job.present?
     render_ok
   end
 
@@ -94,7 +109,7 @@ class ObRepositorySyncsController < ApplicationController
     tip_exception "该项目未创建同步任务" if @ob_repository_sync.blank?
     tip_exception "缺少参数job_id" if params[:job_id].blank?
     service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
-    @data = service.job_logs params[:job_id]
+    res = service.job_logs params[:job_id]
     tip_exception "请求错误: #{res["msg"]}" if res["code"].to_s != "200"
     render_ok(count: res["data"]["total"], data: res["data"]["list"])
   end
diff --git a/app/services/ob_repository_sync/api_service.rb b/app/services/ob_repository_sync/api_service.rb
index 7bed888e..5ecd48af 100644
--- a/app/services/ob_repository_sync/api_service.rb
+++ b/app/services/ob_repository_sync/api_service.rb
@@ -15,7 +15,9 @@ class ObRepositorySync::ApiService < ApplicationService
       "github_address": "#{params[:github_address]}",
       "gitee_address": "#{params[:gitee_address]}",
       "github_token": "#{params[:github_token]}",
-      "gitee_token": "#{params[:gitee_token]}"
+      "gitee_token": "#{params[:gitee_token]}",
+      "gitlink_address": "#{params[:gitlink_address]}",
+      "gitlink_token": "#{params[:gitlink_token]}"
     }
     url = URI("#{domain}/cerobot/projects")
     http = Net::HTTP.new(url.host, url.port)
@@ -41,7 +43,7 @@ class ObRepositorySync::ApiService < ApplicationService
   end
 
   def get_projects_jobs
-    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs")
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs?pageSize=100&pageNum=1")
     http = Net::HTTP.new(url.host, url.port)
     request = Net::HTTP::Get.new(url)
     request["Content-Type"] = "application/json"
@@ -56,7 +58,7 @@ class ObRepositorySync::ApiService < ApplicationService
       "github_branch": "#{params[:github_branch]}",
       "gitee_branch": "#{params[:gitee_branch]}",
       "gitlink_branch": "#{params[:gitlink_branch]}",
-      "type": "#{params[:type]}",
+      "type": "#{params[:job_type]}",
       "base": "#{params[:base]}"
     }
     url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs")
@@ -122,11 +124,7 @@ class ObRepositorySync::ApiService < ApplicationService
     response = http.request(request)
     Rails.logger.info "set_commit job response.read_body======#{response.read_body}"
     res = JSON.parse(response.body)
-    if res["code"].to_s == "200"
-      res["data"]
-    else
-      []
-    end
+    res
   end
 
   def pull_requests

From 13472b23111774f3f3ea00acd782b21fdb2cb1a6 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 11 Aug 2022 15:21:11 +0800
Subject: [PATCH 167/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E8=AF=84=E8=AE=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?is=5Ffull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/docs/slate/source/includes/_pulls.md         |  1 +
 app/models/journal.rb                            |  1 +
 .../v1/projects/pulls/journals/list_service.rb   | 16 ++++++++++------
 public/docs/api.html                             |  7 +++++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md
index 85b77e18..ac5714db 100644
--- a/app/docs/slate/source/includes/_pulls.md
+++ b/app/docs/slate/source/includes/_pulls.md
@@ -1249,6 +1249,7 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/journals.json')
 |state            |否|          |string |状态, opened: 开启的, resolved: 已解决的, disabled: 无效的|
 |parent_id        |否|          |integer|父评论ID|
 |path             |否|          |string |评论文件路径|
+|is_full          |否|          |bool   |是否展示全部评论（包括回复）|
 |sort_by          |否|created_on|string |排序字段 created_on: 创建时间, updated_on: 更新时间|
 |sort_direction   |否|asc       |string |排序类型 desc: 倒序, asc: 正序|
 
diff --git a/app/models/journal.rb b/app/models/journal.rb
index e0dbf36d..20297dd9 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -42,6 +42,7 @@ class Journal < ApplicationRecord
   belongs_to :resolveer, class_name: 'User', foreign_key: :resolveer_id, optional: true
   has_many :journal_details, :dependent => :delete_all
   has_many :attachments, as: :container, dependent: :destroy
+  has_many :children_journals, class_name: 'Journal', foreign_key: :parent_id
 
   scope :journal_includes, ->{includes(:user, :journal_details, :attachments)}
   scope :parent_journals, ->{where(parent_id: nil)}
diff --git a/app/services/api/v1/projects/pulls/journals/list_service.rb b/app/services/api/v1/projects/pulls/journals/list_service.rb
index 010fb365..b7a79c98 100644
--- a/app/services/api/v1/projects/pulls/journals/list_service.rb
+++ b/app/services/api/v1/projects/pulls/journals/list_service.rb
@@ -1,12 +1,13 @@
 class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
   include ActiveModel::Model
   
-  attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :parent_id, :path, :sort_by, :sort_direction, :user
+  attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :parent_id, :path, :is_full, :sort_by, :sort_direction, :user
   attr_accessor :queried_journals
 
   validates :sort_by, inclusion: {in: Journal.column_names, message: '请输入正确的SortBy'}
   validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}
   validates :need_respond, inclusion: {in: [true, false], message: '请输入正确的NeedRespond'}, allow_nil: true 
+  validates :is_full, inclusion: {in: [true, false], message: '请输入正确的IsFull'}
   validates :state, inclusion: {in: %w(opened resolved disabled)}, allow_nil: true 
 
   def initialize(project, pull_request, params, user)
@@ -19,6 +20,7 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
     @parent_id = params[:parent_id]
     @sort_by = params[:sort_by] || 'created_on'
     @sort_direction = params[:sort_direction] || 'asc'
+    @is_full = ActiveModel::Type::Boolean.new.cast(params[:is_full]) || false
     @path = params[:path]
     @user = user
   end
@@ -33,10 +35,12 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
   private
   def journal_query_data
     journals = @pull_request.journals
-    if parent_id.present?
-      journals = journals.where(parent_id: parent_id)
-    else
-      journals = journals.parent_journals
+    if !is_full 
+      if parent_id.present? 
+        journals = journals.where(parent_id: parent_id)
+      else
+        journals = journals.parent_journals
+      end
     end
 
     journals = journals.where(review_id: review_id) if review_id.present?
@@ -45,7 +49,7 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService
     journals = journals.where(path: path) if path.present?
 
     q = journals.ransack(notes_cont: keyword)
-    scope = q.result.includes(:user, :resolveer, review: [:reviewer, pull_request: :issue])
+    scope = q.result.includes(:user, :resolveer, :children_journals, review: [:reviewer, pull_request: :issue])
     scope = scope.order("journals.#{sort_by} #{sort_direction}")
 
     @queried_journals = scope
diff --git a/public/docs/api.html b/public/docs/api.html
index 9689aabe..c43f7c40 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -14776,6 +14776,13 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
 <td>评论文件路径</td>
 </tr>
 <tr>
+<td>is_full</td>
+<td>否</td>
+<td></td>
+<td>bool</td>
+<td>是否展示全部评论（包括回复）</td>
+</tr>
+<tr>
 <td>sort_by</td>
 <td>否</td>
 <td>created_on</td>

From 3e352d3c7c51b63f72a276a8047fe4e0cc8c5c4a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 12 Aug 2022 17:23:19 +0800
Subject: [PATCH 168/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BB=A3=E7=A0=81=E6=BA=AF=E6=BA=90=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/trace/system_info_service.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 app/services/trace/system_info_service.rb

diff --git a/app/services/trace/system_info_service.rb b/app/services/trace/system_info_service.rb
new file mode 100644
index 00000000..0ffbae7a
--- /dev/null
+++ b/app/services/trace/system_info_service.rb
@@ -0,0 +1,18 @@
+class Trace::SystemInfoService < Trace::ClientService 
+
+  attr_accessor :token
+
+  def initialize(token)
+    @token = token
+  end 
+
+  def call
+    result = authed_get(token, url)
+    response = render_response(result)
+  end
+
+  private 
+  def url 
+    '/user/systemInfo'.freeze
+  end
+end
\ No newline at end of file

From 467d722d25950ed48c95581efbd835551de56312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 15 Aug 2022 14:03:27 +0800
Subject: [PATCH 169/208] =?UTF-8?q?fixed=20reposyncer=20job=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ob_repository_syncs_controller.rb | 15 +++++++++------
 app/services/ob_repository_sync/api_service.rb    |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb
index ebae8e42..90f7fd6f 100644
--- a/app/controllers/ob_repository_syncs_controller.rb
+++ b/app/controllers/ob_repository_syncs_controller.rb
@@ -34,7 +34,7 @@ class ObRepositorySyncsController < ApplicationController
   def delete
     service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
     res = service.delete_project @ob_repository_sync.sync_id
-    tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
+    tip_exception "删除失败: #{res["msg"]}" if res["code"].to_s != "200"
     if res["code"].to_s == "200"
       @ob_repository_sync.destroy!
     end
@@ -43,14 +43,17 @@ class ObRepositorySyncsController < ApplicationController
 
   def jobs
     tip_exception "该项目未创建同步任务" if @ob_repository_sync.blank?
+    page = params[:page] || 1
+    limit = params[:limit] || 10
     service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
-    res = service.get_projects_jobs
-    data = res["data"]["list"]
+    source = ""
     if params[:type] && params[:type].to_s.downcase == "github"
-      data = data.select { |row| row["github_branch"].present? }
+      source = "github_branch"
     elsif params[:type] && params[:type].to_s.downcase == "gitee"
-      data = data.select { |row| row["gitee_branch"].present? }
+      source = "gitee_branch"
     end
+    res = service.get_projects_jobs(source, page, limit)
+    data = res["data"]["list"]
     render_ok(count: res["data"]["total"], data: data)
   end
 
@@ -83,7 +86,7 @@ class ObRepositorySyncsController < ApplicationController
     tip_exception "缺少参数job_id" if params[:job_id].blank?
     service = ObRepositorySync::ApiService.new(@ob_repository_sync.name)
     res = service.delete_job params[:job_id]
-    tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200"
+    tip_exception "删除失败: #{res["msg"]}" if res["code"].to_s != "200"
     job = ObRepositorySyncJob.find_by(ob_repository_sync_id: @ob_repository_sync.id, job_id: params[:job_id])
     job.destroy! if job.present?
     render_ok
diff --git a/app/services/ob_repository_sync/api_service.rb b/app/services/ob_repository_sync/api_service.rb
index 5ecd48af..293a6592 100644
--- a/app/services/ob_repository_sync/api_service.rb
+++ b/app/services/ob_repository_sync/api_service.rb
@@ -42,8 +42,8 @@ class ObRepositorySync::ApiService < ApplicationService
     res
   end
 
-  def get_projects_jobs
-    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs?pageSize=100&pageNum=1")
+  def get_projects_jobs(source, pageNum = 1, pageSize = 100)
+    url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs?pageSize=#{pageSize}&pageNum=#{pageNum}&source=#{source}")
     http = Net::HTTP.new(url.host, url.port)
     request = Net::HTTP::Get.new(url)
     request["Content-Type"] = "application/json"

From c0ee0a694ceabfb920b92f10ff0ad257cb1ba4e4 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 15 Aug 2022 15:55:33 +0800
Subject: [PATCH 170/208] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=BA=AF=E6=BA=90status=E6=94=B9=E4=B8=BAcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/traces/base_controller.rb | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 app/controllers/traces/base_controller.rb

diff --git a/app/controllers/traces/base_controller.rb b/app/controllers/traces/base_controller.rb
new file mode 100644
index 00000000..30970a5b
--- /dev/null
+++ b/app/controllers/traces/base_controller.rb
@@ -0,0 +1,26 @@
+class Traces::BaseController < ApplicationController
+
+  helper_method :observed_logged_user?, :observed_user
+  before_action :check_trace_system
+
+  def observed_user
+    @_observed_user ||= (User.find_by_login(params[:user_id]) || User.find_by_id(params[:user_id]))
+  end
+
+  def observed_logged_user?
+    observed_user.id == User.current&.id
+  end
+
+  protected
+  def check_auth 
+    return render_forbidden unless current_user.admin? || observed_logged_user?
+  end
+
+  def check_trace_system
+    code, data, error = Trace::SystemInfoService.call(current_user.trace_token)
+    return render_ok({code: 501, data: {operate_time: data['operate_time']}, message: '系统维护中'}) if data['status'] === 0
+  rescue 
+    # 这里根据需求跳转到404
+    return render_not_found
+  end
+end
\ No newline at end of file

From 68a38e75bc597a6a45aa305694c42a31ce690b2c Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 16 Aug 2022 14:07:37 +0800
Subject: [PATCH 171/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=BF=94=E5=9B=9E=E6=8E=A5=E5=8F=A3=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/messages/_message.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/messages/_message.json.jbuilder b/app/views/users/messages/_message.json.jbuilder
index 075613ce..07040dfe 100644
--- a/app/views/users/messages/_message.json.jbuilder
+++ b/app/views/users/messages/_message.json.jbuilder
@@ -6,6 +6,7 @@ json.status message["status"]
 json.content message["content"]
 json.notification_url message["notification_url"]
 json.source message["source"]
+json.created_at message["created_at"]
 json.time_ago time_from_now(message["created_at"].to_time)
 
 case message["type"]

From 98f17234113f2ddea802dd29ff8a4bc3f87ab15e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 16 Aug 2022 14:03:05 +0800
Subject: [PATCH 172/208] =?UTF-8?q?fixed=20=E5=8F=91=E8=A1=8C=E7=89=88git?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/version_release.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/version_release.rb b/app/models/version_release.rb
index 3c97420e..00119f80 100644
--- a/app/models/version_release.rb
+++ b/app/models/version_release.rb
@@ -32,7 +32,8 @@ class VersionRelease < ApplicationRecord
   has_many :attachments, as: :container, dependent: :destroy
 
   def update_sha
+    return if version_gid.blank?
     git_release = Gitea::Versions::GetService.call(user.gitea_token, repository&.owner&.login, repository&.identifier, version_gid)
-    self.update(sha: git_release["sha"])
+    self.update(sha: git_release["sha"]) if git_release.present? && git_release.is_a?(Hash)
   end
 end

From 217ab920a98f784f747e48e8e26bb78842474643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 16 Aug 2022 15:33:15 +0800
Subject: [PATCH 173/208] =?UTF-8?q?fixed=20commit=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/commit_logs_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb
index c62c1300..3be1794a 100644
--- a/app/controllers/commit_logs_controller.rb
+++ b/app/controllers/commit_logs_controller.rb
@@ -15,6 +15,7 @@ class CommitLogsController < ApplicationController
     owner = User.find_by(login: owner_name)
     project = Project.where(identifier: repository_name).where(user_id: owner&.id)&.first
     project = Project.where(identifier: repository_name).where(gpid: repository_id)&.first if project.blank?
+    project.update_column(:updated_on, Time.now) if project.present?
     params[:commits].each do |commit|
       commit_id = commit[:id]
       message = commit[:message]

From a37d7b98409f7550cd62e74fa6322a330f3f0af3 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 17 Aug 2022 15:28:58 +0800
Subject: [PATCH 174/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E9=BB=98=E8=AE=A4=E4=B8=8D=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/trace_user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trace_user.rb b/app/models/trace_user.rb
index e8964156..1d2cd0b4 100644
--- a/app/models/trace_user.rb
+++ b/app/models/trace_user.rb
@@ -32,7 +32,7 @@ class TraceUser < ApplicationRecord
     self.username = user.login 
     self.password = SecureRandom.hex
     self.unit = user.custom_department.blank? ? 'GitLink' : user.custom_department
-    self.telnumber = user.phone.blank? ? '13800000000' : user.phone
+    self.telnumber = user.phone
     self.email = user.mail 
     self.name = user.nickname.blank? ? user.login : user.nickname 
 

From 911c47df8dcb0875d6db766fe242635722e39df7 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 17 Aug 2022 18:05:15 +0800
Subject: [PATCH 175/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6blame=20=E4=B8=8A=E4=B8=AA=E7=89=88=E6=9C=AC=E7=9A=84?=
 =?UTF-8?q?=E8=A1=8C=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/api/v1/projects/blame.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/api/v1/projects/blame.json.jbuilder b/app/views/api/v1/projects/blame.json.jbuilder
index 8dfa6c8a..883eb2e7 100644
--- a/app/views/api/v1/projects/blame.json.jbuilder
+++ b/app/views/api/v1/projects/blame.json.jbuilder
@@ -16,6 +16,7 @@ json.blame_parts @result_object['blame_parts'] do |part|
     json.committed_time render_unix_time(part['commit']['committed_time'])
     json.created_time render_unix_time(part['commit']['created_time'])
   end
+  json.previous_number part['previous_number']
   json.current_number part['current_number']
   json.effect_line part['effect_line']
   json.lines part['lines']

From 4b167dacbbea113c8bdff92f09a9b5e2677db56a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 17 Aug 2022 18:39:01 +0800
Subject: [PATCH 176/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20trace=20user=20?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/trace_user.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/trace_user.rb b/app/models/trace_user.rb
index 1d2cd0b4..69198706 100644
--- a/app/models/trace_user.rb
+++ b/app/models/trace_user.rb
@@ -32,7 +32,7 @@ class TraceUser < ApplicationRecord
     self.username = user.login 
     self.password = SecureRandom.hex
     self.unit = user.custom_department.blank? ? 'GitLink' : user.custom_department
-    self.telnumber = user.phone
+    self.telnumber = user.phone || ""
     self.email = user.mail 
     self.name = user.nickname.blank? ? user.login : user.nickname 
 
@@ -41,7 +41,7 @@ class TraceUser < ApplicationRecord
 
 
   def build_token 
-    return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? 
+    return if username.blank? || password.blank? || unit.blank? || email.blank? || name.blank? 
 
     response = Trace::AddUserService.call(username, password, unit, telnumber, email, name)
     self.token = response[1]['token']
@@ -49,7 +49,7 @@ class TraceUser < ApplicationRecord
   end
 
   def refresh_token 
-    return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? 
+    return if username.blank? || password.blank? || unit.blank? || email.blank? || name.blank? 
 
     response = Trace::LoginService.call(username, password)
     self.token = response[1]['token']

From 6168256897f5120933fd55250d25de85305b4b43 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 22 Aug 2022 10:48:05 +0800
Subject: [PATCH 177/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20diff=20filepath?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/api/v1/projects/pulls/versions/get_diff_service.rb | 1 +
 1 file changed, 1 insertion(+)

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 1a4f144a..979bc33f 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
@@ -26,6 +26,7 @@ class Api::V1::Projects::Pulls::Versions::GetDiffService < ApplicationService
       access_token: token
     }
     params.merge!(filepath: filepath) if filepath.present?
+    params
   end
 
   def load_gitea_data 

From d04ed7e00820ce9925f80736652aea7ddb210d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 29 Aug 2022 10:05:56 +0800
Subject: [PATCH 178/208] =?UTF-8?q?fixed=20=E7=BB=84=E7=BB=87=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/organization_users_controller.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/organizations/organization_users_controller.rb b/app/controllers/organizations/organization_users_controller.rb
index 5f358858..b31ca1e4 100644
--- a/app/controllers/organizations/organization_users_controller.rb
+++ b/app/controllers/organizations/organization_users_controller.rb
@@ -4,12 +4,14 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
 
   def index
     @organization_users = @organization.organization_users.includes(:user)
-    search = params[:search].to_s.downcase
-    user_condition_users = User.like(search).to_sql 
-    team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
-    users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
-   
-    @organization_users = @organization_users.where(user_id: users).distinct
+    if params[:search].present?
+      search = params[:search].to_s.downcase
+      user_condition_users = User.like(search).to_sql
+      team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
+      users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
+
+      @organization_users = @organization_users.where(user_id: users).distinct
+    end
 
     @organization_users = kaminari_paginate(@organization_users)
   end

From 0f41cabe71907f9b16df185d318b3eb8b13d5527 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 30 Aug 2022 10:23:35 +0800
Subject: [PATCH 179/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=83=A8=E6=88=96=E8=80=85=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=9B=A2=E9=98=9F=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/team_projects_controller.rb | 24 ++++++++++++++++++-
 .../team_project/create_all_service.rb        | 23 ++++++++++++++++++
 .../team_project/delete_all_service.rb        | 23 ++++++++++++++++++
 config/routes.rb                              |  7 +++++-
 4 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 app/services/gitea/organization/team_project/create_all_service.rb
 create mode 100644 app/services/gitea/organization/team_project/delete_all_service.rb

diff --git a/app/controllers/organizations/team_projects_controller.rb b/app/controllers/organizations/team_projects_controller.rb
index 2badca17..bbf3264f 100644
--- a/app/controllers/organizations/team_projects_controller.rb
+++ b/app/controllers/organizations/team_projects_controller.rb
@@ -21,6 +21,17 @@ class Organizations::TeamProjectsController < Organizations::BaseController
     tip_exception(e.message)
   end
 
+  def create_all 
+    tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
+    ActiveRecord::Base.transaction do
+      @organization.projects.each do |project|
+        TeamProject.build(@organization.id, @team.id, project.id)
+      end
+      Gitea::Organization::TeamProject::CreateAllService.call(@organization.gitea_token, @team.gtid, @organization.login)
+      render_ok
+    end
+  end
+
   def destroy
     tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
     ActiveRecord::Base.transaction do
@@ -33,6 +44,17 @@ class Organizations::TeamProjectsController < Organizations::BaseController
     tip_exception(e.message)
   end
 
+  def destroy_all 
+    tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
+    ActiveRecord::Base.transaction do
+      @team.team_projects.each do |project|
+        project.destroy!
+      end
+      Gitea::Organization::TeamProject::DeleteAllService.call(@organization.gitea_token, @team.gtid, @organization.login)
+      render_ok
+    end
+  end
+
   private
   def load_organization
     @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
@@ -47,7 +69,7 @@ class Organizations::TeamProjectsController < Organizations::BaseController
   end
 
   def load_operate_project
-    @operate_project = Project.find_by(id: project_mark) || Project.find_by(identifier: project_mark)
+    @operate_project = @organization.projects.find_by(id: project_mark) || @organization.find_by(identifier: project_mark)
     tip_exception("项目不存在") if @operate_project.nil?
   end
 
diff --git a/app/services/gitea/organization/team_project/create_all_service.rb b/app/services/gitea/organization/team_project/create_all_service.rb
new file mode 100644
index 00000000..5ba6b58b
--- /dev/null
+++ b/app/services/gitea/organization/team_project/create_all_service.rb
@@ -0,0 +1,23 @@
+class Gitea::Organization::TeamProject::CreateAllService < Gitea::ClientService
+  attr_reader :token, :gtid, :org_name
+
+  def initialize(token, gtid, org_name)
+    @token = token
+    @gtid = gtid
+    @org_name = org_name
+  end
+
+  def call
+    response = put(url, request_params)
+    render_status(response)
+  end
+
+  private
+  def request_params
+    Hash.new.merge(token: token)
+  end
+
+  def url
+    "/teams/#{gtid}/repos/#{org_name}".freeze
+  end
+end
\ No newline at end of file
diff --git a/app/services/gitea/organization/team_project/delete_all_service.rb b/app/services/gitea/organization/team_project/delete_all_service.rb
new file mode 100644
index 00000000..e7b9f932
--- /dev/null
+++ b/app/services/gitea/organization/team_project/delete_all_service.rb
@@ -0,0 +1,23 @@
+class Gitea::Organization::TeamProject::DeleteAllService < Gitea::ClientService
+  attr_reader :token, :gtid, :org_name
+
+  def initialize(token, gtid, org_name)
+    @token = token
+    @gtid = gtid
+    @org_name = org_name
+  end
+
+  def call
+    response = delete(url, params)
+    render_status(response)
+  end
+
+  private
+  def params
+    Hash.new.merge(token: token)
+  end
+
+  def url
+    "/teams/#{gtid}/repos/#{org_name}".freeze
+  end
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 5f8f9f74..01cfe2b7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -135,7 +135,12 @@ Rails.application.routes.draw do
               delete :quit
             end
           end
-          resources :team_projects, only: [:index, :create, :destroy] do ;end
+          resources :team_projects, only: [:index, :create, :destroy] do 
+            collection do 
+              post :create_all 
+              delete :destroy_all
+            end
+          end
         end
         resources :projects, only: [:index] do
           collection do

From 60b3c7925d71ba4f6cb92d4167d446b54efba501 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 30 Aug 2022 10:34:37 +0800
Subject: [PATCH 180/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=83=A8=E6=88=96=E8=80=85=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=9B=A2=E9=98=9F=E9=A1=B9=E7=9B=AE[?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/docs/slate/source/includes/_teams.md |  77 ++++++++++++++++
 public/docs/api.html                     | 106 ++++++++++++++++++++++-
 2 files changed, 182 insertions(+), 1 deletion(-)

diff --git a/app/docs/slate/source/includes/_teams.md b/app/docs/slate/source/includes/_teams.md
index c50f6973..eaaf6bf6 100644
--- a/app/docs/slate/source/includes/_teams.md
+++ b/app/docs/slate/source/includes/_teams.md
@@ -1 +1,78 @@
 # Teams
+
+## 团队下新增所有的项目
+团队下新增所有的项目
+
+> 示例:
+
+```shell
+curl -X POST \
+http://localhost:3000/api/organizations/ceshi_org/teams/28/team_projects/create_all
+```
+
+```javascript
+await octokit.request('POST /api/organizations/ceshi_org/teams/28/team_projects/create_all.json')
+```
+
+### HTTP 请求
+`POST /api/organizations/:organization/teams/:id/team_projects/create_all.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|organization         |是| | string |组织标识  |
+|id                   |是| | integer|团队 ID|
+
+### 返回字段说明:
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
+
+
+## 团队下删除所有的项目
+团队下删除所有的项目
+
+> 示例:
+
+```shell
+curl -X DELETE \
+http://localhost:3000/api/organizations/ceshi_org/teams/28/team_projects/destroy_all
+```
+
+```javascript
+await octokit.request('DELETE /api/organizations/ceshi_org/teams/28/team_projects/destroy_all.json')
+```
+
+### HTTP 请求
+`DELETE /api/organizations/:organization/teams/:id/team_projects/destroy_all.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|organization         |是| | string |组织标识  |
+|id                   |是| | integer|团队 ID|
+
+### 返回字段说明:
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+  Success Data.
+</aside>
\ No newline at end of file
diff --git a/public/docs/api.html b/public/docs/api.html
index c43f7c40..b4127232 100644
--- a/public/docs/api.html
+++ b/public/docs/api.html
@@ -646,6 +646,14 @@
           </li>
           <li>
             <a href="#teams" class="toc-h1 toc-link" data-title="Teams">Teams</a>
+              <ul class="toc-list-h2">
+                  <li>
+                    <a href="#9a2bb9044d" class="toc-h2 toc-link" data-title="团队下新增所有的项目">团队下新增所有的项目</a>
+                  </li>
+                  <li>
+                    <a href="#037098e244" class="toc-h2 toc-link" data-title="团队下删除所有的项目">团队下删除所有的项目</a>
+                  </li>
+              </ul>
           </li>
           <li>
             <a href="#errors" class="toc-h1 toc-link" data-title="Errors">Errors</a>
@@ -15446,7 +15454,103 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals/200.json
 <aside class="success">
   Success Data.
 </aside>
-<h1 id='issues'>Issues</h1><h1 id='organizations'>Organizations</h1><h1 id='teams'>Teams</h1><h1 id='errors'>Errors</h1>
+<h1 id='issues'>Issues</h1><h1 id='organizations'>Organizations</h1><h1 id='teams'>Teams</h1><h2 id='9a2bb9044d'>团队下新增所有的项目</h2>
+<p>团队下新增所有的项目</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+http://localhost:3000/api/organizations/ceshi_org/teams/28/team_projects/create_all
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/organizations/ceshi_org/teams/28/team_projects/create_all.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http'>HTTP 请求</h3>
+<p><code>POST /api/organizations/:organization/teams/:id/team_projects/create_all.json</code></p>
+<h3 id='2eb6f47757'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>organization</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>组织标识</td>
+</tr>
+<tr>
+<td>id</td>
+<td>是</td>
+<td></td>
+<td>integer</td>
+<td>团队 ID</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e'>返回字段说明:</h3>
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h2 id='037098e244'>团队下删除所有的项目</h2>
+<p>团队下删除所有的项目</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> DELETE <span class="se">\</span>
+http://localhost:3000/api/organizations/ceshi_org/teams/28/team_projects/destroy_all
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">DELETE /api/organizations/ceshi_org/teams/28/team_projects/destroy_all.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-2'>HTTP 请求</h3>
+<p><code>DELETE /api/organizations/:organization/teams/:id/team_projects/destroy_all.json</code></p>
+<h3 id='2eb6f47757-2'>请求参数:</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>organization</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>组织标识</td>
+</tr>
+<tr>
+<td>id</td>
+<td>是</td>
+<td></td>
+<td>integer</td>
+<td>团队 ID</td>
+</tr>
+</tbody></table>
+<h3 id='7447e4874e-2'>返回字段说明:</h3>
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+  Success Data.
+</aside>
+<h1 id='errors'>Errors</h1>
 <aside class="notice">
 This error section is stored in a separate file in <code>includes/_errors.md</code>. Slate allows you to optionally separate out your docs into many files...just save them to the <code>includes</code> folder and add them to the top of your <code>index.md</code>'s frontmatter. Files are included in the order listed.
 </aside>

From aa50c50254ad1278462c3a2083f48303d314cf88 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 30 Aug 2022 10:40:27 +0800
Subject: [PATCH 181/208] =?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/controllers/organizations/team_projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/organizations/team_projects_controller.rb b/app/controllers/organizations/team_projects_controller.rb
index bbf3264f..7dfab8e9 100644
--- a/app/controllers/organizations/team_projects_controller.rb
+++ b/app/controllers/organizations/team_projects_controller.rb
@@ -69,7 +69,7 @@ class Organizations::TeamProjectsController < Organizations::BaseController
   end
 
   def load_operate_project
-    @operate_project = @organization.projects.find_by(id: project_mark) || @organization.find_by(identifier: project_mark)
+    @operate_project = @organization.projects.where(id: project_mark).take || @organization.projects.where(identifier: project_mark).take
     tip_exception("项目不存在") if @operate_project.nil?
   end
 

From 7148957368e7b1dfc0ce1381a677820cec66f192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 30 Aug 2022 18:10:27 +0800
Subject: [PATCH 182/208] =?UTF-8?q?nps=E7=94=A8=E6=88=B7=E8=B0=83=E7=A0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/admin.js               | 271 +++++++++---------
 .../javascripts/bootstrap/bootstrap-toggle.js | 180 ++++++++++++
 .../bootstrap/bootstrap-toggle.min.js         |   9 +
 .../bootstrap/bootstrap-toggle.min.js.map     |   1 +
 .../bootstrap/bootstrap2-toggle.js            | 180 ++++++++++++
 .../bootstrap/bootstrap2-toggle.min.js        |   9 +
 .../bootstrap/bootstrap2-toggle.min.js.map    |   1 +
 app/assets/stylesheets/admin.scss             |   1 +
 .../bootstrap/bootstrap-toggle.css            |  83 ++++++
 .../bootstrap/bootstrap-toggle.min.css        |  28 ++
 .../bootstrap/bootstrap2-toggle.css           |  85 ++++++
 .../bootstrap/bootstrap2-toggle.min.css       |  28 ++
 app/controllers/admins/nps_controller.rb      |  22 ++
 app/controllers/application_controller.rb     |  10 +-
 app/controllers/nps_controller.rb             |  28 ++
 app/helpers/admins/nps_helper.rb              |   2 +
 app/models/user_np.rb                         |  21 ++
 app/queries/admins/user_query.rb              |   3 +
 app/views/admins/nps/_user_np_list.html.erb   |  34 +++
 app/views/admins/nps/index.html.erb           |  45 +++
 app/views/admins/nps/index.js.erb             |   1 +
 app/views/admins/shared/_sidebar.html.erb     |   1 +
 app/views/admins/users/index.html.erb         |  17 +-
 app/views/users/get_user_info.json.jbuilder   |  53 ++--
 config/routes.rb                              |   4 +
 db/migrate/20220826034622_create_user_nps.rb  |  12 +
 26 files changed, 953 insertions(+), 176 deletions(-)
 create mode 100644 app/assets/javascripts/bootstrap/bootstrap-toggle.js
 create mode 100644 app/assets/javascripts/bootstrap/bootstrap-toggle.min.js
 create mode 100644 app/assets/javascripts/bootstrap/bootstrap-toggle.min.js.map
 create mode 100644 app/assets/javascripts/bootstrap/bootstrap2-toggle.js
 create mode 100644 app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js
 create mode 100644 app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js.map
 create mode 100644 app/assets/stylesheets/bootstrap/bootstrap-toggle.css
 create mode 100644 app/assets/stylesheets/bootstrap/bootstrap-toggle.min.css
 create mode 100644 app/assets/stylesheets/bootstrap/bootstrap2-toggle.css
 create mode 100644 app/assets/stylesheets/bootstrap/bootstrap2-toggle.min.css
 create mode 100644 app/controllers/admins/nps_controller.rb
 create mode 100644 app/controllers/nps_controller.rb
 create mode 100644 app/helpers/admins/nps_helper.rb
 create mode 100644 app/models/user_np.rb
 create mode 100644 app/views/admins/nps/_user_np_list.html.erb
 create mode 100644 app/views/admins/nps/index.html.erb
 create mode 100644 app/views/admins/nps/index.js.erb
 create mode 100644 db/migrate/20220826034622_create_user_nps.rb

diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index d738e5ca..9b7a96e5 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -1,136 +1,137 @@
-//= require rails-ujs
-//= require activestorage
-//= require turbolinks
-//= require jquery3
-//= require popper
-//= require bootstrap-sprockets
-//= require jquery.validate.min
-//= require additional-methods.min
-//= require bootstrap-notify
-//= require jquery.cookie.min
-//= require select2
-//= require moment.min
-//= require jquery.cxselect
-//= require bootstrap-datepicker
-//= require bootstrap-datetimepicker
-//= require bootstrap.viewer
-//= require jquery.mloading
-//= require jquery-confirm.min
-//= require common
-
-//= require echarts
-//= require codemirror/lib/codemirror
-//= require codemirror/mode/shell/shell
-//= require editormd/editormd
-//= require editormd/languages/zh-tw
-//= require dragula/dragula
-
-//= require_tree ./i18n
-//= require_tree ./admins
-
-
-$.ajaxSetup({
-  beforeSend: function(xhr) {
-    xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
-  }
-});
-
-// ******** select2 global config ********
-$.fn.select2.defaults.set('theme', 'bootstrap4');
-$.fn.select2.defaults.set('language', 'zh-CN');
-
-Turbolinks.setProgressBarDelay(200);
-
-$.notifyDefaults({
-  type: 'success',
-  z_index: 9999,
-  delay: 2000
-});
-
-function show_success_flash(){
-  $.notify({
-    message: '操作成功'
-  },{
-    type: 'success'
-  });
-}
-
-$(document).on('turbolinks:load', function(){
-  $('[data-toggle="tooltip"]').tooltip({ trigger : 'hover' });
-  $('[data-toggle="popover"]').popover();
-
-  // 图片查看大图
-  $('img.preview-image').bootstrapViewer();
-
-  // flash alert提示框自动关闭
-  if($('.admin-alert-container .alert').length > 0){
-    setTimeout(function(){
-      $('.admin-alert-container .alert:not(.alert-danger)').alert('close');
-    }, 2000);
-    setTimeout(function(){
-      $('.admin-alert-container .alert.alert-danger').alert('close');
-    }, 5000);
-  }
-});
-
-$(document).on("turbolinks:before-cache", function () {
-  $('[data-toggle="tooltip"]').tooltip('hide');
-  $('[data-toggle="popover"]').popover('hide');
-});
-// var progressBar = new Turbolinks.ProgressBar();
-
-// $(document).on('ajax:send', function(event){
-//   console.log('ajax send', event);
-//   progressBar.setValue(0)
-//   progressBar.show()
-// });
-//
-// $(document).on('ajax:complete', function(event){
-//   console.log('ajax complete', event);
-//   progressBar.setValue(1)
-//   progressBar.hide() // 分页时不触发，奇怪
-// });
-// $(document).on('ajax:success', function(event){
-//   console.log('ajax success', event);
-// });
-// $(document).on('ajax:error', function(event){
-//   console.log('ajax error', event);
-// });
-
-$(function () {
-});
-
-$(document).on('turbolinks:load', function() {
-  
-  $('.logo-item-left').on("change", 'input[type="file"]', function () {
-    var $fileInput = $(this);
-    var file = this.files[0];
-    var imageType = /image.*/;
-    if (file && file.type.match(imageType)) {
-      var reader = new FileReader();
-      reader.onload = function () {
-        var $box = $fileInput.parent();
-        $box.find('img').attr('src', reader.result).css('display', 'block');
-        $box.addClass('has-img');
-      };
-      reader.readAsDataURL(file);
-    } else {
-    }
-  });
-
-  $('.attachment-item-left').on("change", 'input[type="file"]', function () {
-    var $fileInput = $(this);
-    var file = this.files[0];
-    var imageType = /image.*/;
-    if (file && file.type.match(imageType)) {
-      var reader = new FileReader();
-      reader.onload = function () {
-        var $box = $fileInput.parent();
-        $box.find('img').attr('src', reader.result).css('display', 'block');
-        $box.addClass('has-img');
-      };
-      reader.readAsDataURL(file);
-    } else {
-    }
-  });
+//= require rails-ujs
+//= require activestorage
+//= require turbolinks
+//= require jquery3
+//= require popper
+//= require bootstrap-sprockets
+//= require jquery.validate.min
+//= require additional-methods.min
+//= require bootstrap-notify
+//= require jquery.cookie.min
+//= require select2
+//= require moment.min
+//= require jquery.cxselect
+//= require bootstrap-datepicker
+//= require bootstrap-datetimepicker
+//= require bootstrap.viewer
+//= require bootstrap/bootstrap-toggle
+//= require jquery.mloading
+//= require jquery-confirm.min
+//= require common
+
+//= require echarts
+//= require codemirror/lib/codemirror
+//= require codemirror/mode/shell/shell
+//= require editormd/editormd
+//= require editormd/languages/zh-tw
+//= require dragula/dragula
+
+//= require_tree ./i18n
+//= require_tree ./admins
+
+
+$.ajaxSetup({
+  beforeSend: function(xhr) {
+    xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
+  }
+});
+
+// ******** select2 global config ********
+$.fn.select2.defaults.set('theme', 'bootstrap4');
+$.fn.select2.defaults.set('language', 'zh-CN');
+
+Turbolinks.setProgressBarDelay(200);
+
+$.notifyDefaults({
+  type: 'success',
+  z_index: 9999,
+  delay: 2000
+});
+
+function show_success_flash(){
+  $.notify({
+    message: '操作成功'
+  },{
+    type: 'success'
+  });
+}
+
+$(document).on('turbolinks:load', function(){
+  $('[data-toggle="tooltip"]').tooltip({ trigger : 'hover' });
+  $('[data-toggle="popover"]').popover();
+
+  // 图片查看大图
+  $('img.preview-image').bootstrapViewer();
+
+  // flash alert提示框自动关闭
+  if($('.admin-alert-container .alert').length > 0){
+    setTimeout(function(){
+      $('.admin-alert-container .alert:not(.alert-danger)').alert('close');
+    }, 2000);
+    setTimeout(function(){
+      $('.admin-alert-container .alert.alert-danger').alert('close');
+    }, 5000);
+  }
+});
+
+$(document).on("turbolinks:before-cache", function () {
+  $('[data-toggle="tooltip"]').tooltip('hide');
+  $('[data-toggle="popover"]').popover('hide');
+});
+// var progressBar = new Turbolinks.ProgressBar();
+
+// $(document).on('ajax:send', function(event){
+//   console.log('ajax send', event);
+//   progressBar.setValue(0)
+//   progressBar.show()
+// });
+//
+// $(document).on('ajax:complete', function(event){
+//   console.log('ajax complete', event);
+//   progressBar.setValue(1)
+//   progressBar.hide() // 分页时不触发，奇怪
+// });
+// $(document).on('ajax:success', function(event){
+//   console.log('ajax success', event);
+// });
+// $(document).on('ajax:error', function(event){
+//   console.log('ajax error', event);
+// });
+
+$(function () {
+});
+
+$(document).on('turbolinks:load', function() {
+  
+  $('.logo-item-left').on("change", 'input[type="file"]', function () {
+    var $fileInput = $(this);
+    var file = this.files[0];
+    var imageType = /image.*/;
+    if (file && file.type.match(imageType)) {
+      var reader = new FileReader();
+      reader.onload = function () {
+        var $box = $fileInput.parent();
+        $box.find('img').attr('src', reader.result).css('display', 'block');
+        $box.addClass('has-img');
+      };
+      reader.readAsDataURL(file);
+    } else {
+    }
+  });
+
+  $('.attachment-item-left').on("change", 'input[type="file"]', function () {
+    var $fileInput = $(this);
+    var file = this.files[0];
+    var imageType = /image.*/;
+    if (file && file.type.match(imageType)) {
+      var reader = new FileReader();
+      reader.onload = function () {
+        var $box = $fileInput.parent();
+        $box.find('img').attr('src', reader.result).css('display', 'block');
+        $box.addClass('has-img');
+      };
+      reader.readAsDataURL(file);
+    } else {
+    }
+  });
 })
\ No newline at end of file
diff --git a/app/assets/javascripts/bootstrap/bootstrap-toggle.js b/app/assets/javascripts/bootstrap/bootstrap-toggle.js
new file mode 100644
index 00000000..533914ed
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/bootstrap-toggle.js
@@ -0,0 +1,180 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap-toggle.js v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
+
+
+ +function ($) {
+ 	'use strict';
+
+	// TOGGLE PUBLIC CLASS DEFINITION
+	// ==============================
+
+	var Toggle = function (element, options) {
+		this.$element  = $(element)
+		this.options   = $.extend({}, this.defaults(), options)
+		this.render()
+	}
+
+	Toggle.VERSION  = '2.2.0'
+
+	Toggle.DEFAULTS = {
+		on: 'On',
+		off: 'Off',
+		onstyle: 'primary',
+		offstyle: 'default',
+		size: 'normal',
+		style: '',
+		width: null,
+		height: null
+	}
+
+	Toggle.prototype.defaults = function() {
+		return {
+			on: this.$element.attr('data-on') || Toggle.DEFAULTS.on,
+			off: this.$element.attr('data-off') || Toggle.DEFAULTS.off,
+			onstyle: this.$element.attr('data-onstyle') || Toggle.DEFAULTS.onstyle,
+			offstyle: this.$element.attr('data-offstyle') || Toggle.DEFAULTS.offstyle,
+			size: this.$element.attr('data-size') || Toggle.DEFAULTS.size,
+			style: this.$element.attr('data-style') || Toggle.DEFAULTS.style,
+			width: this.$element.attr('data-width') || Toggle.DEFAULTS.width,
+			height: this.$element.attr('data-height') || Toggle.DEFAULTS.height
+		}
+	}
+
+	Toggle.prototype.render = function () {
+		this._onstyle = 'btn-' + this.options.onstyle
+		this._offstyle = 'btn-' + this.options.offstyle
+		var size = this.options.size === 'large' ? 'btn-lg'
+			: this.options.size === 'small' ? 'btn-sm'
+			: this.options.size === 'mini' ? 'btn-xs'
+			: ''
+		var $toggleOn = $('<label class="btn">').html(this.options.on)
+			.addClass(this._onstyle + ' ' + size)
+		var $toggleOff = $('<label class="btn">').html(this.options.off)
+			.addClass(this._offstyle + ' ' + size + ' active')
+		var $toggleHandle = $('<span class="toggle-handle btn btn-default">')
+			.addClass(size)
+		var $toggleGroup = $('<div class="toggle-group">')
+			.append($toggleOn, $toggleOff, $toggleHandle)
+		var $toggle = $('<div class="toggle btn" data-toggle="toggle">')
+			.addClass( this.$element.prop('checked') ? this._onstyle : this._offstyle+' off' )
+			.addClass(size).addClass(this.options.style)
+
+		this.$element.wrap($toggle)
+		$.extend(this, {
+			$toggle: this.$element.parent(),
+			$toggleOn: $toggleOn,
+			$toggleOff: $toggleOff,
+			$toggleGroup: $toggleGroup
+		})
+		this.$toggle.append($toggleGroup)
+
+		var width = this.options.width || Math.max($toggleOn.outerWidth(), $toggleOff.outerWidth())+($toggleHandle.outerWidth()/2)
+		var height = this.options.height || Math.max($toggleOn.outerHeight(), $toggleOff.outerHeight())
+		$toggleOn.addClass('toggle-on')
+		$toggleOff.addClass('toggle-off')
+		this.$toggle.css({ width: width, height: height })
+		if (this.options.height) {
+			$toggleOn.css('line-height', $toggleOn.height() + 'px')
+			$toggleOff.css('line-height', $toggleOff.height() + 'px')
+		}
+		this.update(true)
+		this.trigger(true)
+	}
+
+	Toggle.prototype.toggle = function () {
+		if (this.$element.prop('checked')) this.off()
+		else this.on()
+	}
+
+	Toggle.prototype.on = function (silent) {
+		if (this.$element.prop('disabled')) return false
+		this.$toggle.removeClass(this._offstyle + ' off').addClass(this._onstyle)
+		this.$element.prop('checked', true)
+		if (!silent) this.trigger()
+	}
+
+	Toggle.prototype.off = function (silent) {
+		if (this.$element.prop('disabled')) return false
+		this.$toggle.removeClass(this._onstyle).addClass(this._offstyle + ' off')
+		this.$element.prop('checked', false)
+		if (!silent) this.trigger()
+	}
+
+	Toggle.prototype.enable = function () {
+		this.$toggle.removeAttr('disabled')
+		this.$element.prop('disabled', false)
+	}
+
+	Toggle.prototype.disable = function () {
+		this.$toggle.attr('disabled', 'disabled')
+		this.$element.prop('disabled', true)
+	}
+
+	Toggle.prototype.update = function (silent) {
+		if (this.$element.prop('disabled')) this.disable()
+		else this.enable()
+		if (this.$element.prop('checked')) this.on(silent)
+		else this.off(silent)
+	}
+
+	Toggle.prototype.trigger = function (silent) {
+		this.$element.off('change.bs.toggle')
+		if (!silent) this.$element.change()
+		this.$element.on('change.bs.toggle', $.proxy(function() {
+			this.update()
+		}, this))
+	}
+
+	Toggle.prototype.destroy = function() {
+		this.$element.off('change.bs.toggle')
+		this.$toggleGroup.remove()
+		this.$element.removeData('bs.toggle')
+		this.$element.unwrap()
+	}
+
+	// TOGGLE PLUGIN DEFINITION
+	// ========================
+
+	function Plugin(option) {
+		return this.each(function () {
+			var $this   = $(this)
+			var data    = $this.data('bs.toggle')
+			var options = typeof option == 'object' && option
+
+			if (!data) $this.data('bs.toggle', (data = new Toggle(this, options)))
+			if (typeof option == 'string' && data[option]) data[option]()
+		})
+	}
+
+	var old = $.fn.bootstrapToggle
+
+	$.fn.bootstrapToggle             = Plugin
+	$.fn.bootstrapToggle.Constructor = Toggle
+
+	// TOGGLE NO CONFLICT
+	// ==================
+
+	$.fn.toggle.noConflict = function () {
+		$.fn.bootstrapToggle = old
+		return this
+	}
+
+	// TOGGLE DATA-API
+	// ===============
+
+	$(function() {
+		$('input[type=checkbox][data-toggle^=toggle]').bootstrapToggle()
+	})
+
+	$(document).on('click.bs.toggle', 'div[data-toggle^=toggle]', function(e) {
+		var $checkbox = $(this).find('input[type=checkbox]')
+		$checkbox.bootstrapToggle('toggle')
+		e.preventDefault()
+	})
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/bootstrap-toggle.min.js b/app/assets/javascripts/bootstrap/bootstrap-toggle.min.js
new file mode 100644
index 00000000..37113200
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/bootstrap-toggle.min.js
@@ -0,0 +1,9 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap-toggle.js v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
++function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-lg":"small"===this.options.size?"btn-sm":"mini"===this.options.size?"btn-xs":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.outerWidth(),d.outerWidth())+e.outerWidth()/2,i=this.options.height||Math.max(c.outerHeight(),d.outerHeight());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);
+//# sourceMappingURL=bootstrap-toggle.min.js.map
\ No newline at end of file
diff --git a/app/assets/javascripts/bootstrap/bootstrap-toggle.min.js.map b/app/assets/javascripts/bootstrap/bootstrap-toggle.min.js.map
new file mode 100644
index 00000000..ac388afd
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/bootstrap-toggle.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"bootstrap-toggle.min.js","sources":["bootstrap-toggle.js"],"names":["$","Plugin","option","this","each","$this","data","options","Toggle","element","$element","extend","defaults","render","VERSION","DEFAULTS","on","off","onstyle","offstyle","size","style","width","height","prototype","attr","_onstyle","_offstyle","$toggleOn","html","addClass","$toggleOff","$toggleHandle","$toggleGroup","append","$toggle","prop","wrap","parent","Math","max","outerWidth","outerHeight","css","update","trigger","toggle","silent","removeClass","enable","removeAttr","disable","change","proxy","destroy","remove","removeData","unwrap","old","fn","bootstrapToggle","Constructor","noConflict","document","e","$checkbox","find","preventDefault","jQuery"],"mappings":";;;;;;;CASE,SAAUA,GACV,YAoID,SAASC,GAAOC,GACf,MAAOC,MAAKC,KAAK,WAChB,GAAIC,GAAUL,EAAEG,MACZG,EAAUD,EAAMC,KAAK,aACrBC,EAA2B,gBAAVL,IAAsBA,CAEtCI,IAAMD,EAAMC,KAAK,YAAcA,EAAO,GAAIE,GAAOL,KAAMI,IACvC,gBAAVL,IAAsBI,EAAKJ,IAASI,EAAKJ,OAtItD,GAAIM,GAAS,SAAUC,EAASF,GAC/BJ,KAAKO,SAAYV,EAAES,GACnBN,KAAKI,QAAYP,EAAEW,UAAWR,KAAKS,WAAYL,GAC/CJ,KAAKU,SAGNL,GAAOM,QAAW,QAElBN,EAAOO,UACNC,GAAI,KACJC,IAAK,MACLC,QAAS,UACTC,SAAU,UACVC,KAAM,SACNC,MAAO,GACPC,MAAO,KACPC,OAAQ,MAGTf,EAAOgB,UAAUZ,SAAW,WAC3B,OACCI,GAAIb,KAAKO,SAASe,KAAK,YAAcjB,EAAOO,SAASC,GACrDC,IAAKd,KAAKO,SAASe,KAAK,aAAejB,EAAOO,SAASE,IACvDC,QAASf,KAAKO,SAASe,KAAK,iBAAmBjB,EAAOO,SAASG,QAC/DC,SAAUhB,KAAKO,SAASe,KAAK,kBAAoBjB,EAAOO,SAASI,SACjEC,KAAMjB,KAAKO,SAASe,KAAK,cAAgBjB,EAAOO,SAASK,KACzDC,MAAOlB,KAAKO,SAASe,KAAK,eAAiBjB,EAAOO,SAASM,MAC3DC,MAAOnB,KAAKO,SAASe,KAAK,eAAiBjB,EAAOO,SAASO,MAC3DC,OAAQpB,KAAKO,SAASe,KAAK,gBAAkBjB,EAAOO,SAASQ,SAI/Df,EAAOgB,UAAUX,OAAS,WACzBV,KAAKuB,SAAW,OAASvB,KAAKI,QAAQW,QACtCf,KAAKwB,UAAY,OAASxB,KAAKI,QAAQY,QACvC,IAAIC,GAA6B,UAAtBjB,KAAKI,QAAQa,KAAmB,SAClB,UAAtBjB,KAAKI,QAAQa,KAAmB,SACV,SAAtBjB,KAAKI,QAAQa,KAAkB,SAC/B,GACCQ,EAAY5B,EAAE,uBAAuB6B,KAAK1B,KAAKI,QAAQS,IACzDc,SAAS3B,KAAKuB,SAAW,IAAMN,GAC7BW,EAAa/B,EAAE,uBAAuB6B,KAAK1B,KAAKI,QAAQU,KAC1Da,SAAS3B,KAAKwB,UAAY,IAAMP,EAAO,WACrCY,EAAgBhC,EAAE,gDACpB8B,SAASV,GACPa,EAAejC,EAAE,8BACnBkC,OAAON,EAAWG,EAAYC,GAC5BG,EAAUnC,EAAE,iDACd8B,SAAU3B,KAAKO,SAAS0B,KAAK,WAAajC,KAAKuB,SAAWvB,KAAKwB,UAAU,QACzEG,SAASV,GAAMU,SAAS3B,KAAKI,QAAQc,MAEvClB,MAAKO,SAAS2B,KAAKF,GACnBnC,EAAEW,OAAOR,MACRgC,QAAShC,KAAKO,SAAS4B,SACvBV,UAAWA,EACXG,WAAYA,EACZE,aAAcA,IAEf9B,KAAKgC,QAAQD,OAAOD,EAEpB,IAAIX,GAAQnB,KAAKI,QAAQe,OAASiB,KAAKC,IAAIZ,EAAUa,aAAcV,EAAWU,cAAeT,EAAcS,aAAa,EACpHlB,EAASpB,KAAKI,QAAQgB,QAAUgB,KAAKC,IAAIZ,EAAUc,cAAeX,EAAWW,cACjFd,GAAUE,SAAS,aACnBC,EAAWD,SAAS,cACpB3B,KAAKgC,QAAQQ,KAAMrB,MAAOA,EAAOC,OAAQA,IACrCpB,KAAKI,QAAQgB,SAChBK,EAAUe,IAAI,cAAef,EAAUL,SAAW,MAClDQ,EAAWY,IAAI,cAAeZ,EAAWR,SAAW,OAErDpB,KAAKyC,QAAO,GACZzC,KAAK0C,SAAQ,IAGdrC,EAAOgB,UAAUsB,OAAS,WACrB3C,KAAKO,SAAS0B,KAAK,WAAYjC,KAAKc,MACnCd,KAAKa,MAGXR,EAAOgB,UAAUR,GAAK,SAAU+B,GAC/B,MAAI5C,MAAKO,SAAS0B,KAAK,aAAoB,GAC3CjC,KAAKgC,QAAQa,YAAY7C,KAAKwB,UAAY,QAAQG,SAAS3B,KAAKuB,UAChEvB,KAAKO,SAAS0B,KAAK,WAAW,QACzBW,GAAQ5C,KAAK0C,aAGnBrC,EAAOgB,UAAUP,IAAM,SAAU8B,GAChC,MAAI5C,MAAKO,SAAS0B,KAAK,aAAoB,GAC3CjC,KAAKgC,QAAQa,YAAY7C,KAAKuB,UAAUI,SAAS3B,KAAKwB,UAAY,QAClExB,KAAKO,SAAS0B,KAAK,WAAW,QACzBW,GAAQ5C,KAAK0C,aAGnBrC,EAAOgB,UAAUyB,OAAS,WACzB9C,KAAKgC,QAAQe,WAAW,YACxB/C,KAAKO,SAAS0B,KAAK,YAAY,IAGhC5B,EAAOgB,UAAU2B,QAAU,WAC1BhD,KAAKgC,QAAQV,KAAK,WAAY,YAC9BtB,KAAKO,SAAS0B,KAAK,YAAY,IAGhC5B,EAAOgB,UAAUoB,OAAS,SAAUG,GAC/B5C,KAAKO,SAAS0B,KAAK,YAAajC,KAAKgD,UACpChD,KAAK8C,SACN9C,KAAKO,SAAS0B,KAAK,WAAYjC,KAAKa,GAAG+B,GACtC5C,KAAKc,IAAI8B,IAGfvC,EAAOgB,UAAUqB,QAAU,SAAUE,GACpC5C,KAAKO,SAASO,IAAI,oBACb8B,GAAQ5C,KAAKO,SAAS0C,SAC3BjD,KAAKO,SAASM,GAAG,mBAAoBhB,EAAEqD,MAAM,WAC5ClD,KAAKyC,UACHzC,QAGJK,EAAOgB,UAAU8B,QAAU,WAC1BnD,KAAKO,SAASO,IAAI,oBAClBd,KAAK8B,aAAasB,SAClBpD,KAAKO,SAAS8C,WAAW,aACzBrD,KAAKO,SAAS+C,SAiBf,IAAIC,GAAM1D,EAAE2D,GAAGC,eAEf5D,GAAE2D,GAAGC,gBAA8B3D,EACnCD,EAAE2D,GAAGC,gBAAgBC,YAAcrD,EAKnCR,EAAE2D,GAAGb,OAAOgB,WAAa,WAExB,MADA9D,GAAE2D,GAAGC,gBAAkBF,EAChBvD,MAMRH,EAAE,WACDA,EAAE,6CAA6C4D,oBAGhD5D,EAAE+D,UAAU/C,GAAG,kBAAmB,2BAA4B,SAASgD,GACtE,GAAIC,GAAYjE,EAAEG,MAAM+D,KAAK,uBAC7BD,GAAUL,gBAAgB,UAC1BI,EAAEG,oBAGFC"}
\ No newline at end of file
diff --git a/app/assets/javascripts/bootstrap/bootstrap2-toggle.js b/app/assets/javascripts/bootstrap/bootstrap2-toggle.js
new file mode 100644
index 00000000..93a541cb
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/bootstrap2-toggle.js
@@ -0,0 +1,180 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap2-toggle.js v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
+
+
+ +function ($) {
+ 	'use strict';
+
+	// TOGGLE PUBLIC CLASS DEFINITION
+	// ==============================
+
+	var Toggle = function (element, options) {
+		this.$element  = $(element)
+		this.options   = $.extend({}, this.defaults(), options)
+		this.render()
+	}
+
+	Toggle.VERSION  = '2.2.0'
+
+	Toggle.DEFAULTS = {
+		on: 'On',
+		off: 'Off',
+		onstyle: 'primary',
+		offstyle: 'default',
+		size: 'normal',
+		style: '',
+		width: null,
+		height: null
+	}
+
+	Toggle.prototype.defaults = function() {
+		return {
+			on: this.$element.attr('data-on') || Toggle.DEFAULTS.on,
+			off: this.$element.attr('data-off') || Toggle.DEFAULTS.off,
+			onstyle: this.$element.attr('data-onstyle') || Toggle.DEFAULTS.onstyle,
+			offstyle: this.$element.attr('data-offstyle') || Toggle.DEFAULTS.offstyle,
+			size: this.$element.attr('data-size') || Toggle.DEFAULTS.size,
+			style: this.$element.attr('data-style') || Toggle.DEFAULTS.style,
+			width: this.$element.attr('data-width') || Toggle.DEFAULTS.width,
+			height: this.$element.attr('data-height') || Toggle.DEFAULTS.height
+		}
+	}
+
+	Toggle.prototype.render = function () {
+		this._onstyle = 'btn-' + this.options.onstyle
+		this._offstyle = 'btn-' + this.options.offstyle
+		var size = this.options.size === 'large' ? 'btn-large'
+			: this.options.size === 'small' ? 'btn-small'
+			: this.options.size === 'mini' ? 'btn-mini'
+			: ''
+		var $toggleOn = $('<label class="btn">').html(this.options.on)
+			.addClass(this._onstyle + ' ' + size)
+		var $toggleOff = $('<label class="btn">').html(this.options.off)
+			.addClass(this._offstyle + ' ' + size + ' active')
+		var $toggleHandle = $('<span class="toggle-handle btn btn-default">')
+			.addClass(size)
+		var $toggleGroup = $('<div class="toggle-group">')
+			.append($toggleOn, $toggleOff, $toggleHandle)
+		var $toggle = $('<div class="toggle btn" data-toggle="toggle">')
+			.addClass( this.$element.prop('checked') ? this._onstyle : this._offstyle+' off' )
+			.addClass(size).addClass(this.options.style)
+
+		this.$element.wrap($toggle)
+		$.extend(this, {
+			$toggle: this.$element.parent(),
+			$toggleOn: $toggleOn,
+			$toggleOff: $toggleOff,
+			$toggleGroup: $toggleGroup
+		})
+		this.$toggle.append($toggleGroup)
+
+		var width = this.options.width || Math.max($toggleOn.width(), $toggleOff.width())+($toggleHandle.outerWidth()/2)
+		var height = this.options.height || Math.max($toggleOn.height(), $toggleOff.height())
+		$toggleOn.addClass('toggle-on')
+		$toggleOff.addClass('toggle-off')
+		this.$toggle.css({ width: width, height: height })
+		if (this.options.height) {
+			$toggleOn.css('line-height', $toggleOn.height() + 'px')
+			$toggleOff.css('line-height', $toggleOff.height() + 'px')
+		}
+		this.update(true)
+		this.trigger(true)
+	}
+
+	Toggle.prototype.toggle = function () {
+		if (this.$element.prop('checked')) this.off()
+		else this.on()
+	}
+
+	Toggle.prototype.on = function (silent) {
+		if (this.$element.prop('disabled')) return false
+		this.$toggle.removeClass(this._offstyle + ' off').addClass(this._onstyle)
+		this.$element.prop('checked', true)
+		if (!silent) this.trigger()
+	}
+
+	Toggle.prototype.off = function (silent) {
+		if (this.$element.prop('disabled')) return false
+		this.$toggle.removeClass(this._onstyle).addClass(this._offstyle + ' off')
+		this.$element.prop('checked', false)
+		if (!silent) this.trigger()
+	}
+
+	Toggle.prototype.enable = function () {
+		this.$toggle.removeAttr('disabled')
+		this.$element.prop('disabled', false)
+	}
+
+	Toggle.prototype.disable = function () {
+		this.$toggle.attr('disabled', 'disabled')
+		this.$element.prop('disabled', true)
+	}
+
+	Toggle.prototype.update = function (silent) {
+		if (this.$element.prop('disabled')) this.disable()
+		else this.enable()
+		if (this.$element.prop('checked')) this.on(silent)
+		else this.off(silent)
+	}
+
+	Toggle.prototype.trigger = function (silent) {
+		this.$element.off('change.bs.toggle')
+		if (!silent) this.$element.change()
+		this.$element.on('change.bs.toggle', $.proxy(function() {
+			this.update()
+		}, this))
+	}
+
+	Toggle.prototype.destroy = function() {
+		this.$element.off('change.bs.toggle')
+		this.$toggleGroup.remove()
+		this.$element.removeData('bs.toggle')
+		this.$element.unwrap()
+	}
+
+	// TOGGLE PLUGIN DEFINITION
+	// ========================
+
+	function Plugin(option) {
+		return this.each(function () {
+			var $this   = $(this)
+			var data    = $this.data('bs.toggle')
+			var options = typeof option == 'object' && option
+
+			if (!data) $this.data('bs.toggle', (data = new Toggle(this, options)))
+			if (typeof option == 'string' && data[option]) data[option]()
+		})
+	}
+
+	var old = $.fn.bootstrapToggle
+
+	$.fn.bootstrapToggle             = Plugin
+	$.fn.bootstrapToggle.Constructor = Toggle
+
+	// TOGGLE NO CONFLICT
+	// ==================
+
+	$.fn.toggle.noConflict = function () {
+		$.fn.bootstrapToggle = old
+		return this
+	}
+
+	// TOGGLE DATA-API
+	// ===============
+
+	$(function() {
+		$('input[type=checkbox][data-toggle^=toggle]').bootstrapToggle()
+	})
+
+	$(document).on('click.bs.toggle', 'div[data-toggle^=toggle]', function(e) {
+		var $checkbox = $(this).find('input[type=checkbox]')
+		$checkbox.bootstrapToggle('toggle')
+		e.preventDefault()
+	})
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js b/app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js
new file mode 100644
index 00000000..2aa60aab
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js
@@ -0,0 +1,9 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap2-toggle.js v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
++function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-large":"small"===this.options.size?"btn-small":"mini"===this.options.size?"btn-mini":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.width(),d.width())+e.outerWidth()/2,i=this.options.height||Math.max(c.height(),d.height());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);
+//# sourceMappingURL=bootstrap2-toggle.min.js.map
\ No newline at end of file
diff --git a/app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js.map b/app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js.map
new file mode 100644
index 00000000..91609099
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"bootstrap2-toggle.min.js","sources":["bootstrap2-toggle.js"],"names":["$","Plugin","option","this","each","$this","data","options","Toggle","element","$element","extend","defaults","render","VERSION","DEFAULTS","on","off","onstyle","offstyle","size","style","width","height","prototype","attr","_onstyle","_offstyle","$toggleOn","html","addClass","$toggleOff","$toggleHandle","$toggleGroup","append","$toggle","prop","wrap","parent","Math","max","outerWidth","css","update","trigger","toggle","silent","removeClass","enable","removeAttr","disable","change","proxy","destroy","remove","removeData","unwrap","old","fn","bootstrapToggle","Constructor","noConflict","document","e","$checkbox","find","preventDefault","jQuery"],"mappings":";;;;;;;CASE,SAAUA,GACV,YAoID,SAASC,GAAOC,GACf,MAAOC,MAAKC,KAAK,WAChB,GAAIC,GAAUL,EAAEG,MACZG,EAAUD,EAAMC,KAAK,aACrBC,EAA2B,gBAAVL,IAAsBA,CAEtCI,IAAMD,EAAMC,KAAK,YAAcA,EAAO,GAAIE,GAAOL,KAAMI,IACvC,gBAAVL,IAAsBI,EAAKJ,IAASI,EAAKJ,OAtItD,GAAIM,GAAS,SAAUC,EAASF,GAC/BJ,KAAKO,SAAYV,EAAES,GACnBN,KAAKI,QAAYP,EAAEW,UAAWR,KAAKS,WAAYL,GAC/CJ,KAAKU,SAGNL,GAAOM,QAAW,QAElBN,EAAOO,UACNC,GAAI,KACJC,IAAK,MACLC,QAAS,UACTC,SAAU,UACVC,KAAM,SACNC,MAAO,GACPC,MAAO,KACPC,OAAQ,MAGTf,EAAOgB,UAAUZ,SAAW,WAC3B,OACCI,GAAIb,KAAKO,SAASe,KAAK,YAAcjB,EAAOO,SAASC,GACrDC,IAAKd,KAAKO,SAASe,KAAK,aAAejB,EAAOO,SAASE,IACvDC,QAASf,KAAKO,SAASe,KAAK,iBAAmBjB,EAAOO,SAASG,QAC/DC,SAAUhB,KAAKO,SAASe,KAAK,kBAAoBjB,EAAOO,SAASI,SACjEC,KAAMjB,KAAKO,SAASe,KAAK,cAAgBjB,EAAOO,SAASK,KACzDC,MAAOlB,KAAKO,SAASe,KAAK,eAAiBjB,EAAOO,SAASM,MAC3DC,MAAOnB,KAAKO,SAASe,KAAK,eAAiBjB,EAAOO,SAASO,MAC3DC,OAAQpB,KAAKO,SAASe,KAAK,gBAAkBjB,EAAOO,SAASQ,SAI/Df,EAAOgB,UAAUX,OAAS,WACzBV,KAAKuB,SAAW,OAASvB,KAAKI,QAAQW,QACtCf,KAAKwB,UAAY,OAASxB,KAAKI,QAAQY,QACvC,IAAIC,GAA6B,UAAtBjB,KAAKI,QAAQa,KAAmB,YAClB,UAAtBjB,KAAKI,QAAQa,KAAmB,YACV,SAAtBjB,KAAKI,QAAQa,KAAkB,WAC/B,GACCQ,EAAY5B,EAAE,uBAAuB6B,KAAK1B,KAAKI,QAAQS,IACzDc,SAAS3B,KAAKuB,SAAW,IAAMN,GAC7BW,EAAa/B,EAAE,uBAAuB6B,KAAK1B,KAAKI,QAAQU,KAC1Da,SAAS3B,KAAKwB,UAAY,IAAMP,EAAO,WACrCY,EAAgBhC,EAAE,gDACpB8B,SAASV,GACPa,EAAejC,EAAE,8BACnBkC,OAAON,EAAWG,EAAYC,GAC5BG,EAAUnC,EAAE,iDACd8B,SAAU3B,KAAKO,SAAS0B,KAAK,WAAajC,KAAKuB,SAAWvB,KAAKwB,UAAU,QACzEG,SAASV,GAAMU,SAAS3B,KAAKI,QAAQc,MAEvClB,MAAKO,SAAS2B,KAAKF,GACnBnC,EAAEW,OAAOR,MACRgC,QAAShC,KAAKO,SAAS4B,SACvBV,UAAWA,EACXG,WAAYA,EACZE,aAAcA,IAEf9B,KAAKgC,QAAQD,OAAOD,EAEpB,IAAIX,GAAQnB,KAAKI,QAAQe,OAASiB,KAAKC,IAAIZ,EAAUN,QAASS,EAAWT,SAAUU,EAAcS,aAAa,EAC1GlB,EAASpB,KAAKI,QAAQgB,QAAUgB,KAAKC,IAAIZ,EAAUL,SAAUQ,EAAWR,SAC5EK,GAAUE,SAAS,aACnBC,EAAWD,SAAS,cACpB3B,KAAKgC,QAAQO,KAAMpB,MAAOA,EAAOC,OAAQA,IACrCpB,KAAKI,QAAQgB,SAChBK,EAAUc,IAAI,cAAed,EAAUL,SAAW,MAClDQ,EAAWW,IAAI,cAAeX,EAAWR,SAAW,OAErDpB,KAAKwC,QAAO,GACZxC,KAAKyC,SAAQ,IAGdpC,EAAOgB,UAAUqB,OAAS,WACrB1C,KAAKO,SAAS0B,KAAK,WAAYjC,KAAKc,MACnCd,KAAKa,MAGXR,EAAOgB,UAAUR,GAAK,SAAU8B,GAC/B,MAAI3C,MAAKO,SAAS0B,KAAK,aAAoB,GAC3CjC,KAAKgC,QAAQY,YAAY5C,KAAKwB,UAAY,QAAQG,SAAS3B,KAAKuB,UAChEvB,KAAKO,SAAS0B,KAAK,WAAW,QACzBU,GAAQ3C,KAAKyC,aAGnBpC,EAAOgB,UAAUP,IAAM,SAAU6B,GAChC,MAAI3C,MAAKO,SAAS0B,KAAK,aAAoB,GAC3CjC,KAAKgC,QAAQY,YAAY5C,KAAKuB,UAAUI,SAAS3B,KAAKwB,UAAY,QAClExB,KAAKO,SAAS0B,KAAK,WAAW,QACzBU,GAAQ3C,KAAKyC,aAGnBpC,EAAOgB,UAAUwB,OAAS,WACzB7C,KAAKgC,QAAQc,WAAW,YACxB9C,KAAKO,SAAS0B,KAAK,YAAY,IAGhC5B,EAAOgB,UAAU0B,QAAU,WAC1B/C,KAAKgC,QAAQV,KAAK,WAAY,YAC9BtB,KAAKO,SAAS0B,KAAK,YAAY,IAGhC5B,EAAOgB,UAAUmB,OAAS,SAAUG,GAC/B3C,KAAKO,SAAS0B,KAAK,YAAajC,KAAK+C,UACpC/C,KAAK6C,SACN7C,KAAKO,SAAS0B,KAAK,WAAYjC,KAAKa,GAAG8B,GACtC3C,KAAKc,IAAI6B,IAGftC,EAAOgB,UAAUoB,QAAU,SAAUE,GACpC3C,KAAKO,SAASO,IAAI,oBACb6B,GAAQ3C,KAAKO,SAASyC,SAC3BhD,KAAKO,SAASM,GAAG,mBAAoBhB,EAAEoD,MAAM,WAC5CjD,KAAKwC,UACHxC,QAGJK,EAAOgB,UAAU6B,QAAU,WAC1BlD,KAAKO,SAASO,IAAI,oBAClBd,KAAK8B,aAAaqB,SAClBnD,KAAKO,SAAS6C,WAAW,aACzBpD,KAAKO,SAAS8C,SAiBf,IAAIC,GAAMzD,EAAE0D,GAAGC,eAEf3D,GAAE0D,GAAGC,gBAA8B1D,EACnCD,EAAE0D,GAAGC,gBAAgBC,YAAcpD,EAKnCR,EAAE0D,GAAGb,OAAOgB,WAAa,WAExB,MADA7D,GAAE0D,GAAGC,gBAAkBF,EAChBtD,MAMRH,EAAE,WACDA,EAAE,6CAA6C2D,oBAGhD3D,EAAE8D,UAAU9C,GAAG,kBAAmB,2BAA4B,SAAS+C,GACtE,GAAIC,GAAYhE,EAAEG,MAAM8D,KAAK,uBAC7BD,GAAUL,gBAAgB,UAC1BI,EAAEG,oBAGFC"}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 03c3970a..bae77fb2 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -8,6 +8,7 @@
 @import "jquery.mloading";
 @import "jquery-confirm.min";
 @import "bootstrap-datetimepicker.min";
+@import "bootstrap/bootstrap-toggle.min";
 
 @import "codemirror/lib/codemirror";
 @import "editormd/css/editormd.min";
diff --git a/app/assets/stylesheets/bootstrap/bootstrap-toggle.css b/app/assets/stylesheets/bootstrap/bootstrap-toggle.css
new file mode 100644
index 00000000..057d08b3
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap/bootstrap-toggle.css
@@ -0,0 +1,83 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap-toggle.css v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
+
+
+.checkbox label .toggle,
+.checkbox-inline .toggle {
+	margin-left: -20px;
+	margin-right: 5px;
+}
+
+.toggle {
+	position: relative;
+	overflow: hidden;
+}
+.toggle input[type="checkbox"] {
+	display: none;
+}
+.toggle-group {
+	position: absolute;
+	width: 200%;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	transition: left 0.35s;
+	-webkit-transition: left 0.35s;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+}
+.toggle.off .toggle-group {
+	left: -100%;
+}
+.toggle-on {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 50%;
+	margin: 0;
+	border: 0;
+	border-radius: 0;
+}
+.toggle-off {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 50%;
+	right: 0;
+	margin: 0;
+	border: 0;
+	border-radius: 0;
+}
+.toggle-handle {
+	position: relative;
+	margin: 0 auto;
+	padding-top: 0px;
+	padding-bottom: 0px;
+	height: 100%;
+	width: 0px;
+	border-width: 0 1px;
+}
+
+.toggle.btn { min-width: 59px; min-height: 34px; }
+.toggle-on.btn { padding-right: 24px; }
+.toggle-off.btn { padding-left: 24px; }
+
+.toggle.btn-lg { min-width: 79px; min-height: 45px; }
+.toggle-on.btn-lg { padding-right: 31px; }
+.toggle-off.btn-lg { padding-left: 31px; }
+.toggle-handle.btn-lg { width: 40px; }
+
+.toggle.btn-sm { min-width: 50px; min-height: 30px;}
+.toggle-on.btn-sm { padding-right: 20px; }
+.toggle-off.btn-sm { padding-left: 20px; }
+
+.toggle.btn-xs { min-width: 35px; min-height: 22px;}
+.toggle-on.btn-xs { padding-right: 12px; }
+.toggle-off.btn-xs { padding-left: 12px; }
+
diff --git a/app/assets/stylesheets/bootstrap/bootstrap-toggle.min.css b/app/assets/stylesheets/bootstrap/bootstrap-toggle.min.css
new file mode 100644
index 00000000..0d42ed09
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap/bootstrap-toggle.min.css
@@ -0,0 +1,28 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap-toggle.css v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
+.checkbox label .toggle,.checkbox-inline .toggle{margin-left:-20px;margin-right:5px}
+.toggle{position:relative;overflow:hidden}
+.toggle input[type=checkbox]{display:none}
+.toggle-group{position:absolute;width:200%;top:0;bottom:0;left:0;transition:left .35s;-webkit-transition:left .35s;-moz-user-select:none;-webkit-user-select:none}
+.toggle.off .toggle-group{left:-100%}
+.toggle-on{position:absolute;top:0;bottom:0;left:0;right:50%;margin:0;border:0;border-radius:0}
+.toggle-off{position:absolute;top:0;bottom:0;left:50%;right:0;margin:0;border:0;border-radius:0}
+.toggle-handle{position:relative;margin:0 auto;padding-top:0;padding-bottom:0;height:100%;width:0;border-width:0 1px}
+.toggle.btn{min-width:59px;min-height:34px}
+.toggle-on.btn{padding-right:24px}
+.toggle-off.btn{padding-left:24px}
+.toggle.btn-lg{min-width:79px;min-height:45px}
+.toggle-on.btn-lg{padding-right:31px}
+.toggle-off.btn-lg{padding-left:31px}
+.toggle-handle.btn-lg{width:40px}
+.toggle.btn-sm{min-width:50px;min-height:30px}
+.toggle-on.btn-sm{padding-right:20px}
+.toggle-off.btn-sm{padding-left:20px}
+.toggle.btn-xs{min-width:35px;min-height:22px}
+.toggle-on.btn-xs{padding-right:12px}
+.toggle-off.btn-xs{padding-left:12px}
\ No newline at end of file
diff --git a/app/assets/stylesheets/bootstrap/bootstrap2-toggle.css b/app/assets/stylesheets/bootstrap/bootstrap2-toggle.css
new file mode 100644
index 00000000..3f48927e
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap/bootstrap2-toggle.css
@@ -0,0 +1,85 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap2-toggle.css v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
+
+
+label.checkbox .toggle,
+label.checkbox.inline .toggle {
+	margin-left: -20px;
+	margin-right: 5px;
+}
+.toggle {
+	min-width: 40px;
+	height: 20px;
+	position: relative;
+	overflow: hidden;
+}
+.toggle input[type="checkbox"] {
+	display: none;
+}
+.toggle-group {
+	position: absolute;
+	width: 200%;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	transition: left 0.35s;
+	-webkit-transition: left 0.35s;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+}
+.toggle.off .toggle-group {
+	left: -100%;
+}
+.toggle-on {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 50%;
+	margin: 0;
+	border: 0;
+	border-radius: 0;
+}
+.toggle-off {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 50%;
+	right: 0;
+	margin: 0;
+	border: 0;
+	border-radius: 0;
+}
+.toggle-handle {
+	position: relative;
+	margin: 0 auto;
+	padding-top: 0px;
+	padding-bottom: 0px;
+	height: 100%;
+	width: 0px;
+	border-width: 0 1px;
+}
+.toggle-handle.btn-mini {
+	top: -1px;
+}
+.toggle.btn { min-width: 30px; }
+.toggle-on.btn { padding-right: 24px; }
+.toggle-off.btn { padding-left: 24px; }
+
+.toggle.btn-large { min-width: 40px; }
+.toggle-on.btn-large { padding-right: 35px; }
+.toggle-off.btn-large { padding-left: 35px; }
+
+.toggle.btn-small { min-width: 25px; }
+.toggle-on.btn-small { padding-right: 20px; }
+.toggle-off.btn-small { padding-left: 20px; }
+
+.toggle.btn-mini { min-width: 20px; }
+.toggle-on.btn-mini { padding-right: 12px; }
+.toggle-off.btn-mini { padding-left: 12px; }
+
diff --git a/app/assets/stylesheets/bootstrap/bootstrap2-toggle.min.css b/app/assets/stylesheets/bootstrap/bootstrap2-toggle.min.css
new file mode 100644
index 00000000..1509c573
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap/bootstrap2-toggle.min.css
@@ -0,0 +1,28 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap2-toggle.css v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
+label.checkbox .toggle,label.checkbox.inline .toggle{margin-left:-20px;margin-right:5px}
+.toggle{min-width:40px;height:20px;position:relative;overflow:hidden}
+.toggle input[type=checkbox]{display:none}
+.toggle-group{position:absolute;width:200%;top:0;bottom:0;left:0;transition:left .35s;-webkit-transition:left .35s;-moz-user-select:none;-webkit-user-select:none}
+.toggle.off .toggle-group{left:-100%}
+.toggle-on{position:absolute;top:0;bottom:0;left:0;right:50%;margin:0;border:0;border-radius:0}
+.toggle-off{position:absolute;top:0;bottom:0;left:50%;right:0;margin:0;border:0;border-radius:0}
+.toggle-handle{position:relative;margin:0 auto;padding-top:0;padding-bottom:0;height:100%;width:0;border-width:0 1px}
+.toggle-handle.btn-mini{top:-1px}
+.toggle.btn{min-width:30px}
+.toggle-on.btn{padding-right:24px}
+.toggle-off.btn{padding-left:24px}
+.toggle.btn-large{min-width:40px}
+.toggle-on.btn-large{padding-right:35px}
+.toggle-off.btn-large{padding-left:35px}
+.toggle.btn-small{min-width:25px}
+.toggle-on.btn-small{padding-right:20px}
+.toggle-off.btn-small{padding-left:20px}
+.toggle.btn-mini{min-width:20px}
+.toggle-on.btn-mini{padding-right:12px}
+.toggle-off.btn-mini{padding-left:12px}
\ No newline at end of file
diff --git a/app/controllers/admins/nps_controller.rb b/app/controllers/admins/nps_controller.rb
new file mode 100644
index 00000000..4eacba4e
--- /dev/null
+++ b/app/controllers/admins/nps_controller.rb
@@ -0,0 +1,22 @@
+class Admins::NpsController < Admins::BaseController
+  def index
+    @on_off_switch = EduSetting.get("nps-on-off-switch").to_s == 'true'
+    @user_nps = UserNp.joins(:user).order(created_at: :desc)
+    keyword = params[:keyword].to_s.strip.presence
+    if keyword
+      sql = 'CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword OR users.login LIKE :keyword OR users.mail LIKE :keyword OR users.phone LIKE :keyword'
+      @user_nps = @user_nps.where(sql, keyword: "%#{keyword}%")
+    end
+    @user_nps = paginate @user_nps.includes(:user)
+  end
+
+  def switch_change
+    edu_setting = EduSetting.find_by(name: "nps-on-off-switch")
+    if edu_setting.blank?
+      edu_setting = EduSetting.new(name: "nps-on-off-switch")
+    end
+    edu_setting.value = params[:switch].to_s
+    edu_setting.save
+    render_ok
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 45a814a2..8dacc7bb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -277,11 +277,11 @@ class ApplicationController < ActionController::Base
 				end
 			end
 
-			# if !User.current.logged? && Rails.env.development?
-			# 	user = User.find 1
-			# 	User.current = user
-			# 	start_user_session(user)
-			# end
+			if !User.current.logged? && Rails.env.development?
+				user = User.find 1
+				User.current = user
+				start_user_session(user)
+			end
 
 
 			# 测试版前端需求
diff --git a/app/controllers/nps_controller.rb b/app/controllers/nps_controller.rb
new file mode 100644
index 00000000..2e1b552b
--- /dev/null
+++ b/app/controllers/nps_controller.rb
@@ -0,0 +1,28 @@
+class NpsController < ApplicationController
+
+  def create
+    tip_exception "缺少参数" if params[:action_id].blank?
+    action_type ||= begin
+                      case params[:action_id].to_s
+                      when '0' then
+                        'close'
+                      when '1' then
+                        'createIssue'
+                      when '2' then
+                        'createPullRequest'
+                      when '3' then
+                        'auditPullRequest'
+                      when '4' then
+                        'forkProject'
+                      when '5' then
+                        'createProject'
+                      when '6' then
+                        'createOrganization'
+                      else
+                        "#{params[:action_type].to_s}"
+                      end
+                    end
+    UserNp.create(:action_id => params[:action_id], :action_type => "#{action_type}", :user_id => User.current.id, :score => params[:score].to_f, memo: params[:memo])
+    render_ok
+  end
+end
diff --git a/app/helpers/admins/nps_helper.rb b/app/helpers/admins/nps_helper.rb
new file mode 100644
index 00000000..41c5f68d
--- /dev/null
+++ b/app/helpers/admins/nps_helper.rb
@@ -0,0 +1,2 @@
+module Admins::NpsHelper
+end
diff --git a/app/models/user_np.rb b/app/models/user_np.rb
new file mode 100644
index 00000000..b8d3630d
--- /dev/null
+++ b/app/models/user_np.rb
@@ -0,0 +1,21 @@
+# == Schema Information
+#
+# Table name: user_nps
+#
+#  id          :integer          not null, primary key
+#  user_id     :integer
+#  action_type :string(255)
+#  action_id   :integer
+#  score       :float(24)
+#  memo        :text(65535)
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+# Indexes
+#
+#  index_user_nps_on_user_id  (user_id)
+#
+
+class UserNp < ApplicationRecord
+  belongs_to :user, optional: true
+end
diff --git a/app/queries/admins/user_query.rb b/app/queries/admins/user_query.rb
index f9506ddf..dabfa9c5 100644
--- a/app/queries/admins/user_query.rb
+++ b/app/queries/admins/user_query.rb
@@ -19,6 +19,9 @@ class Admins::UserQuery < ApplicationQuery
     status = params[:status]
     users = users.where(status: status) if status.present?
 
+    # 是否管理员
+    users = users.where(admin: params[:admin]) if params[:admin].present?
+
     # 职业
     users = users.joins(:user_extension).where(user_extensions: { identity: params[:identity] }) if params[:identity].present?
 
diff --git a/app/views/admins/nps/_user_np_list.html.erb b/app/views/admins/nps/_user_np_list.html.erb
new file mode 100644
index 00000000..f4246c70
--- /dev/null
+++ b/app/views/admins/nps/_user_np_list.html.erb
@@ -0,0 +1,34 @@
+<table class="table table-hover users-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="5%">序号</th>
+    <th width="10%" class="text-left">真实姓名</th>
+    <th width="15%">提交时间</th>
+    <th width="15%"><%= sort_tag('最后登录', name: 'last_login_on', path: admins_users_path) %></th>
+    <th width="10%">评分</th>
+    <th width="45%">意见反馈</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if user_nps.present? %>
+    <% user_nps.each_with_index do |nps, index| %>
+      <tr class="user-item-<%= nps.user.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
+        <td class="text-left">
+          <%= link_to "/#{nps.user.login}", target: '_blank' do %>
+            <%= overflow_hidden_span nps.user.real_name, width: 100 %>
+          <% end %>
+        </td>
+        <td><%= display_text(nps.created_at&.strftime('%Y-%m-%d %H:%M')) %></td>
+        <td><%= display_text(nps.user.last_login_on&.strftime('%Y-%m-%d %H:%M')) %></td>
+        <td><%= nps.score %></td>
+        <td><%= nps.memo %></td>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: user_nps } %>
diff --git a/app/views/admins/nps/index.html.erb b/app/views/admins/nps/index.html.erb
new file mode 100644
index 00000000..f599d00a
--- /dev/null
+++ b/app/views/admins/nps/index.html.erb
@@ -0,0 +1,45 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('NPS用户调研', admins_nps_path) %>
+<% end %>
+
+<div class="box search-form-container user-list-form">
+  <%= form_tag(admins_nps_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'ID/姓名/邮箱/手机号检索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+
+    <span style="margin-left: 50px;margin-right: 10px;">NPS系统开关</span>
+    <input type="checkbox" <% if @on_off_switch %>checked<%end %> data-toggle="toggle" data-onstyle="primary" id="nps_toggle" data-on="开" data-off="关" data-size="small">
+
+  <% end %>
+
+</div>
+
+<div class="box admin-list-container users-list-container">
+  <%= render partial: 'admins/nps/user_np_list', locals: { user_nps: @user_nps } %>
+</div>
+
+<script>
+    $(function () {
+        $('#nps_toggle').bootstrapToggle({
+            on: '开',
+            off: '关'
+        });
+        $('#nps_toggle').change(function () {
+            var switch_value = $(this).prop('checked');
+            var url = "/admins/nps/switch_change.json"
+            $.ajax({
+                method: 'POST',
+                dataType: 'json',
+                url: url,
+                data: {'switch': switch_value},
+                success: function () {
+                    $.notify({message: '操作成功'});
+                },
+                error: function (res) {
+
+                }
+            });
+        })
+    })
+</script>
\ No newline at end of file
diff --git a/app/views/admins/nps/index.js.erb b/app/views/admins/nps/index.js.erb
new file mode 100644
index 00000000..c1d7fa7a
--- /dev/null
+++ b/app/views/admins/nps/index.js.erb
@@ -0,0 +1 @@
+$('.users-list-container').html("<%= j( render partial: 'admins/nps/user_np_list', locals: { user_nps: @user_nps } ) %>");
\ No newline at end of file
diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index d757758e..b78f0e86 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -35,6 +35,7 @@
     <li>
       <%= sidebar_item_group('#setting-submenu', '网站建设', icon: 'cogs') do %>
         <li><%= sidebar_item(admins_faqs_path, 'FAQ', icon: 'question-circle', controller: 'admins-faqs') %></li>
+        <li><%= sidebar_item(admins_nps_path, 'NPS用户调研', icon: 'question-circle', controller: 'admins-nps') %></li>
       <% end %>
     </li>
     <li>
diff --git a/app/views/admins/users/index.html.erb b/app/views/admins/users/index.html.erb
index 2f41ffdb..42d85108 100644
--- a/app/views/admins/users/index.html.erb
+++ b/app/views/admins/users/index.html.erb
@@ -16,18 +16,15 @@
       <%= select_tag(:identity, options_for_select(identity_options), class: 'form-control') %>
     </div>
 
-    <div class="form-group mr-2">
-      <label for="identity">授权类型：</label>
-      <% auto_trial_options = [['全部', ''], ['自动授权', 1], ['手动授权', 0]] %>
-      <%= select_tag(:auto_trial, options_for_select(auto_trial_options), class: 'form-control') %>
-    </div>
 
     <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'ID/姓名/邮箱/手机号检索') %>
-    <%
-=begin%>
- <%= text_field_tag(:school_name, params[:school_name], class: 'form-control  col-sm-2', placeholder: '学校/单位检索') %> 
-<%
-=end%>
+
+    <label for="user_admin">
+      是否管理员
+    </label>
+    <%= check_box_tag("admin", true, false, id: "user_admin", style: 'margin-left: 2px;') %>
+
+
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
   <% end %>
 
diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder
index 8fcadb1c..611a09d5 100644
--- a/app/views/users/get_user_info.json.jbuilder
+++ b/app/views/users/get_user_info.json.jbuilder
@@ -1,26 +1,27 @@
-json.username @user.full_name
-json.real_name @user.real_name
-json.nickname @user.nickname
-json.gender @user.gender
-json.login @user.login
-json.user_id @user.id
-json.image_url url_to_avatar(@user)
-json.admin @user.admin?
-json.is_teacher @user.user_extension&.teacher?
-json.user_identity @user.identity
-json.tidding_count 0
-json.user_phone_binded @user.phone.present?
-# json.phone @user.phone
-# json.email @user.mail
-json.profile_completed @user.profile_is_completed?
-json.professional_certification @user.professional_certification
-json.devops_step @user.devops_step
-json.ci_certification @user.ci_certification?
-json.email @user.mail 
-json.province @user.province 
-json.city @user.city
-json.custom_department @user.custom_department
-json.description @user.description
-json.super_description @user.super_description
-json.(@user, :show_email, :show_department, :show_location, :show_super_description)
-json.message_unread_total @message_unread_total
+json.username @user.full_name
+json.real_name @user.real_name
+json.nickname @user.nickname
+json.gender @user.gender
+json.login @user.login
+json.user_id @user.id
+json.image_url url_to_avatar(@user)
+json.admin @user.admin?
+json.is_teacher @user.user_extension&.teacher?
+json.user_identity @user.identity
+json.tidding_count 0
+json.user_phone_binded @user.phone.present?
+# json.phone @user.phone
+# json.email @user.mail
+json.profile_completed @user.profile_is_completed?
+json.professional_certification @user.professional_certification
+json.devops_step @user.devops_step
+json.ci_certification @user.ci_certification?
+json.email @user.mail 
+json.province @user.province 
+json.city @user.city
+json.custom_department @user.custom_department
+json.description @user.description
+json.super_description @user.super_description
+json.(@user, :show_email, :show_department, :show_location, :show_super_description)
+json.message_unread_total @message_unread_total
+json.nps EduSetting.get("nps-on-off-switch").to_s == 'true' && UserNp.where(user_id: current_user.id).where("created_at >= ?", (Time.now - 30.days).beginning_of_day ).blank?
diff --git a/config/routes.rb b/config/routes.rb
index 5f8f9f74..1c0e4a49 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -82,6 +82,7 @@ Rails.application.routes.draw do
 
     resources :project_rank, only: [:index]
     resources :user_rank, only: [:index]
+    resources :nps, only: [:create]
 
     resources :statistic, only: [:index] do
       collection do
@@ -889,6 +890,9 @@ Rails.application.routes.draw do
       post :replace_image_url, on: :member
     end
     resources :faqs
+    resources :nps do
+      post :switch_change, on: :collection
+    end
     resources :laboratories, only: [:index, :create, :destroy, :update] do
       member do
         get :shixuns_for_select
diff --git a/db/migrate/20220826034622_create_user_nps.rb b/db/migrate/20220826034622_create_user_nps.rb
new file mode 100644
index 00000000..f9bcc70f
--- /dev/null
+++ b/db/migrate/20220826034622_create_user_nps.rb
@@ -0,0 +1,12 @@
+class CreateUserNps < ActiveRecord::Migration[5.2]
+  def change
+    create_table :user_nps do |t|
+      t.references :user
+      t.string :action_type
+      t.integer :action_id
+      t.float :score
+      t.text :memo
+      t.timestamps
+    end
+  end
+end

From 0a7995004655f471f6160141b0f9f55724fe29dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 31 Aug 2022 10:38:21 +0800
Subject: [PATCH 183/208] =?UTF-8?q?=E8=B0=83=E6=95=B4nps=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/nps_controller.rb | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/app/controllers/nps_controller.rb b/app/controllers/nps_controller.rb
index 2e1b552b..35dac164 100644
--- a/app/controllers/nps_controller.rb
+++ b/app/controllers/nps_controller.rb
@@ -1,28 +1,15 @@
 class NpsController < ApplicationController
 
+  # close,关闭
+  # createIssue,创建issue
+  # createPullRequest,创建PR
+  # auditPullRequest,审核PR
+  # indexProject,项目主页
+  # createProject,创建项目
+  # createOrganization,创建组织
   def create
-    tip_exception "缺少参数" if params[:action_id].blank?
-    action_type ||= begin
-                      case params[:action_id].to_s
-                      when '0' then
-                        'close'
-                      when '1' then
-                        'createIssue'
-                      when '2' then
-                        'createPullRequest'
-                      when '3' then
-                        'auditPullRequest'
-                      when '4' then
-                        'forkProject'
-                      when '5' then
-                        'createProject'
-                      when '6' then
-                        'createOrganization'
-                      else
-                        "#{params[:action_type].to_s}"
-                      end
-                    end
-    UserNp.create(:action_id => params[:action_id], :action_type => "#{action_type}", :user_id => User.current.id, :score => params[:score].to_f, memo: params[:memo])
+    tip_exception "缺少参数" if params[:action_id].blank? || params[:action_type].blank?
+    UserNp.create(:action_id => params[:action_id].to_i, :action_type => params[:action_type], :user_id => User.current.id, :score => params[:score].to_f, memo: params[:memo])
     render_ok
   end
 end

From 32a9d762d8dc3aa17b77281148399bd81e66d5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 31 Aug 2022 10:39:52 +0800
Subject: [PATCH 184/208] =?UTF-8?q?=E8=B0=83=E6=95=B4nps=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=8E=A5=E5=8F=A3,=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/nps_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/nps_controller.rb b/app/controllers/nps_controller.rb
index 35dac164..f16b2606 100644
--- a/app/controllers/nps_controller.rb
+++ b/app/controllers/nps_controller.rb
@@ -1,5 +1,7 @@
 class NpsController < ApplicationController
 
+  before_action :require_login
+
   # close,关闭
   # createIssue,创建issue
   # createPullRequest,创建PR

From d03b45eecf5f2a4c77846a88b3c18dc343256b89 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 6 Sep 2022 08:59:24 +0800
Subject: [PATCH 185/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=96=87=E4=BB=B6=E5=AF=B9=E5=88=86=E6=94=AF=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E8=BF=9B=E8=A1=8C=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/forms/contents/create_form.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/forms/contents/create_form.rb b/app/forms/contents/create_form.rb
index 6a029488..1e1b0f99 100644
--- a/app/forms/contents/create_form.rb
+++ b/app/forms/contents/create_form.rb
@@ -3,6 +3,8 @@ class Contents::CreateForm < BaseForm
 
   validates :filepath, presence: true
 
+  validates :branch, :new_branch, length: { maximum: 50 }
+
   validate :check_branch
 
   def check_branch

From 5acd45bf85674646af20ab49f68c45bd86973391 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 6 Sep 2022 09:00:05 +0800
Subject: [PATCH 186/208] =?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/forms/contents/create_form.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/forms/contents/create_form.rb b/app/forms/contents/create_form.rb
index 1e1b0f99..431199c5 100644
--- a/app/forms/contents/create_form.rb
+++ b/app/forms/contents/create_form.rb
@@ -3,7 +3,7 @@ class Contents::CreateForm < BaseForm
 
   validates :filepath, presence: true
 
-  validates :branch, :new_branch, length: { maximum: 50 }
+  validates :new_branch, length: { maximum: 50 }, message: "分支名称过长，仅支持50的长度"
 
   validate :check_branch
 

From 632ade9d259fbe1f214adf4cdff12a7a88390d0d Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 6 Sep 2022 09:02:30 +0800
Subject: [PATCH 187/208] =?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/forms/contents/create_form.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/forms/contents/create_form.rb b/app/forms/contents/create_form.rb
index 431199c5..71709026 100644
--- a/app/forms/contents/create_form.rb
+++ b/app/forms/contents/create_form.rb
@@ -3,7 +3,7 @@ class Contents::CreateForm < BaseForm
 
   validates :filepath, presence: true
 
-  validates :new_branch, length: { maximum: 50 }, message: "分支名称过长，仅支持50的长度"
+  validates :new_branch, length: { maximum: 50}
 
   validate :check_branch
 

From 4878d6662035306a9c8eb8c0db02236b0a13df77 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 6 Sep 2022 09:04:46 +0800
Subject: [PATCH 188/208] =?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/forms/contents/create_form.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/forms/contents/create_form.rb b/app/forms/contents/create_form.rb
index 71709026..73341661 100644
--- a/app/forms/contents/create_form.rb
+++ b/app/forms/contents/create_form.rb
@@ -3,7 +3,7 @@ class Contents::CreateForm < BaseForm
 
   validates :filepath, presence: true
 
-  validates :new_branch, length: { maximum: 50}
+  validates :new_branch, length: { maximum: 50, too_long: "分支名称过长，仅支持%{count}的长度"}
 
   validate :check_branch
 

From 925b05e004913a624e6fa1928a71ca0c6268190a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 5 Sep 2022 11:38:23 +0800
Subject: [PATCH 189/208] =?UTF-8?q?nps=E5=B7=B2=E6=89=93=E5=88=86=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/nps_controller.rb    | 1 +
 app/views/admins/nps/_user_np_list.html.erb | 2 +-
 app/views/admins/nps/index.html.erb         | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admins/nps_controller.rb b/app/controllers/admins/nps_controller.rb
index 4eacba4e..491e6277 100644
--- a/app/controllers/admins/nps_controller.rb
+++ b/app/controllers/admins/nps_controller.rb
@@ -7,6 +7,7 @@ class Admins::NpsController < Admins::BaseController
       sql = 'CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword OR users.login LIKE :keyword OR users.mail LIKE :keyword OR users.phone LIKE :keyword'
       @user_nps = @user_nps.where(sql, keyword: "%#{keyword}%")
     end
+    @user_nps = @user_nps.where("action_type != 'close'") if params[:done_score].present?
     @user_nps = paginate @user_nps.includes(:user)
   end
 
diff --git a/app/views/admins/nps/_user_np_list.html.erb b/app/views/admins/nps/_user_np_list.html.erb
index f4246c70..f2d5196e 100644
--- a/app/views/admins/nps/_user_np_list.html.erb
+++ b/app/views/admins/nps/_user_np_list.html.erb
@@ -21,7 +21,7 @@
         </td>
         <td><%= display_text(nps.created_at&.strftime('%Y-%m-%d %H:%M')) %></td>
         <td><%= display_text(nps.user.last_login_on&.strftime('%Y-%m-%d %H:%M')) %></td>
-        <td><%= nps.score %></td>
+        <td><%= nps.action_type == 'close' ? '--' : nps.score %></td>
         <td><%= nps.memo %></td>
       </tr>
     <% end %>
diff --git a/app/views/admins/nps/index.html.erb b/app/views/admins/nps/index.html.erb
index f599d00a..e36066cb 100644
--- a/app/views/admins/nps/index.html.erb
+++ b/app/views/admins/nps/index.html.erb
@@ -6,6 +6,10 @@
   <%= form_tag(admins_nps_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
 
     <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'ID/姓名/邮箱/手机号检索') %>
+    <label for="done_score">
+      是否管理员
+    </label>
+    <%= check_box_tag("done_score", true, false, id: "done_score", style: 'margin-left: 2px;') %>
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
 
     <span style="margin-left: 50px;margin-right: 10px;">NPS系统开关</span>

From 60894f00b1586285a4f459f50297bd8421984975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 5 Sep 2022 11:42:57 +0800
Subject: [PATCH 190/208] =?UTF-8?q?nps=E5=B7=B2=E6=89=93=E5=88=86=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admins/nps/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admins/nps/index.html.erb b/app/views/admins/nps/index.html.erb
index e36066cb..cc3eb94a 100644
--- a/app/views/admins/nps/index.html.erb
+++ b/app/views/admins/nps/index.html.erb
@@ -7,7 +7,7 @@
 
     <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'ID/姓名/邮箱/手机号检索') %>
     <label for="done_score">
-      是否管理员
+      是否已打分
     </label>
     <%= check_box_tag("done_score", true, false, id: "done_score", style: 'margin-left: 2px;') %>
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>

From a438ab6f3ef72dd82585db7f7bb0d55ef47e5fd4 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 6 Sep 2022 14:57:54 +0800
Subject: [PATCH 191/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=ADlocale=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/forms/contents/create_form.rb               | 2 +-
 config/locales/forms/create_file_form.zh-CN.yml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 config/locales/forms/create_file_form.zh-CN.yml

diff --git a/app/forms/contents/create_form.rb b/app/forms/contents/create_form.rb
index 73341661..ec60697d 100644
--- a/app/forms/contents/create_form.rb
+++ b/app/forms/contents/create_form.rb
@@ -3,7 +3,7 @@ class Contents::CreateForm < BaseForm
 
   validates :filepath, presence: true
 
-  validates :new_branch, length: { maximum: 50, too_long: "分支名称过长，仅支持%{count}的长度"}
+  validates :new_branch, length: { maximum: 100, too_long: "过长，仅支持%{count}的长度"}
 
   validate :check_branch
 
diff --git a/config/locales/forms/create_file_form.zh-CN.yml b/config/locales/forms/create_file_form.zh-CN.yml
new file mode 100644
index 00000000..0f9ea86a
--- /dev/null
+++ b/config/locales/forms/create_file_form.zh-CN.yml
@@ -0,0 +1,5 @@
+'zh-CN':
+  activemodel:
+    attributes:
+      contents/create_form:
+        new_branch: 分支名称
\ No newline at end of file

From b1f460d760b86d157389c5967ceee2b884a24441 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 8 Sep 2022 10:40:52 +0800
Subject: [PATCH 192/208] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Awebhook?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E4=B8=BA?=
 =?UTF-8?q?50=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects/webhooks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/projects/webhooks_controller.rb b/app/controllers/projects/webhooks_controller.rb
index 9f36da20..675a65fc 100644
--- a/app/controllers/projects/webhooks_controller.rb
+++ b/app/controllers/projects/webhooks_controller.rb
@@ -9,7 +9,7 @@ class Projects::WebhooksController < Projects::BaseController
 
   def create 
     ActiveRecord::Base.transaction do
-      return render_error("webhooks数量已到上限！请删除暂不使用的webhooks以进行添加操作") if @project.webhooks.size > 19
+      return render_error("webhooks数量已到上限！请删除暂不使用的webhooks以进行添加操作") if @project.webhooks.size > 49
       return render_error("参数错误.") unless webhook_params.present?
       form =  Projects::Webhooks::CreateForm.new(webhook_params)
       return  render json: {status: -1, message: form.errors} unless form.validate!

From 4bd77a870b8f966073153f0f295e4415db6407ba Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 8 Sep 2022 14:19:08 +0800
Subject: [PATCH 193/208] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Awebhook?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E4=B8=BA?=
 =?UTF-8?q?50=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/projects/webhooks_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/api/v1/projects/webhooks_controller.rb b/app/controllers/api/v1/projects/webhooks_controller.rb
index 1dec26d2..00a28100 100644
--- a/app/controllers/api/v1/projects/webhooks_controller.rb
+++ b/app/controllers/api/v1/projects/webhooks_controller.rb
@@ -10,6 +10,7 @@ class Api::V1::Projects::WebhooksController < Api::V1::BaseController
   end
 
   def create 
+    return render_error("webhooks数量已到上限！请删除暂不使用的webhooks以进行添加操作") if @project.webhooks.size > 49
     @result_object = Api::V1::Projects::Webhooks::CreateService.call(@project, create_webhook_params, current_user&.gitea_token)
   end
 

From 383660c778ee1bc08f86e587613583559d4fa829 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 15 Sep 2022 09:38:28 +0800
Subject: [PATCH 194/208] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=BC=93=E5=AD=98=E4=BF=A1=E6=81=AF=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E6=94=B9=E5=9C=A8=E6=8E=A7=E5=88=B6=E5=99=A8=E9=87=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations/organizations_controller.rb | 2 ++
 app/models/organization.rb                                | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb
index 58aa0d29..0ae11359 100644
--- a/app/controllers/organizations/organizations_controller.rb
+++ b/app/controllers/organizations/organizations_controller.rb
@@ -31,6 +31,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
       Organizations::CreateForm.new(organization_params.merge(original_name: "")).validate!
       @organization = Organizations::CreateService.call(current_user, organization_params)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
+      Cache::V2::OwnerCommonService.new(@organization.id).reset
     end
   rescue Exception => e
     uid_logger_error(e.message)
@@ -48,6 +49,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
       
       Gitea::Organization::UpdateService.call(current_user.gitea_token, login, @organization.reload)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
+      Cache::V2::OwnerCommonService.new(@organization.id).reset
     end
   rescue Exception => e
     uid_logger_error(e.message)
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 56351a41..adf43a2c 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -81,15 +81,15 @@ class Organization < Owner
 
   scope :with_visibility, ->(visibility) { joins(:organization_extension).where(organization_extensions: {visibility: visibility}) if visibility.present? }
 
-  after_save :reset_cache_data
+  # after_save :reset_cache_data
 
   def gitea_token 
     team_users.joins(:team).where(teams: {authorize: "owner"}).take&.user&.gitea_token
   end
 
-  def reset_cache_data
-    Cache::V2::OwnerCommonService.new(self.id).reset
-  end
+  # def reset_cache_data
+  #   Cache::V2::OwnerCommonService.new(self.id).reset
+  # end
 
   def self.build(name, nickname, gitea_token=nil)
     self.create!(login: name, nickname: nickname, gitea_token: gitea_token)

From 733f64eaec316717e8bdd26d18ee41ef2748e513 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 15 Sep 2022 09:44:12 +0800
Subject: [PATCH 195/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=96=B0=E5=A2=9E=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=95=B0=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/commit_log.rb                        | 11 +++++++++++
 app/services/cache/v2/project_common_service.rb | 17 ++++++++++++++++-
 .../cache/v2/project_date_rank_service.rb       |  9 +++++++--
 app/services/cache/v2/project_rank_service.rb   | 10 +++++++---
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/app/models/commit_log.rb b/app/models/commit_log.rb
index 9b51b063..326872b3 100644
--- a/app/models/commit_log.rb
+++ b/app/models/commit_log.rb
@@ -3,4 +3,15 @@ class CommitLog < ApplicationRecord
   belongs_to :project
   belongs_to :repository
 
+  after_create :incre_project_common
+  after_destroy :decre_project_common
+
+  def incre_project_common
+    CacheAsyncSetJob.perform_later("project_common_service", {commits: 1}, self.project_id)
+  end
+
+  def decre_project_common
+    CacheAsyncSetJob.perform_later("project_common_service", {commits: -1}, self.project_id)
+  end
+
 end
diff --git a/app/services/cache/v2/project_common_service.rb b/app/services/cache/v2/project_common_service.rb
index 8ed0a063..97023ae2 100644
--- a/app/services/cache/v2/project_common_service.rb
+++ b/app/services/cache/v2/project_common_service.rb
@@ -1,5 +1,5 @@
 class Cache::V2::ProjectCommonService < ApplicationService 
-  attr_reader :project_id, :owner_id, :name, :identifier, :description, :visits, :watchers, :praises, :forks, :issues, :pullrequests
+  attr_reader :project_id, :owner_id, :name, :identifier, :description, :visits, :watchers, :praises, :forks, :issues, :pullrequests, :commits
   attr_accessor :project
 
   def initialize(project_id, params={})
@@ -14,6 +14,7 @@ class Cache::V2::ProjectCommonService < ApplicationService
     @forks = params[:forks]
     @issues = params[:issues]
     @pullrequests = params[:pullrequests]
+    @commits = params[:commits]
   end
 
   def read 
@@ -81,6 +82,10 @@ class Cache::V2::ProjectCommonService < ApplicationService
     "pullrequests"
   end
 
+  def commits_key 
+    "commits"
+  end
+
   def project_common
     result = $redis_cache.hgetall(project_common_key)
     result.blank? ? reset_project_common : result
@@ -149,6 +154,11 @@ class Cache::V2::ProjectCommonService < ApplicationService
         Cache::V2::ProjectRankService.call(@project_id, {pullrequests: @pullrequests})
         Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {pullrequests: @pullrequests})
       end
+      if @commits.present?
+        $redis_cache.hincrby(project_common_key, commits_key, @commits)
+        Cache::V2::ProjectRankService.call(@project_id, {commits: @commits})
+        Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {commits: @commits})
+      end
     end
     
     $redis_cache.hgetall(project_common_key)
@@ -194,6 +204,10 @@ class Cache::V2::ProjectCommonService < ApplicationService
     $redis_cache.hset(project_common_key, pullrequests_key, PullRequest.where(project_id: @project_id).count)
   end
 
+  def reset_project_commits 
+    $redis_cache.hset(project_common_key, commits_key, CommitLog.where(project_id: @project_id).count)
+  end
+
   def reset_project_common
     load_project
     return unless @project.present?
@@ -209,6 +223,7 @@ class Cache::V2::ProjectCommonService < ApplicationService
     reset_project_forks
     reset_project_issues
     reset_project_pullrequests
+    reset_project_commits
 
     $redis_cache.hgetall(project_common_key)
   end
diff --git a/app/services/cache/v2/project_date_rank_service.rb b/app/services/cache/v2/project_date_rank_service.rb
index 092aff79..08aae6f7 100644
--- a/app/services/cache/v2/project_date_rank_service.rb
+++ b/app/services/cache/v2/project_date_rank_service.rb
@@ -1,5 +1,6 @@
+# 项目日活跃度计算存储
 class Cache::V2::ProjectDateRankService < ApplicationService 
-  attr_reader :project_id, :rank_date, :visits, :praises, :forks, :issues, :pullrequests
+  attr_reader :project_id, :rank_date, :visits, :praises, :forks, :issues, :pullrequests, :commits
   attr_accessor :project_common
 
   def initialize(project_id, rank_date=Date.today, params={})
@@ -10,6 +11,7 @@ class Cache::V2::ProjectDateRankService < ApplicationService
     @forks = params[:forks]
     @issues = params[:issues]
     @pullrequests = params[:pullrequests]
+    @commits = params[:commits]
   end
 
   def read 
@@ -37,7 +39,7 @@ class Cache::V2::ProjectDateRankService < ApplicationService
       $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) 
     end
     if @forks.present?
-      $redis_cache.zincrby(project_rank_key, @forks.to_i * 5, @project_id) 
+      $redis_cache.zincrby(project_rank_key, @forks.to_i * 10, @project_id) 
     end
     if @issues.present?
       $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) 
@@ -45,6 +47,9 @@ class Cache::V2::ProjectDateRankService < ApplicationService
     if @pullrequests.present?
       $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) 
     end
+    if @commits.present? 
+      $redis_cache.zincrby(project_rank_key, @commits.to_i * 1, @project_id)
+    end
 
     $redis_cache.zscore(project_rank_key, @project_id)
   end
diff --git a/app/services/cache/v2/project_rank_service.rb b/app/services/cache/v2/project_rank_service.rb
index 7e5d323b..3265c0a6 100644
--- a/app/services/cache/v2/project_rank_service.rb
+++ b/app/services/cache/v2/project_rank_service.rb
@@ -1,5 +1,5 @@
 class Cache::V2::ProjectRankService < ApplicationService 
-  attr_reader :project_id, :visits, :praises, :forks, :issues, :pullrequests
+  attr_reader :project_id, :visits, :praises, :forks, :issues, :pullrequests, :commits
   attr_accessor :project_common
 
   def initialize(project_id, params={})
@@ -9,6 +9,7 @@ class Cache::V2::ProjectRankService < ApplicationService
     @forks = params[:forks]
     @issues = params[:issues]
     @pullrequests = params[:pullrequests]
+    @commits = params[:commits]
   end
 
   def read 
@@ -54,7 +55,7 @@ class Cache::V2::ProjectRankService < ApplicationService
         $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) 
       end
       if @forks.present?
-        $redis_cache.zincrby(project_rank_key, @forks.to_i * 5, @project_id) 
+        $redis_cache.zincrby(project_rank_key, @forks.to_i * 10, @project_id) 
       end
       if @issues.present?
         $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) 
@@ -62,6 +63,9 @@ class Cache::V2::ProjectRankService < ApplicationService
       if @pullrequests.present?
         $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) 
       end
+      if @commits.present?
+        $redis_cache.zincrby(project_rank_key, @commits.to_i * 1, @project_id)
+      end
       reset_user_project_rank
     end
 
@@ -70,7 +74,7 @@ class Cache::V2::ProjectRankService < ApplicationService
 
   def reset_project_rank
     load_project_common
-    score = @project_common["visits"].to_i * 1 + @project_common["praises"].to_i * 5 + @project_common["forks"].to_i * 5 + @project_common["issues"].to_i * 10 + @project_common["pullrequests"].to_i * 10
+    score = @project_common["visits"].to_i * 1 + @project_common["praises"].to_i * 5 + @project_common["forks"].to_i * 10 + @project_common["issues"].to_i * 10 + @project_common["pullrequests"].to_i * 10 + @project_common["commits"].to_i * 1
     $redis_cache.zadd(project_rank_key, score, @project_id) 
     reset_user_project_rank
 

From 481d1b7db0f77780c6ba168354a34371a8a0d959 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 15 Sep 2022 09:57:28 +0800
Subject: [PATCH 196/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Acommit=20log?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A7=A6=E5=8F=91=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/commit_logs_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb
index 3be1794a..cc071340 100644
--- a/app/controllers/commit_logs_controller.rb
+++ b/app/controllers/commit_logs_controller.rb
@@ -22,6 +22,8 @@ class CommitLogsController < ApplicationController
       CommitLog.create(user: user, project: project, repository_id: repository_id,
                        name: repository_name, full_name: repository_full_name,
                        ref: ref, commit_id: commit_id, message: message)
+      # 统计数据新增
+      CacheAsyncSetJob.perform_later("project_common_service", {commits: 1}, project.id)
     end
 
   end

From 007b90c28450823ba6517cd1efcc1c036de41e96 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 15 Sep 2022 10:00:00 +0800
Subject: [PATCH 197/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A7=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/commit_log.rb | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/models/commit_log.rb b/app/models/commit_log.rb
index 326872b3..9b51b063 100644
--- a/app/models/commit_log.rb
+++ b/app/models/commit_log.rb
@@ -3,15 +3,4 @@ class CommitLog < ApplicationRecord
   belongs_to :project
   belongs_to :repository
 
-  after_create :incre_project_common
-  after_destroy :decre_project_common
-
-  def incre_project_common
-    CacheAsyncSetJob.perform_later("project_common_service", {commits: 1}, self.project_id)
-  end
-
-  def decre_project_common
-    CacheAsyncSetJob.perform_later("project_common_service", {commits: -1}, self.project_id)
-  end
-
 end

From 6d7b7dd0588c4628060ae7cc122aea21387abfd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 19 Sep 2022 10:06:49 +0800
Subject: [PATCH 198/208] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 531095b4..e7b5af5d 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -111,7 +111,9 @@ class AccountsController < ApplicationController
 
     sync_params = {
       password: params[:password].to_s,
-      email: @user.mail
+      email: @user.mail,
+      login_name: @user.login,
+      source_id: 0
     }
 
     interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)

From bb8e6aeaf8d3581a6f6f3895c2a31016b08dfef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 20 Sep 2022 09:41:27 +0800
Subject: [PATCH 199/208] =?UTF-8?q?nps=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/nps_controller.rb |  3 +++
 app/views/admins/nps/index.html.erb      | 23 +++++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admins/nps_controller.rb b/app/controllers/admins/nps_controller.rb
index 491e6277..8b3d828f 100644
--- a/app/controllers/admins/nps_controller.rb
+++ b/app/controllers/admins/nps_controller.rb
@@ -8,6 +8,9 @@ class Admins::NpsController < Admins::BaseController
       @user_nps = @user_nps.where(sql, keyword: "%#{keyword}%")
     end
     @user_nps = @user_nps.where("action_type != 'close'") if params[:done_score].present?
+    @min_score = @user_nps.where("action_type != 'close'").minimum("score")
+    @max_score = @user_nps.where("action_type != 'close'").maximum("score")
+    @score_total_count = UserNp.where("action_type !='close'").count
     @user_nps = paginate @user_nps.includes(:user)
   end
 
diff --git a/app/views/admins/nps/index.html.erb b/app/views/admins/nps/index.html.erb
index cc3eb94a..5c083f33 100644
--- a/app/views/admins/nps/index.html.erb
+++ b/app/views/admins/nps/index.html.erb
@@ -13,12 +13,31 @@
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
 
     <span style="margin-left: 50px;margin-right: 10px;">NPS系统开关</span>
-    <input type="checkbox" <% if @on_off_switch %>checked<%end %> data-toggle="toggle" data-onstyle="primary" id="nps_toggle" data-on="开" data-off="关" data-size="small">
+    <input type="checkbox"
+           <% if @on_off_switch %>checked
+           <% end %> data-toggle="toggle" data-onstyle="primary" id="nps_toggle" data-on="开" data-off="关" data-size="small">
 
   <% end %>
 
 </div>
-
+<div class="box py-0 pt-4 pl-4 daily-school-statistic-title" >
+  <p style="font-weight: bold">数据统计：</p>
+  <p>
+    评分用户数/用户总数：<span class="text-danger"><%= @score_total_count %>/<%= UserNp.count %></span>，
+    平均评分：<span class="text-danger"><%= UserNp.where("action_type !='close'").average(:score).to_f.round(1) %></span>，
+    <% @user_nps_mid = @score_total_count % 2 == 0 ? @score_total_count / 2 : (@score_total_count + 1) / 2 %>
+    评分中位数：<span class="text-danger"><%= UserNp.where("action_type !='close'").order("score").pluck(:score)[@user_nps_mid - 1].to_i %></span>，
+    最低评分/评分人数：<span class="text-danger"><%=@min_score.to_i %>/<%= UserNp.where("action_type !='close'").where(score: @min_score).count %></span>，
+    最高评分/评分人数：<span class="text-danger"><%=@max_score.to_i %>/<%= UserNp.where("action_type !='close'").where(score: @max_score).count %></span>
+  </p>
+  <p style="padding-bottom: 10px !important;">
+    填写意见用户数/用户总数：<span class="text-danger"><%= UserNp.where("memo is not null").count %>/<%= UserNp.count %></span>，
+    期待更加丰富的功能：<span class="text-danger"><%= UserNp.where("memo like '%期待更加丰富的功能%'").count %></span>，
+    希望有新手引导：<span class="text-danger"><%= UserNp.where("memo like '%希望有新手引导%'").count %></span>，
+    提升用户体验：<span class="text-danger"><%= UserNp.where("memo like '%用户体验需进一步提升%'").count %></span>，
+    其他：<span class="text-danger"><%= UserNp.where("memo is not null").where.not(id: UserNp.where("memo like '%期待更加丰富的功能%' or memo like '%希望有新手引导%' or memo like '%用户体验需进一步提升%' ").ids).count %></span>
+  </p>
+</div>
 <div class="box admin-list-container users-list-container">
   <%= render partial: 'admins/nps/user_np_list', locals: { user_nps: @user_nps } %>
 </div>

From 6954a860af42d5530c1bcf6738a1501ac4bdb740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 20 Sep 2022 09:47:29 +0800
Subject: [PATCH 200/208] =?UTF-8?q?fixed=20nps=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admins/nps/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admins/nps/index.html.erb b/app/views/admins/nps/index.html.erb
index 5c083f33..680b9ceb 100644
--- a/app/views/admins/nps/index.html.erb
+++ b/app/views/admins/nps/index.html.erb
@@ -31,7 +31,7 @@
     最高评分/评分人数：<span class="text-danger"><%=@max_score.to_i %>/<%= UserNp.where("action_type !='close'").where(score: @max_score).count %></span>
   </p>
   <p style="padding-bottom: 10px !important;">
-    填写意见用户数/用户总数：<span class="text-danger"><%= UserNp.where("memo is not null").count %>/<%= UserNp.count %></span>，
+    填写意见用户数/用户总数：<span class="text-danger"><%= UserNp.where("LENGTH(memo) >0").count %>/<%= UserNp.count %></span>，
     期待更加丰富的功能：<span class="text-danger"><%= UserNp.where("memo like '%期待更加丰富的功能%'").count %></span>，
     希望有新手引导：<span class="text-danger"><%= UserNp.where("memo like '%希望有新手引导%'").count %></span>，
     提升用户体验：<span class="text-danger"><%= UserNp.where("memo like '%用户体验需进一步提升%'").count %></span>，

From 2adf87a289ab21e9e03e4df4b5d7d7d25b545734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 20 Sep 2022 09:52:40 +0800
Subject: [PATCH 201/208] =?UTF-8?q?fixed=20nps=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admins/nps/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admins/nps/index.html.erb b/app/views/admins/nps/index.html.erb
index 680b9ceb..c7c20837 100644
--- a/app/views/admins/nps/index.html.erb
+++ b/app/views/admins/nps/index.html.erb
@@ -35,7 +35,7 @@
     期待更加丰富的功能：<span class="text-danger"><%= UserNp.where("memo like '%期待更加丰富的功能%'").count %></span>，
     希望有新手引导：<span class="text-danger"><%= UserNp.where("memo like '%希望有新手引导%'").count %></span>，
     提升用户体验：<span class="text-danger"><%= UserNp.where("memo like '%用户体验需进一步提升%'").count %></span>，
-    其他：<span class="text-danger"><%= UserNp.where("memo is not null").where.not(id: UserNp.where("memo like '%期待更加丰富的功能%' or memo like '%希望有新手引导%' or memo like '%用户体验需进一步提升%' ").ids).count %></span>
+    其他：<span class="text-danger"><%= UserNp.where("action_type !='close'").where("memo is not null").where.not(id: UserNp.where("memo like '%期待更加丰富的功能%' or memo like '%希望有新手引导%' or memo like '%用户体验需进一步提升%' ").ids).count %></span>
   </p>
 </div>
 <div class="box admin-list-container users-list-container">

From ff881732d29c177062e7a80dfa78b571a3287ef9 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 21 Sep 2022 09:54:49 +0800
Subject: [PATCH 202/208] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=B7=B2=E8=AE=BE=E7=BD=AE=E8=AF=AD=E8=A8=80=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E4=B8=8D=E9=87=8D=E6=96=B0=E8=AE=BE=E7=BD=AE=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/concerns/repository/languages_percentagable.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/concerns/repository/languages_percentagable.rb b/app/controllers/concerns/repository/languages_percentagable.rb
index 53876327..8f5d6ff2 100644
--- a/app/controllers/concerns/repository/languages_percentagable.rb
+++ b/app/controllers/concerns/repository/languages_percentagable.rb
@@ -11,6 +11,7 @@ module Repository::LanguagesPercentagable
   end
 
   def update_project_language(language)
+    return if @project.language.present?
     db_language = ProjectLanguage.find_or_create_by!(name: language.keys.first.downcase.upcase_first)
     @project.update_column(:project_language_id, db_language.id)
   rescue 

From 70f1e6827f18a9749b36136ec9da808d9d2e3f27 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 21 Sep 2022 10:06:29 +0800
Subject: [PATCH 203/208] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=B7=B2=E8=AE=BE=E7=BD=AE=E8=AF=AD=E8=A8=80=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E4=B8=8D=E9=87=8D=E6=96=B0=E8=AE=BE=E7=BD=AE=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/concerns/repository/languages_percentagable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/concerns/repository/languages_percentagable.rb b/app/controllers/concerns/repository/languages_percentagable.rb
index 8f5d6ff2..83374dad 100644
--- a/app/controllers/concerns/repository/languages_percentagable.rb
+++ b/app/controllers/concerns/repository/languages_percentagable.rb
@@ -11,7 +11,7 @@ module Repository::LanguagesPercentagable
   end
 
   def update_project_language(language)
-    return if @project.language.present?
+    return if @project.project_language.present?
     db_language = ProjectLanguage.find_or_create_by!(name: language.keys.first.downcase.upcase_first)
     @project.update_column(:project_language_id, db_language.id)
   rescue 

From cc426833165934ade919c6ac5043c3a17bf794fc Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 23 Sep 2022 10:07:52 +0800
Subject: [PATCH 204/208] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=B4=BB?=
 =?UTF-8?q?=E8=B7=83=E5=BA=A6=E8=AE=A1=E7=AE=97=E8=AE=BF=E9=97=AE=E9=87=8F?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb    |  9 ++++--
 app/models/timeable_visit_record.rb           | 28 +++++++++++++++++++
 ...923012923_create_timeable_visit_records.rb | 13 +++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 app/models/timeable_visit_record.rb
 create mode 100644 db/migrate/20220923012923_create_timeable_visit_records.rb

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 32bb1f0e..5ee1fdde 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -47,8 +47,13 @@ class RepositoriesController < ApplicationController
   end
 
   def entries
-    @project.increment!(:visits)
-    CacheAsyncSetJob.perform_later("project_common_service", {visits: 1}, @project.id)
+    @week_project_visit_record, @month_project_visit_record = TimeableVisitRecord.build(@project.id)
+    if  @week_project_visit_record.visits < 300 &&  @month_project_visit_record.visits < 1000 
+      @week_project_visit_record.increment!(:visits)
+      @month_project_visit_record.increment!(:visits)
+      @project.increment!(:visits)
+      CacheAsyncSetJob.perform_later("project_common_service", {visits: 1}, @project.id)
+    end
     if @project.educoder?
       @entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder.repo_name)
     else
diff --git a/app/models/timeable_visit_record.rb b/app/models/timeable_visit_record.rb
new file mode 100644
index 00000000..974e785e
--- /dev/null
+++ b/app/models/timeable_visit_record.rb
@@ -0,0 +1,28 @@
+# == Schema Information
+#
+# Table name: timeable_visit_records
+#
+#  id         :integer          not null, primary key
+#  time       :string(255)
+#  project_id :integer
+#  visits     :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_timeable_visit_records_on_project_id  (project_id)
+#  index_timeable_visit_records_on_time        (time)
+#
+
+class TimeableVisitRecord < ApplicationRecord
+
+  belongs_to :project
+
+  def self.build(project_id)
+    week = TimeableVisitRecord.find_or_create_by!(time: Date.today.cweek, project_id: project_id)
+    month = TimeableVisitRecord.find_or_create_by!(time: Date.today.strftime("%Y%m"), project_id: project_id)
+
+    return week, month
+  end
+end
diff --git a/db/migrate/20220923012923_create_timeable_visit_records.rb b/db/migrate/20220923012923_create_timeable_visit_records.rb
new file mode 100644
index 00000000..ec105d20
--- /dev/null
+++ b/db/migrate/20220923012923_create_timeable_visit_records.rb
@@ -0,0 +1,13 @@
+class CreateTimeableVisitRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :timeable_visit_records do |t|
+      t.string :time
+      t.references :project
+      t.integer :visits, default: 0
+
+      t.timestamps
+    end
+
+    add_index :timeable_visit_records, :time
+  end
+end

From ef9592ef301f51267d4910c3b3ce520d482cbd09 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 23 Sep 2022 10:28:12 +0800
Subject: [PATCH 205/208] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=B4=BB?=
 =?UTF-8?q?=E8=B7=83=E5=BA=A6=E7=AE=97=E6=B3=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/cache/v2/project_common_service.rb    |  2 ++
 app/services/cache/v2/project_date_rank_service.rb |  8 ++++++--
 app/services/cache/v2/project_rank_service.rb      | 10 +++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/services/cache/v2/project_common_service.rb b/app/services/cache/v2/project_common_service.rb
index 97023ae2..0d167c2a 100644
--- a/app/services/cache/v2/project_common_service.rb
+++ b/app/services/cache/v2/project_common_service.rb
@@ -133,6 +133,8 @@ class Cache::V2::ProjectCommonService < ApplicationService
       end
       if @watchers.present?
         $redis_cache.hincrby(project_common_key, watchers_key, @watchers) 
+        Cache::V2::ProjectRankService.call(@project_id, {watchers: @watchers})
+        Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {watchers: @watchers})
       end
       if @praises.present?
         $redis_cache.hincrby(project_common_key, praises_key, @praises) 
diff --git a/app/services/cache/v2/project_date_rank_service.rb b/app/services/cache/v2/project_date_rank_service.rb
index 08aae6f7..9d8ffca9 100644
--- a/app/services/cache/v2/project_date_rank_service.rb
+++ b/app/services/cache/v2/project_date_rank_service.rb
@@ -7,6 +7,7 @@ class Cache::V2::ProjectDateRankService < ApplicationService
     @project_id = project_id
     @rank_date = rank_date
     @visits = params[:visits]
+    @watchers = params[:watchers]
     @praises = params[:praises]
     @forks = params[:forks]
     @issues = params[:issues]
@@ -35,6 +36,9 @@ class Cache::V2::ProjectDateRankService < ApplicationService
     if @visits.present?
       $redis_cache.zincrby(project_rank_key, @visits.to_i * 1, @project_id) 
     end
+    if @watchers.present?
+      $redis_cache.zincrby(project_rank_key, @watchers.to_i * 5, @project_id) 
+    end
     if @praises.present?
       $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) 
     end
@@ -42,13 +46,13 @@ class Cache::V2::ProjectDateRankService < ApplicationService
       $redis_cache.zincrby(project_rank_key, @forks.to_i * 10, @project_id) 
     end
     if @issues.present?
-      $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) 
+      $redis_cache.zincrby(project_rank_key, @issues.to_i * 5, @project_id) 
     end
     if @pullrequests.present?
       $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) 
     end
     if @commits.present? 
-      $redis_cache.zincrby(project_rank_key, @commits.to_i * 1, @project_id)
+      $redis_cache.zincrby(project_rank_key, @commits.to_i * 5, @project_id)
     end
 
     $redis_cache.zscore(project_rank_key, @project_id)
diff --git a/app/services/cache/v2/project_rank_service.rb b/app/services/cache/v2/project_rank_service.rb
index 3265c0a6..b88c416c 100644
--- a/app/services/cache/v2/project_rank_service.rb
+++ b/app/services/cache/v2/project_rank_service.rb
@@ -5,6 +5,7 @@ class Cache::V2::ProjectRankService < ApplicationService
   def initialize(project_id, params={})
     @project_id = project_id
     @visits = params[:visits]
+    @watchers = params[:watchers]
     @praises = params[:praises]
     @forks = params[:forks]
     @issues = params[:issues]
@@ -51,6 +52,9 @@ class Cache::V2::ProjectRankService < ApplicationService
       if @visits.present?
         $redis_cache.zincrby(project_rank_key, @visits.to_i * 1, @project_id) 
       end
+      if @watchers.present?
+        $redis_cache.zincrby(project_rank_key, @watchers.to_i * 5, @project_id) 
+      end
       if @praises.present?
         $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) 
       end
@@ -58,13 +62,13 @@ class Cache::V2::ProjectRankService < ApplicationService
         $redis_cache.zincrby(project_rank_key, @forks.to_i * 10, @project_id) 
       end
       if @issues.present?
-        $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) 
+        $redis_cache.zincrby(project_rank_key, @issues.to_i * 5, @project_id) 
       end
       if @pullrequests.present?
         $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) 
       end
       if @commits.present?
-        $redis_cache.zincrby(project_rank_key, @commits.to_i * 1, @project_id)
+        $redis_cache.zincrby(project_rank_key, @commits.to_i * 5, @project_id)
       end
       reset_user_project_rank
     end
@@ -74,7 +78,7 @@ class Cache::V2::ProjectRankService < ApplicationService
 
   def reset_project_rank
     load_project_common
-    score = @project_common["visits"].to_i * 1 + @project_common["praises"].to_i * 5 + @project_common["forks"].to_i * 10 + @project_common["issues"].to_i * 10 + @project_common["pullrequests"].to_i * 10 + @project_common["commits"].to_i * 1
+    score = @project_common["visits"].to_i * 1 + @project_common["watchers"].to_i * 5  + @project_common["praises"].to_i * 5 + @project_common["forks"].to_i * 10 + @project_common["issues"].to_i * 5 + @project_common["pullrequests"].to_i * 10 + @project_common["commits"].to_i * 5
     $redis_cache.zadd(project_rank_key, score, @project_id) 
     reset_user_project_rank
 

From d7f3a21addaf53da05a07759e3ab2864bc00c973 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 23 Sep 2022 17:56:39 +0800
Subject: [PATCH 206/208] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=91=A8?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E9=9C=80=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E5=B9=B4=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/timeable_visit_record.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/timeable_visit_record.rb b/app/models/timeable_visit_record.rb
index 974e785e..8411ddf6 100644
--- a/app/models/timeable_visit_record.rb
+++ b/app/models/timeable_visit_record.rb
@@ -20,7 +20,7 @@ class TimeableVisitRecord < ApplicationRecord
   belongs_to :project
 
   def self.build(project_id)
-    week = TimeableVisitRecord.find_or_create_by!(time: Date.today.cweek, project_id: project_id)
+    week = TimeableVisitRecord.find_or_create_by!(time: Date.today.strftime("%Y-%W"), project_id: project_id)
     month = TimeableVisitRecord.find_or_create_by!(time: Date.today.strftime("%Y%m"), project_id: project_id)
 
     return week, month

From dfc2edd62d5e2d10260d63475123f337c468e4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 26 Sep 2022 10:38:28 +0800
Subject: [PATCH 207/208] =?UTF-8?q?fixed=E6=B3=A8=E5=86=8Cgitea=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/concerns/register_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/concerns/register_helper.rb b/app/controllers/concerns/register_helper.rb
index 3d5b0fc0..069c0944 100644
--- a/app/controllers/concerns/register_helper.rb
+++ b/app/controllers/concerns/register_helper.rb
@@ -12,6 +12,7 @@ module RegisterHelper
     return unless user.valid?
 
     interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
+    result ={}
     if interactor.success?
       gitea_user = interactor.result
       result = Gitea::User::GenerateTokenService.call(username, password)
@@ -22,7 +23,7 @@ module RegisterHelper
         result[:user] = {id: user.id, token: user.gitea_token}
       end
     else
-      result[:message] = interactor.error
+      result[:message] = interactor.result[:message]
     end
     result
   end

From fce8166ba7f082c4e4cd0fa3c2adc0dfe7a0d280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 26 Sep 2022 16:11:34 +0800
Subject: [PATCH 208/208] =?UTF-8?q?fixed=20=E7=94=A8=E6=88=B7=E6=B4=BB?=
 =?UTF-8?q?=E8=B7=83=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/dashboards_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb
index fac44cca..a3fc230a 100644
--- a/app/controllers/admins/dashboards_controller.rb
+++ b/app/controllers/admins/dashboards_controller.rb
@@ -1,9 +1,9 @@
 class Admins::DashboardsController < Admins::BaseController
   def index
     # 用户活跃数
-    day_user_ids = CommitLog.where(created_at: today).pluck(:project_id).uniq
-    weekly_user_ids = CommitLog.where(created_at: current_week).pluck(:project_id).uniq
-    month_user_ids = CommitLog.where(created_at: current_month).pluck(:project_id).uniq
+    day_user_ids = CommitLog.where(created_at: today).pluck(:user_id).uniq
+    weekly_user_ids = CommitLog.where(created_at: current_week).pluck(:user_id).uniq
+    month_user_ids = CommitLog.where(created_at: current_month).pluck(:user_id).uniq
     @active_user_count = User.where(last_login_on: today).or(User.where(id: day_user_ids)).count
     @weekly_active_user_count = User.where(last_login_on: current_week).or(User.where(id: weekly_user_ids)).count
     @month_active_user_count = User.where(last_login_on: current_month).or(User.where(id: month_user_ids)).count