发布v3.1.1版本

* FIX 修复pulls、issues 搜索数量统计问题 * FIX 解决在线创建文件错误提示信息不准确的问题 * FIX table name bug * FIX 解决applied_projects相关表操作的问题 * FIX 解决排序参数的判断预防SQL注入 * FIX 项目导航栏数量改为开启中的数量 * FIX 解决项目邀请码的索引查询问题 * FIX FIX get readme file bug * FIX sql attack * FIX projects load by invite code slowly
v3.1.0
2021-06-18 17:09:57 +08:00 · 2021-06-09 09:52:57 +08:00 · 2021-05-24 10:18:03 +08:00 · 2021-05-24 10:10:24 +08:00 · 2021-05-08 17:46:22 +08:00
71 changed files with 238 additions and 1164 deletions
--- a/.gitignore
+++ b/.gitignore
@ -74,7 +74,6 @@ vendor/bundle/
 /log
 /public/admin
 /mysql_data
 /public/repo/
 .generators
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -771,7 +771,7 @@ class ApplicationController < ActionController::Base
 	end
 	def base_url
-		Rails.application.config_for(:configuration)['platform_url'] || request.base_url
+		request.base_url
 	end
 	def convert_image!
--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@ -6,48 +6,26 @@ class CompareController < ApplicationController
  end
  def show
    load_compare_params
    compare
    @merge_status, @merge_message = get_merge_message
  end
  private
  def get_merge_message 
    if @base.blank? || @head.blank?
      return -2, "请选择分支"
    else
      if @head.include?(":")
        fork_project = @project.forked_projects.joins(:owner).where(users: {login: @head.to_s.split("/")[0]}).take
        return -2, "请选择正确的仓库" unless fork_project.present?
        @exist_pullrequest = @project.pull_requests.where(is_original: true, head: @head.to_s.split(":")[1], base: @base, status: 0, fork_project_id: fork_project.id).take
      else 
        @exist_pullrequest = @project.pull_requests.where(is_original: false, head: @base, base: @head, status: 0).take
      end
      if @exist_pullrequest.present?
        return -2, "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{@exist_pullrequest.id}/Messagecount'>#{@exist_pullrequest.try(:title)}</a>"
      else 
        if @compare_result["Commits"].blank? && @compare_result["Diff"].blank?
          return -2, "分支内容相同，无需创建合并请求"
        end
      end
    end
    return 0, "可以合并"
  end
  def compare
    base, head = compare_params
    # TODO: 处理fork的项目向源项目发送PR的base、head参数问题
    @compare_result ||=
-      @head.include?(":") ? gitea_compare(@base, @head) : gitea_compare(@head, @base)
+      head.include?(":") ? gitea_compare(base, head) : gitea_compare(head, base)
  end
-  def load_compare_params
+  def compare_params
-    @base = Addressable::URI.unescape(params[:base])
+    base = Addressable::URI.unescape(params[:base])
-    @head = params[:head].include?('json') ? params[:head]&.split('.json')[0] : params[:head]
+    head = params[:head].include?('json') ? params[:head]&.split('.json')[0] : params[:head]
    [base, head]
  end
  def gitea_compare(base, head)
-    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head, current_user.gitea_token)
+    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head)
  end
 end
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -3,7 +3,6 @@ class IssuesController < ApplicationController
  before_action :load_project
  before_action :set_user
  before_action :check_issue_permission
  before_action :operate_issue_permission, only:[:create, :update, :destroy, :clean, :series_update, :copy]
  before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue]
  before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue]
@ -231,7 +230,7 @@ class IssuesController < ApplicationController
  end
  def show
-    @user_permission = current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user)
+    @user_permission = current_user.present? && current_user.logged? && (!@issue.is_lock || @project.member?(current_user) || current_user.admin? || @issue.user == current_user)
    @issue_attachments = @issue.attachments
    @issue_user = @issue.user
    @issue_assign_to = @issue.get_assign_user
@ -304,7 +303,7 @@ class IssuesController < ApplicationController
    if issue_ids.present?
      if update_hash.blank?
        normal_status(-1, "请选择批量更新内容")
-      elsif Issue.where(id: issue_ids)&.update(update_hash)
+      elsif Issue.where(id: issue_ids).update_all(update_hash)
        normal_status(0, "批量更新成功")
      else
        normal_status(-1, "批量更新失败")
@ -316,7 +315,6 @@ class IssuesController < ApplicationController
  def copy
    @new_issue = @issue.dup
    @new_issue.author_id = current_user.id
    if @new_issue.save
      issue_tags = @issue.issue_tags.pluck(:id)
      if issue_tags.present?
@ -414,10 +412,6 @@ class IssuesController < ApplicationController
    end
  end
  def operate_issue_permission
    return render_forbidden("您没有权限进行此操作.") unless current_user.admin? || @project.member?(current_user)
  end
  def export_issues(issues)
    @table_columns = %w(ID 类型 标题	描述	状态	指派给	优先级 标签 发布人 创建时间 里程碑 开始时间 截止时间 完成度 分类 金额 属于)
    @export_issues = []
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -5,7 +5,7 @@ class ProjectsController < ApplicationController
  include Acceleratorable
  before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about menu_list]
-  before_action :load_repository, except: %i[index group_type_list migrate create recommend]
+  before_action :load_project, except: %i[index group_type_list migrate create recommend]
  before_action :authorizate_user_can_edit_project!, only: %i[update]
  before_action :project_public?, only: %i[fork_users praise_users watch_users]
@ -116,11 +116,10 @@ class ProjectsController < ApplicationController
        Projects::UpdateForm.new(validate_params).validate!
-        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false
+        private = params[:private] || false
        new_project_params = project_params.except(:private).merge(is_public: !private)
        @project.update_attributes!(new_project_params)
        @project.forked_projects.update_all(is_public: @project.is_public)
        gitea_params = {
          private: private,
          default_branch: @project.default_branch,
@ -145,7 +144,6 @@ class ProjectsController < ApplicationController
      ActiveRecord::Base.transaction do
        Gitea::Repository::DeleteService.new(@project.owner, @project.identifier).call
        @project.destroy!
        @project.forked_projects.update_all(forked_from_project_id: nil)
        render_ok
      end
    else
--- a/app/controllers/public_keys_controller.rb
+++ b/app/controllers/public_keys_controller.rb
@ -1,62 +0,0 @@
 class PublicKeysController < ApplicationController
  before_action :require_login
  before_action :find_public_key, only: [:destroy]
  def index 
    @public_keys = current_user.public_keys 
    @public_keys = kaminari_paginate(@public_keys)
  rescue Exception => e
    uid_logger_error(e.message)
    tip_exception(e.message)
  end
  def create 
    return render_error("请输入密钥") if public_key_params[:key].blank?
    return render_error("请输入标题") if public_key_params[:title].blank?
    @gitea_response = Gitea::User::Keys::CreateService.call(current_user.gitea_token, public_key_params)
    if @gitea_response[0] == 201 
      @public_key = @gitea_response[2]
      puts @public_key
    else 
      return render_error if @gitea_response[2]["message"].nil?
      return render_error("密钥格式不正确") if @gitea_response[2]["message"].starts_with?("Invalid key content")
      return render_error("密钥已存在，请勿重复添加") if @gitea_response[2]["message"].starts_with?("Key content has been used as non-deploy key")
      puts @gitea_response[2]
      @public_key = nil
    end
  rescue Exception => e
    uid_logger_error(e.message)
    tip_exception(e.message)
  end
  def destroy
    return render_not_found unless @public_key.present?
    if @public_key.destroy
      render_ok 
    else 
      render_error
    end
  rescue Exception => e
    uid_logger_error(e.message)
    tip_exception(e.message)
  end
  private 
  def page
    params[:page].to_i.zero? ? 1 : params[:page].to_i
  end
  def limit 
    limit = params[:limit] || params[:per_page]
 		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
  end
  def public_key_params 
    params.require(:public_key).permit(:key, :title)
  end
  def find_public_key
    @public_key = current_user.public_keys.find_by_id(params[:id])
  end
 end
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@ -91,7 +91,7 @@ class PullRequestsController < ApplicationController
          if @issue.update_attributes(@issue_params)
            if @pull_request.update_attributes(@local_params.compact)
              gitea_pull = Gitea::PullRequest::UpdateService.call(@owner.login, @repository.identifier,
-                  @pull_request.gitea_number, @requests_params, current_user.gitea_token)
+                  @pull_request.gpid, @requests_params, current_user.gitea_token)
              if gitea_pull[:status] === :success
                if params[:issue_tag_ids].present?
@ -139,7 +139,7 @@ class PullRequestsController < ApplicationController
    @issue_user = @issue.user
    @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)
+      @repository.identifier, @pull_request.gpid, current_user&.gitea_token)
  end
  def pr_merge
@ -150,16 +150,9 @@ class PullRequestsController < ApplicationController
    else
      ActiveRecord::Base.transaction do
        begin
-          @gitea_pull = Gitea::PullRequest::GetService.call(@owner.login, @repository.identifier, @pull_request.gitea_number, current_user&.gitea_token)
+          result = PullRequests::MergeService.call(@owner, @repository, @pull_request, current_user, params)
-          if @gitea_pull["merged_by"].present?
+          if result.status == 200 && @pull_request.merge!
            success_condition = true
          else
            result = PullRequests::MergeService.call(@owner, @repository, @pull_request, current_user, params)
            success_condition = result.status == 200
          end
          if success_condition && @pull_request.merge!
            @pull_request.project_trend_status!
            @issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
            normal_status(1, "合并成功")
@ -198,12 +191,12 @@ class PullRequestsController < ApplicationController
  def files
-    @files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gitea_number, current_user&.gitea_token)
+    @files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gpid, current_user&.gitea_token)
    # render json: @files_result
  end
  def commits
-    @commits_result = Gitea::PullRequest::CommitsService.call(@owner.login, @project.identifier, @pull_request.gitea_number, current_user&.gitea_token)
+    @commits_result = Gitea::PullRequest::CommitsService.call(@owner.login, @project.identifier, @pull_request.gpid, current_user&.gitea_token)
    # render json: @commits_result
  end
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -5,9 +5,9 @@ class RepositoriesController < ApplicationController
  before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror]
  before_action :load_repository
-  before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive]
+  before_action :authorizate!, except: [:sync_mirror, :tags, :commit]
  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 file]
  before_action :get_latest_commit, only: %i[entries sub_entries top_counts]
  before_action :get_statistics, only: %i[top_counts]
@ -192,19 +192,6 @@ class RepositoriesController < ApplicationController
    render json: languages_precentagable
  end
  def archive
    domain  = Gitea.gitea_config[:domain]
    api_url = Gitea.gitea_config[:base_url]
    archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{params[:archive]}"
    file_path = [domain, api_url, archive_url].join
    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("?") if @repository.hidden?
    return render_not_found if !request.format.zip? && !request.format.gzip?
    redirect_to file_path
  end
  private
  def find_project
@ -279,7 +266,7 @@ class RepositoriesController < ApplicationController
    # uploadPushInfo
  end
-  
+
  def create_new_pr(params)
    if params[:new_branch].present? && params[:new_branch] != params[:branch]
      local_params = {
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@ -25,13 +25,17 @@ class VersionsController < ApplicationController
  end
  def show
-    version_issues = @version.issues.issue_issue.issue_includes
+    version_issues = @version.issues.issue_includes
    status_type = params[:status_type] || "1"
    # @close_issues_size = version_issues.where(status_id: 5).size
    # @open_issues_size = version_issues.size - @close_issues_size
-   
+    if status_type.to_s == "1"  #表示开启中的
      version_issues = version_issues.where.not(status_id: 5)
    else
      version_issues = version_issues.where(status_id: 5)
    end
    version_issues = version_issues.where(author_id: params[:author_id]) if params[:author_id].present? && params[:author_id].to_s != "all"
    version_issues = version_issues.where(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present? && params[:assigned_to_id].to_s != "all"
    version_issues = version_issues.where(tracker_id: params[:tracker_id]) if params[:tracker_id].present? && params[:tracker_id].to_s != "all"
@ -43,26 +47,10 @@ class VersionsController < ApplicationController
    version_issues = version_issues.joins(:issue_tags).where(issue_tags: {id: params[:issue_tag_id].to_i}) if params[:issue_tag_id].present? && params[:issue_tag_id].to_s != "all"
    version_issues = version_issues.reorder("#{order_name} #{order_type}")
    has_filter_params = (params[:author_id].present? && params[:author_id].to_s != "all") ||
                        (params[:assigned_to_id].present? && params[:assigned_to_id].to_s != "all") ||
                        (params[:tracker_id].present? && params[:tracker_id].to_s != "all")  ||
                        (params[:status_id].present? && params[:status_id].to_s != "all") || 
                        (params[:priority_id].present? && params[:priority_id].to_s != "all") || 
                        (params[:fixed_version_id].present? && params[:fixed_version_id].to_s != "all") || 
                        (params[:done_ratio].present? && params[:done_ratio].to_s != "all") || 
                        (params[:issue_type].present? && params[:issue_type].to_s != "all") || 
                        (params[:issue_tag_id].present? && params[:issue_tag_id].to_s != "all")
    @version_close_issues_size = has_filter_params ? version_issues.closed.size : @version.issues.issue_issue.issue_includes.closed.size
    @version_issues_size = has_filter_params ? version_issues.size : @version.issues.issue_issue.issue_includes.size
    if status_type.to_s == "1"  #表示开启中的
      version_issues = version_issues.where.not(status_id: 5)
    else
      version_issues = version_issues.where(status_id: 5)
    end
    @page  = params[:page]  || 1
    @limit = params[:limit] || 15
-    # @version_issues_size = version_issues.size
+    @version_issues_size = version_issues.size
    @version_issues = version_issues.page(@page).per(@limit)
  end
--- a/app/docs/slate/source/api.html.md
+++ b/app/docs/slate/source/api.html.md
@ -12,7 +12,6 @@ toc_footers:
 includes:
  - licenses
  - gitignores
  - public_keys
  - users
  - projects
  - repositories
--- a/app/docs/slate/source/includes/_public_keys.md
+++ b/app/docs/slate/source/includes/_public_keys.md
@ -1,158 +0,0 @@
 <!--
 * @Date: 2021-07-14 15:10:29
 * @LastEditors: viletyy
 * @LastEditTime: 2021-07-14 15:37:23
 * @FilePath: /forgeplus/app/docs/slate/source/includes/_public_keys.md
 -->
 # PublicKeys
 ## public_keys列表
 获取public_keys列表，支持分页
 > 示例:
 ```shell
 curl -X GET \
 http://localhost:3000/api/public_keys.json
 ```
 ```javascript
 await octokit.request('GET /api/public_keys.json')
 ```
 ### HTTP 请求
 `GET api/public_keys.json`
 ### 请求参数
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
 page  |否| 1 | int |  页码   |
 limit |否| 15 | int | 每页数量 |
 ### 返回字段说明
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
 total_count              |int   |总数 |
 public_keys.id           |int   |ID|
 public_keys.name         |string|密钥标题|
 public_keys.content      |string|密钥内容|
 public_keys.fingerprint  |string|密钥标识|
 public_keys.created_time |string|密钥创建时间|
 > 返回的JSON示例:
 ```json
 {
    "total_count": 1,
    "public_keys": [
        {
            "id": 16,
            "name": "xxx",
            "content": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDe5ETOTB5PcmcYJkIhfF7+mxmJQDCLg7/LnMoKHpKoo/jYUnFU9OjfsxVo3FTNUvh2475WXMAur5KsFoNKjK9+JHxvoXyJKmyVPWgXU/NRxQyaWPnPLPK8qPRF5ksJE6feBOqtsdxsvBiHs2r1NX/U26Ecnpr6avudD0cmyrEfbYMWbupLrhsd39dswPT73f3W5jc7B9Y47Ioiv8UOju3ABt1+kpuAjaaVC6VtUQoEFiZb1y33yBnyePya7dvFyApyD4ILyyIG2rtZWK7l53YFnwZDuFsTWjEEEQD0U4FBSFdH5wtwx0WQLMSNyTtaFBSG0kJ+uiQQIrxlvikcm63df7zbC3/rWLPsKgW122Zt966dcpFqiCiJNDKZPPw3qpg8TBL6X+qIZ+FxVEk/16/zScpyEfoxQp0GvgxI7hPLErmfkC5tMsib8MAXYBNyvJXna0vg/wOaNNIaI4SAH9Ksh3f/TtalYVjp6WxIwVBfnbq51WnmlnEXePtX6XjAGL+GbF2VQ1nv/IzrY09tNbTV6wQsrSIP3VDzYQxdJ1rdsVNMoJB0H2Pu0NdcSz53Wx45N+myD0QnE05ss+zDp5StY90OYsx2aCo6qAA8Qn2jUjdta7MQWwkPfKrta4tTQ0XbWMjx4/E1+l3J5liwZkl2XOGOwhfXdRsBjaEziZ18kQ== yystopf@163.com",
            "fingerprint": "SHA256:cU8AK/+roqUUyiaYXIdS2Nj4+Rb2p6rqWSeRDc+aqKM",
            "created_unix": 1626246596,
            "created_time": "2021/07/14 15:09"
        }
    ]
 }
 ```
 <aside class="success">
 Success — a happy kitten is an authenticated kitten!
 </aside>
 ## 创建public_key
 创建public_key
 > 示例:
 ```shell
 curl -X POST \
 http://localhost:3000/api/public_keys.json
 ```
 ```javascript
 await octokit.request('POST /api/public_keys.json')
 ```
 ### HTTP 请求
 `POST api/public_keys.json`
 ### 请求参数
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
 key   |是 | 否 | string |  密钥   |
 title |是 | 否 | string | 密钥标题 |
 > 请求的JSON示例：
 ```json
 {
  "public_key": {
    "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDe5ETOTB5PcmcYJkIhfF7+mxmJQDCLg7/LnMoKHpKoo/jYUnFU9OjfsxVo3FTNUvh2475WXMAur5KsFoNKjK9+JHxvoXyJKmyVPWgXU/NRxQyaWPnPLPK8qPRF5ksJE6feBOqtsdxsvBiHs2r1NX/U26Ecnpr6avudD0cmyrEfbYMWbupLrhsd39dswPT73f3W5jc7B9Y47Ioiv8UOju3ABt1+kpuAjaaVC6VtUQoEFiZb1y33yBnyePya7dvFyApyD4ILyyIG2rtZWK7l53YFnwZDuFsTWjEEEQD0U4FBSFdH5wtwx0WQLMSNyTtaFBSG0kJ+uiQQIrxlvikcm63df7zbC3/rWLPsKgW122Zt966dcpFqiCiJNDKZPPw3qpg8TBL6X+qIZ+FxVEk/16/zScpyEfoxQp0GvgxI7hPLErmfkC5tMsib8MAXYBNyvJXna0vg/wOaNNIaI4SAH9Ksh3f/TtalYVjp6WxIwVBfnbq51WnmlnEXePtX6XjAGL+GbF2VQ1nv/IzrY09tNbTV6wQsrSIP3VDzYQxdJ1rdsVNMoJB0H2Pu0NdcSz53Wx45N+myD0QnE05ss+zDp5StY90OYsx2aCo6qAA8Qn2jUjdta7MQWwkPfKrta4tTQ0XbWMjx4/E1+l3J5liwZkl2XOGOwhfXdRsBjaEziZ18kQ== yystopf@163.com", 
    "title": "xxx"
  }
 }
 ```
 ### 返回字段说明
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
 total_count              |int   |总数 |
 id           |int   |ID|
 name         |string|密钥标题|
 content      |string|密钥内容|
 fingerprint  |string|密钥标识|
 created_time |string|密钥创建时间|
 > 返回的JSON示例:
 ```json
 {
    "id": 17,
    "name": "xxx",
    "content": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDe5ETOTB5PcmcYJkIhfF7+mxmJQDCLg7/LnMoKHpKoo/jYUnFU9OjfsxVo3FTNUvh2475WXMAur5KsFoNKjK9+JHxvoXyJKmyVPWgXU/NRxQyaWPnPLPK8qPRF5ksJE6feBOqtsdxsvBiHs2r1NX/U26Ecnpr6avudD0cmyrEfbYMWbupLrhsd39dswPT73f3W5jc7B9Y47Ioiv8UOju3ABt1+kpuAjaaVC6VtUQoEFiZb1y33yBnyePya7dvFyApyD4ILyyIG2rtZWK7l53YFnwZDuFsTWjEEEQD0U4FBSFdH5wtwx0WQLMSNyTtaFBSG0kJ+uiQQIrxlvikcm63df7zbC3/rWLPsKgW122Zt966dcpFqiCiJNDKZPPw3qpg8TBL6X+qIZ+FxVEk/16/zScpyEfoxQp0GvgxI7hPLErmfkC5tMsib8MAXYBNyvJXna0vg/wOaNNIaI4SAH9Ksh3f/TtalYVjp6WxIwVBfnbq51WnmlnEXePtX6XjAGL+GbF2VQ1nv/IzrY09tNbTV6wQsrSIP3VDzYQxdJ1rdsVNMoJB0H2Pu0NdcSz53Wx45N+myD0QnE05ss+zDp5StY90OYsx2aCo6qAA8Qn2jUjdta7MQWwkPfKrta4tTQ0XbWMjx4/E1+l3J5liwZkl2XOGOwhfXdRsBjaEziZ18kQ== yystopf@163.com",
    "fingerprint": "SHA256:cU8AK/+roqUUyiaYXIdS2Nj4+Rb2p6rqWSeRDc+aqKM",
    "created_time": "2021/07/14 15:26"
 }
 ```
 <aside class="success">
 Success — a happy kitten is an authenticated kitten!
 </aside>
 ## 删除public_key
 删除public_key
 > 示例:
 ```shell
 curl -X DELETE \
 http://localhost:3000/api/public_keys/:id.json
 ```
 ```javascript
 await octokit.request('DELETE /api/public_keys/:id.json')
 ```
 ### HTTP 请求
 `DELETE api/public_keys/:id.json`
 ### 请求参数
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
 id   |是 | 否 | int |  密钥ID   |
 > 返回的JSON示例:
 ```json
 {
    "status": 0,
    "message": "success"
 }
 ```
 <aside class="success">
 Success — a happy kitten is an authenticated kitten!
 </aside>
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@ -13,12 +13,12 @@ module ProjectsHelper
    end
  end
-  def render_zip_url(owner, repository, archive)
+  def render_zip_url(project, archive_name)
-    [base_url, archive_repositories_path(owner&.login, repository, "#{archive}.zip")].join
+    [gitea_domain, project.owner.login, project.identifier, "archive", "#{archive_name}.zip"].join('/')
  end
-  def render_tar_url(owner, repository, archive)
+  def render_tar_url(project, archive_name)
-    [base_url, archive_repositories_path(owner&.login, repository, "#{archive}.tar.gz")].join
+    [gitea_domain, project.owner.login, project.identifier, "archive", "#{archive_name}.tar.gz"].join('/')
  end
  def render_http_url(project)
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@ -10,12 +10,12 @@ module RepositoriesHelper
  end
  def download_type(str)
-    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb png jpg gif tif psd svg RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2)
+    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb png jpg gif tif psd svg RData rdata doc docx mpp vsdx dot)
    default_type.include?(str&.downcase)
  end
  def image_type?(str)
-    default_type = %w(png jpg gif tif psd svg gif bmp webp jpeg)
+    default_type = %w(png jpg gif tif psd svg)
    default_type.include?(str&.downcase)
  end
@ -82,46 +82,8 @@ module RepositoriesHelper
      readme_render_decode64_content(content, path)
    else
      file_type = entry['name'].to_s.split(".").last
-      if download_type(file_type)
+      return entry['content'] if download_type(file_type)
        return entry['content'].nil? ? Gitea::Repository::Entries::GetService.call(owner, repo.identifier, entry['path'], ref: ref)['content'] : entry['content']  
      end
      render_decode64_content(entry['content'])
    end
  end
  def base64_to_image(path, content)
    # generate to https://git.trusite.net/pawm36ozq/-/raw/branch/master/entrn.png"
    content      = Base64.decode64(content)
    File.open(path, 'wb') { |f| f.write(content) }
  end
  def render_download_image_url(dir_path, file_path, content)
    full_path = file_path.starts_with?("/") ? [dir_path, file_path].join("") : [dir_path, file_path].join("/")
    file_name = full_path.split("/")[-1]
    # 用户名/项目标识/文件路径
    dir_path = generate_dir_path(full_path.split("/"+file_name)[0])
    file_path = [dir_path, file_name].join('/')
    puts "##### render_download_image_url file_path: #{file_path}"
    base64_to_image(file_path, content)
    file_path = file_path[6..-1]
    File.join(base_url, file_path)
  end
  def generate_dir_path(dir_path)
    # tmp_dir_path
    # eg: jasder/forgeplus/raw/branch/ref
    dir_path = ["public", tmp_dir, dir_path].join('/')
    puts "#### dir_path: #{dir_path}"
    unless Dir.exists?(dir_path)
      FileUtils.mkdir_p(dir_path) ##不成功这里会抛异常
    end
    dir_path
  end
  def tmp_dir
    "repo"
  end
 end
--- a/app/interactors/gitea/create_file_interactor.rb
+++ b/app/interactors/gitea/create_file_interactor.rb
@ -24,14 +24,8 @@ module Gitea
    def run
      Contents::CreateForm.new(valid_params).validate!
-      result = Gitea::Repository::Entries::CreateService.call(token, 
+      response = Gitea::Repository::Entries::CreateService.new(token, owner, @params[:identifier], @params[:filepath], file_params).call
-        owner, @params[:identifier], @params[:filepath], file_params)
+      render_result(response)
      if result[:status] == :success
        @result = result[:body]
      else
        fail!(result[:message])
      end
    rescue Exception => exception
      Rails.logger.info "Exception ===========> #{exception.message}"
      fail!(exception.message)
@ -62,7 +56,7 @@ module Gitea
      file_params = {}
      file_params = file_params.merge(branch: @params[:branch]) unless @params[:branch].blank?
      file_params = file_params.merge(new_branch: @params[:new_branch]) unless @params[:new_branch].blank?
-      file_params = file_params.merge(content: Base64.encode64(@params[:content] || ""))
+      file_params = file_params.merge(content: Base64.encode64(@params[:content]))
      file_params = file_params.merge(message: @params[:message]) unless @params[:message].blank?
      file_params = file_params.merge(committer: @params[:committer])
      file_params
--- a/app/jobs/reset_user_cache_job.rb
+++ b/app/jobs/reset_user_cache_job.rb
@ -2,7 +2,6 @@ class ResetUserCacheJob < ApplicationJob
  queue_as :cache
  def perform(user)
    return if user.nil?
    Cache::UserFollowCountService.new(user).reset
    Cache::UserIssueCountService.new(user).reset 
    Cache::UserProjectCountService.new(user).reset 
--- a/app/models/applied_message.rb
+++ b/app/models/applied_message.rb
@ -1,26 +1,19 @@
 # == Schema Information
 #
-# Table name: forge_applied_messages
+# Table name: applied_messages
 #
 #  id              :integer          not null, primary key
 #  user_id         :integer
 #  applied_type    :string(255)
 #  applied_id      :integer
 #  applied_type    :string(255)
 #  viewed          :integer          default("0")
 #  status          :integer          default("0")
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  name            :string(255)
 #  applied_user_id :integer
 #  role            :integer
 #  project_id      :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #
 # Indexes
 #
 #  index_forge_applied_messages_on_applied_type_and_applied_id  (applied_type,applied_id)
 #  index_forge_applied_messages_on_applied_user_id              (applied_user_id)
 #  index_forge_applied_messages_on_project_id                   (project_id)
 #  index_forge_applied_messages_on_user_id                      (user_id)
 #
 class AppliedMessage < ApplicationRecord
--- a/app/models/applied_project.rb
+++ b/app/models/applied_project.rb
@ -1,19 +1,14 @@
 # == Schema Information
 #
-# Table name: forge_applied_projects
+# Table name: applied_projects
 #
 #  id         :integer          not null, primary key
-#  project_id :integer
+#  project_id :integer          not null
-#  user_id    :integer
+#  user_id    :integer          not null
 #  role       :integer          default("0")
 #  status     :integer          default("0")
-#  created_at :datetime         not null
+#  created_at :datetime
-#  updated_at :datetime         not null
+#  updated_at :datetime
 #
 # Indexes
 #
 #  index_forge_applied_projects_on_project_id  (project_id)
 #  index_forge_applied_projects_on_user_id     (user_id)
 #
 class AppliedProject < ApplicationRecord
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@ -1,42 +1,41 @@
-# == Schema Information
+# == Schema Information
-#
+#
-# Table name: attachments
+# Table name: attachments
-#
+#
-#  id                        :integer          not null, primary key
+#  id                        :integer          not null, primary key
-#  container_id              :integer
+#  container_id              :integer
-#  container_type            :string(30)
+#  container_type            :string(30)
-#  filename                  :string(255)      default(""), not null
+#  filename                  :string(255)      default(""), not null
-#  disk_filename             :string(255)      default(""), not null
+#  disk_filename             :string(255)      default(""), not null
-#  filesize                  :integer          default("0"), not null
+#  filesize                  :integer          default("0"), not null
-#  content_type              :string(255)      default("")
+#  content_type              :string(255)      default("")
-#  digest                    :string(60)       default(""), not null
+#  digest                    :string(60)       default(""), not null
-#  downloads                 :integer          default("0"), not null
+#  downloads                 :integer          default("0"), not null
-#  author_id                 :integer          default("0"), not null
+#  author_id                 :integer          default("0"), not null
-#  created_on                :datetime
+#  created_on                :datetime
-#  description               :text(65535)
+#  description               :text(65535)
-#  disk_directory            :string(255)
+#  disk_directory            :string(255)
-#  attachtype                :integer          default("1")
+#  attachtype                :integer          default("1")
-#  is_public                 :integer          default("1")
+#  is_public                 :integer          default("1")
-#  copy_from                 :string(255)
+#  copy_from                 :integer
-#  quotes                    :integer          default("0")
+#  quotes                    :integer          default("0")
-#  is_publish                :integer          default("1")
+#  is_publish                :integer          default("1")
-#  publish_time              :datetime
+#  publish_time              :datetime
-#  resource_bank_id          :integer
+#  resource_bank_id          :integer
-#  unified_setting           :boolean          default("1")
+#  unified_setting           :boolean          default("1")
-#  cloud_url                 :string(255)      default("")
+#  cloud_url                 :string(255)      default("")
-#  course_second_category_id :integer          default("0")
+#  course_second_category_id :integer          default("0")
-#  delay_publish             :boolean          default("0")
+#  delay_publish             :boolean          default("0")
-#  link                      :string(255)
+#
-#  clone_id                  :integer
+# Indexes
-#
+#
-# Indexes
+#  index_attachments_on_author_id                        (author_id)
-#
+#  index_attachments_on_container_id_and_container_type  (container_id,container_type)
-#  index_attachments_on_author_id                        (author_id)
+#  index_attachments_on_course_second_category_id        (course_second_category_id)
-#  index_attachments_on_clone_id                         (clone_id)
+#  index_attachments_on_created_on                       (created_on)
-#  index_attachments_on_container_id_and_container_type  (container_id,container_type)
+#  index_attachments_on_is_public                        (is_public)
-#  index_attachments_on_created_on                       (created_on)
+#  index_attachments_on_quotes                           (quotes)
-#
+#
 class Attachment < ApplicationRecord
--- a/app/models/ci/user.rb
+++ b/app/models/ci/user.rb
@ -39,15 +39,17 @@
 #  business                   :boolean          default("0")
 #  profile_completed          :boolean          default("0")
 #  laboratory_id              :integer
-#  is_shixun_marker           :boolean          default("0")
+#  platform                   :string(255)      default("0")
-#  admin_visitable            :boolean          default("0")
+#  gitea_token                :string(255)
 #  collaborator               :boolean          default("0")
 #  gitea_uid                  :integer
 #  is_shixun_marker           :boolean          default("0")
 #  is_sync_pwd                :boolean          default("1")
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
-#  gitea_token                :string(255)
+#  sponsor_certification      :integer          default("0")
-#  platform                   :string(255)
+#  sponsor_num                :integer          default("0")
 #  sponsored_num              :integer          default("0")
 #  award_time                 :datetime
 #
 # Indexes
 #
@ -55,9 +57,8 @@
 #  index_users_on_homepage_engineer  (homepage_engineer)
 #  index_users_on_homepage_teacher   (homepage_teacher)
 #  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login) UNIQUE
+#  index_users_on_login              (login)
-#  index_users_on_mail               (mail) UNIQUE
+#  index_users_on_mail               (mail)
 #  index_users_on_phone              (phone) UNIQUE
 #  index_users_on_type               (type)
 #
--- a/app/models/concerns/project_operable.rb
+++ b/app/models/concerns/project_operable.rb
@ -65,7 +65,7 @@ module ProjectOperable
    if owner.is_a?(User)
      managers.exists?(user_id: user.id)
    elsif owner.is_a?(Organization)
-      managers.exists?(user_id: user.id) || owner.is_owner?(user.id) || owner.is_only_admin?(user.id)
+      managers.exists?(user_id: user.id) || owner.is_only_admin?(user.id)
    else
      false
    end
@ -94,7 +94,7 @@ module ProjectOperable
  end
  def operator?(user)
-    user.admin? || (member?(user.id) && !reporter?(user))
+    user.admin? || !reporter?(user) 
  end
  def set_developer_role(member, role_name)
--- a/app/models/gitea/base.rb
+++ b/app/models/gitea/base.rb
@ -1,6 +1,4 @@
-class Gitea::Base < ApplicationRecord
+class Gitea::Base < Gitea::Database
-    db_config = Rails.configuration.database_configuration[Rails.env]["gitea_server"]
+  self.abstract_class = true
-    raise 'gitea database config missing' if db_config.blank?
+  
    establish_connection db_config
 end
--- a/app/models/gitea/public_key.rb
+++ b/app/models/gitea/public_key.rb
@ -1,9 +0,0 @@
 class Gitea::PublicKey < Gitea::Base
  self.inheritance_column = nil # FIX  The single-table inheritance mechanism failed
  # establish_connection :gitea_db
  self.table_name = "public_key"
  belongs_to :user, class_name: '::User', foreign_key: :gitea_uid, primary_key: :owner_id, optional: true
 end
--- a/app/models/gitea/pull.rb
+++ b/app/models/gitea/pull.rb
@ -1,44 +0,0 @@
 # == Schema Information
 #
 # Table name: pull_request
 #
 #  id                      :integer          not null, primary key
 #  type                    :integer
 #  status                  :integer
 #  conflicted_files        :text(65535)
 #  commits_ahead           :integer
 #  commits_behind          :integer
 #  changed_protected_files :text(65535)
 #  issue_id                :integer
 #  index                   :integer
 #  head_repo_id            :integer
 #  base_repo_id            :integer
 #  head_branch             :string(255)
 #  base_branch             :string(255)
 #  merge_base              :string(40)
 #  has_merged              :boolean
 #  merged_commit_id        :string(40)
 #  merger_id               :integer
 #  merged_unix             :integer
 #
 # Indexes
 #
 #  IDX_pull_request_base_repo_id  (base_repo_id)
 #  IDX_pull_request_has_merged    (has_merged)
 #  IDX_pull_request_head_repo_id  (head_repo_id)
 #  IDX_pull_request_issue_id      (issue_id)
 #  IDX_pull_request_merged_unix   (merged_unix)
 #  IDX_pull_request_merger_id     (merger_id)
 #
 class Gitea::Pull < Gitea::Base
  self.inheritance_column = nil # FIX  The single-table inheritance mechanism failed
  # establish_connection :gitea_db
  self.table_name = "pull_request"
  serialize :conflicted_files, Array
  belongs_to :pull_request, class_name: '::PullRequest', foreign_key: :id, primary_key: :gitea_number, optional: true
 end
--- a/app/models/laboratory.rb
+++ b/app/models/laboratory.rb
@ -10,7 +10,6 @@
 #  sync_course  :boolean          default("0")
 #  sync_subject :boolean          default("0")
 #  sync_shixun  :boolean          default("0")
 #  is_local     :boolean          default("0")
 #
 # Indexes
 #
--- a/app/models/license.rb
+++ b/app/models/license.rb
@ -7,6 +7,7 @@
 #  content    :text(65535)
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #  is_secret  :boolean          default("0")
 #
 class License < ApplicationRecord
--- a/app/models/member.rb
+++ b/app/models/member.rb
@ -11,6 +11,7 @@
 #  course_group_id     :integer          default("0")
 #  is_collect          :integer          default("1")
 #  graduation_group_id :integer          default("0")
 #  is_apply_signature  :boolean          default("0")
 #
 # Indexes
 #
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@ -39,15 +39,17 @@
 #  business                   :boolean          default("0")
 #  profile_completed          :boolean          default("0")
 #  laboratory_id              :integer
-#  is_shixun_marker           :boolean          default("0")
+#  platform                   :string(255)      default("0")
-#  admin_visitable            :boolean          default("0")
+#  gitea_token                :string(255)
 #  collaborator               :boolean          default("0")
 #  gitea_uid                  :integer
 #  is_shixun_marker           :boolean          default("0")
 #  is_sync_pwd                :boolean          default("1")
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
-#  gitea_token                :string(255)
+#  sponsor_certification      :integer          default("0")
-#  platform                   :string(255)
+#  sponsor_num                :integer          default("0")
 #  sponsored_num              :integer          default("0")
 #  award_time                 :datetime
 #
 # Indexes
 #
@ -55,9 +57,8 @@
 #  index_users_on_homepage_engineer  (homepage_engineer)
 #  index_users_on_homepage_teacher   (homepage_teacher)
 #  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login) UNIQUE
+#  index_users_on_login              (login)
-#  index_users_on_mail               (mail) UNIQUE
+#  index_users_on_mail               (mail)
 #  index_users_on_phone              (phone) UNIQUE
 #  index_users_on_type               (type)
 #
--- a/app/models/project.rb
+++ b/app/models/project.rb
@ -1,81 +1,78 @@
-
+# == Schema Information
-# == Schema Information
+#
-#
+# Table name: projects
-# Table name: projects
+#
-#
+#  id                     :integer          not null, primary key
-#  id                     :integer          not null, primary key
+#  name                   :string(255)      default(""), not null
-#  name                   :string(255)      default(""), not null
+#  description            :text(4294967295)
-#  description            :text(4294967295)
+#  homepage               :string(255)      default("")
-#  homepage               :string(255)      default("")
+#  is_public              :boolean          default("1"), not null
-#  is_public              :boolean          default("1"), not null
+#  parent_id              :integer
-#  parent_id              :integer
+#  created_on             :datetime
-#  created_on             :datetime
+#  updated_on             :datetime
-#  updated_on             :datetime
+#  identifier             :string(255)
-#  identifier             :string(255)
+#  status                 :integer          default("1"), not null
-#  status                 :integer          default("1"), not null
+#  lft                    :integer
-#  lft                    :integer
+#  rgt                    :integer
-#  rgt                    :integer
+#  inherit_members        :boolean          default("0"), not null
-#  inherit_members        :boolean          default("0"), not null
+#  project_type           :integer          default("0")
-#  project_type           :integer          default("0")
+#  hidden_repo            :boolean          default("0"), not null
-#  hidden_repo            :boolean          default("0"), not null
+#  attachmenttype         :integer          default("1")
-#  attachmenttype         :integer          default("1")
+#  user_id                :integer
-#  user_id                :integer
+#  dts_test               :integer          default("0")
-#  dts_test               :integer          default("0")
+#  enterprise_name        :string(255)
-#  enterprise_name        :string(255)
+#  organization_id        :integer
-#  organization_id        :integer
+#  project_new_type       :integer
-#  project_new_type       :integer
+#  gpid                   :integer
-#  gpid                   :integer
+#  forked_from_project_id :integer
-#  forked_from_project_id :integer
+#  forked_count           :integer          default("0")
-#  forked_count           :integer          default("0")
+#  publish_resource       :integer          default("0")
-#  publish_resource       :integer          default("0")
+#  visits                 :integer          default("0")
-#  visits                 :integer          default("0")
+#  hot                    :integer          default("0")
-#  hot                    :integer          default("0")
+#  invite_code            :string(255)
-#  invite_code            :string(255)
+#  qrcode                 :string(255)
-#  qrcode                 :string(255)
+#  qrcode_expiretime      :integer          default("0")
-#  qrcode_expiretime      :integer          default("0")
+#  script                 :text(65535)
-#  script                 :text(65535)
+#  training_status        :integer          default("0")
-#  training_status        :integer          default("0")
+#  rep_identifier         :string(255)
-#  rep_identifier         :string(255)
+#  project_category_id    :integer
-#  project_category_id    :integer
+#  project_language_id    :integer
-#  project_language_id    :integer
+#  license_id             :integer
-#  license_id             :integer
+#  ignore_id              :integer
-#  ignore_id              :integer
+#  praises_count          :integer          default("0")
-#  praises_count          :integer          default("0")
+#  watchers_count         :integer          default("0")
-#  watchers_count         :integer          default("0")
+#  issues_count           :integer          default("0")
-#  issues_count           :integer          default("0")
+#  pull_requests_count    :integer          default("0")
-#  pull_requests_count    :integer          default("0")
+#  language               :string(255)
-#  language               :string(255)
+#  versions_count         :integer          default("0")
-#  versions_count         :integer          default("0")
+#  issue_tags_count       :integer          default("0")
-#  issue_tags_count       :integer          default("0")
+#  closed_issues_count    :integer          default("0")
-#  closed_issues_count    :integer          default("0")
+#  open_devops            :boolean          default("0")
-#  open_devops            :boolean          default("0")
+#  gitea_webhook_id       :integer
-#  gitea_webhook_id       :integer
+#  open_devops_count      :integer          default("0")
-#  open_devops_count      :integer          default("0")
+#  recommend              :boolean          default("0")
-#  recommend              :boolean          default("0")
+#  platform               :integer          default("0")
-#  platform               :integer          default("0")
+#  default_branch         :string(255)      default("master")
-#  default_branch         :string(255)      default("master")
+#  website                :string(255)
-#  website                :string(255)
+#  order_index            :integer          default("0")
-#  order_index            :integer          default("0")
+#  lesson_url             :string(255)
-#  lesson_url             :string(255)
+#
-#
+# Indexes
-# Indexes
+#
-#
+#  index_projects_on_forked_from_project_id  (forked_from_project_id)
-#  index_projects_on_forked_from_project_id  (forked_from_project_id)
+#  index_projects_on_identifier              (identifier)
-#  index_projects_on_identifier              (identifier)
+#  index_projects_on_invite_code             (invite_code)
-#  index_projects_on_invite_code             (invite_code)
+#  index_projects_on_is_public               (is_public)
-#  index_projects_on_is_public               (is_public)
+#  index_projects_on_lft                     (lft)
-#  index_projects_on_lft                     (lft)
+#  index_projects_on_name                    (name)
-#  index_projects_on_license_id              (license_id)
+#  index_projects_on_platform                (platform)
-#  index_projects_on_name                    (name)
+#  index_projects_on_project_type            (project_type)
-#  index_projects_on_platform                (platform)
+#  index_projects_on_recommend               (recommend)
-#  index_projects_on_project_category_id     (project_category_id)
+#  index_projects_on_rgt                     (rgt)
-#  index_projects_on_project_language_id     (project_language_id)
+#  index_projects_on_status                  (status)
-#  index_projects_on_project_type            (project_type)
+#  index_projects_on_updated_on              (updated_on)
-#  index_projects_on_recommend               (recommend)
+#
-#  index_projects_on_rgt                     (rgt)
+
 #  index_projects_on_status                  (status)
 #  index_projects_on_updated_on              (updated_on)
 #
@ -101,12 +98,10 @@ class Project < ApplicationRecord
  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
--- a/app/models/project_category.rb
+++ b/app/models/project_category.rb
@ -8,6 +8,11 @@
 #  projects_count :integer          default("0")
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  ancestry       :string(255)
 #
 # Indexes
 #
 #  index_project_categories_on_ancestry  (ancestry)
 #
 class ProjectCategory < ApplicationRecord
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@ -37,7 +37,6 @@ 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'
  scope :merged_and_closed, ->{where.not(status: 0)}
  scope :opening, -> {where(status: 0)}
@ -55,7 +54,7 @@ class PullRequest < ApplicationRecord
  end
  def bind_gitea_pull_request!(gitea_pull_number)
-    update_column(:gitea_number, gitea_pull_number)
+    update_column(:gpid, gitea_pull_number)
  end
  def merge!
@ -68,26 +67,19 @@ class PullRequest < ApplicationRecord
  # TODO: sync educoder platform repo's for update some statistics count
  def self.update_some_count
-    PullRequest.includes(:user, :project).select(:id, :user_id, :gitea_number, :project_id, :fork_project_id).each do |pr|
+    PullRequest.includes(:user, :project).select(:id, :user_id, :gpid, :project_id, :fork_project_id).each do |pr|
      puts pr.id
-      next if pr.gitea_number.blank?
+      next if pr.gpid.blank?
      project = pr.project
      next if project.blank?
      user = project.owner
-      next  if pr.gitea_number === 6 || pr.gitea_number === 7
+      next  if pr.gpid === 6 || pr.gpid === 7
-      files_result = Gitea::PullRequest::FilesService.call(user.login, project.identifier, pr.gitea_number)
+      files_result = Gitea::PullRequest::FilesService.call(user.login, project.identifier, pr.gpid)
      pr.update_column(:files_count, files_result['NumFiles']) unless files_result.blank?
-      commits_result = Gitea::PullRequest::CommitsService.call(user.login, project.identifier, pr.gitea_number)
+      commits_result = Gitea::PullRequest::CommitsService.call(user.login, project.identifier, pr.gpid)
      pr.update_column(:commits_count, commits_result.size) unless commits_result.blank?
    end
  end
  def conflict_files
    file_names = self&.gitea_pull&.conflicted_files
    return [] if file_names.blank?
    JSON.parse file_names
  end
 end
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@ -27,6 +27,7 @@
 #
 # Indexes
 #
 #  index_repositories_on_identifier  (identifier)
 #  index_repositories_on_project_id  (project_id)
 #  index_repositories_on_user_id     (user_id)
 #
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -39,15 +39,17 @@
 #  business                   :boolean          default("0")
 #  profile_completed          :boolean          default("0")
 #  laboratory_id              :integer
-#  is_shixun_marker           :boolean          default("0")
+#  platform                   :string(255)      default("0")
-#  admin_visitable            :boolean          default("0")
+#  gitea_token                :string(255)
 #  collaborator               :boolean          default("0")
 #  gitea_uid                  :integer
 #  is_shixun_marker           :boolean          default("0")
 #  is_sync_pwd                :boolean          default("1")
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
-#  gitea_token                :string(255)
+#  sponsor_certification      :integer          default("0")
-#  platform                   :string(255)
+#  sponsor_num                :integer          default("0")
 #  sponsored_num              :integer          default("0")
 #  award_time                 :datetime
 #
 # Indexes
 #
@ -55,9 +57,8 @@
 #  index_users_on_homepage_engineer  (homepage_engineer)
 #  index_users_on_homepage_teacher   (homepage_teacher)
 #  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login) UNIQUE
+#  index_users_on_login              (login)
-#  index_users_on_mail               (mail) UNIQUE
+#  index_users_on_mail               (mail)
 #  index_users_on_phone              (phone) UNIQUE
 #  index_users_on_type               (type)
 #
@ -169,7 +170,6 @@ class User < Owner
  accepts_nested_attributes_for :is_pinned_projects
  has_many :issues, dependent: :destroy, foreign_key: :author_id 
  has_many :pull_requests, dependent: :destroy
  has_many :public_keys, class_name: "Gitea::PublicKey",primary_key: :gitea_uid, foreign_key: :owner_id, dependent: :destroy
  # Groups and active users
  scope :active, lambda { where(status: STATUS_ACTIVE) }
@ -186,7 +186,7 @@ class User < Owner
           :show_email, :show_location, :show_department,
           :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true
-  before_save :update_hashed_password, :set_lastname
+  before_save :update_hashed_password
  after_create do
    SyncTrustieJob.perform_later("user", 1) if allow_sync_to_trustie?
  end
@ -779,10 +779,6 @@ class User < Owner
    self.laboratory = Laboratory.current if laboratory_id.blank?
  end
  def set_lastname
    self.lastname = self.nickname if changes[:nickname].present?
  end
 end
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@ -12,9 +12,7 @@
 #
 # Indexes
 #
-#  index_user_actions_on_ip                       (ip)
+#  index_user_actions_on_ip  (ip)
 #  index_user_actions_on_user_id                  (user_id)
 #  index_user_actions_on_user_id_and_action_type  (user_id,action_type)
 #
 class UserAction < ApplicationRecord
--- a/app/models/user_agent.rb
+++ b/app/models/user_agent.rb
@ -10,13 +10,10 @@
 #  updated_at      :datetime         not null
 #  register_status :integer          default("0")
 #  action_status   :integer          default("0")
 #  is_delete       :boolean          default("0")
 #  user_id         :integer
 #
 # Indexes
 #
-#  index_user_agents_on_ip       (ip)
+#  index_user_agents_on_ip  (ip) UNIQUE
 #  index_user_agents_on_user_id  (user_id)
 #
 class UserAgent < ApplicationRecord
--- a/app/models/user_extension.rb
+++ b/app/models/user_extension.rb
@ -22,9 +22,6 @@
 #  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)
--- a/app/services/cache/platform_project_languages_count_service.rb
+++ b/app/services/cache/platform_project_languages_count_service.rb
@ -46,11 +46,11 @@ class Cache::PlatformProjectLanguagesCountService < ApplicationService
  def reset_platform_project_language_count_by_key
    return if key.nil?
-    $redis_cache.hset(platform_project_language_count_key, key, ProjectLanguage.where(name: key).projects_count) 
+    $redis_cache.hset(platform_project_language_count_key, key, Project.joins(:project_language).where(project_languages: {name: key}).count) 
  end
  def reset_platform_project_language_count
-    ProjectLanguage.where.not(projects_count: 0).group("project_languages.name").sum(:projects_count).each do |k, v|
+    Project.joins(:project_language).group("project_languages.name").count.each do |k, v|
      $redis_cache.hset(platform_project_language_count_key, k, v)
    end
  end
--- a/app/services/gitea/client_service.rb
+++ b/app/services/gitea/client_service.rb
@ -214,14 +214,6 @@ class Gitea::ClientService < ApplicationService
    [body, message]
  end
  def json_parse!(body)
    return nil unless body.present?
    body = JSON.parse(body)
    body, message = fix_body(body)
    body
  end
  def log_error(status, body)
    puts "[gitea] status:  #{status}"
    puts "[gitea] body:    #{body&.force_encoding('UTF-8')}"
--- a/app/services/gitea/pull_request/close_service.rb
+++ b/app/services/gitea/pull_request/close_service.rb
@ -8,7 +8,7 @@ class Gitea::PullRequest::CloseService < Gitea::PullRequest::UpdateService
  #   number: number of pull request
  #   token: token of gitea user
  # eq:
-  # Gitea::PullRequest::CloseService.call(owner.login, repo.identifier, pull.gitea_number, pull.base, current_user.gitea_token)
+  # Gitea::PullRequest::CloseService.call(owner.login, repo.identifier, pull.gpid, pull.base, current_user.gitea_token)
  def initialize(owner, repo, number, base,token=nil)
    colse_pull_params = Hash.new.merge(base: base, state: 'closed').compact
--- a/app/services/gitea/pull_request/get_service.rb
+++ b/app/services/gitea/pull_request/get_service.rb
@ -3,7 +3,7 @@ class Gitea::PullRequest::GetService < Gitea::ClientService
  attr_reader :owner, :repo, :number, :token
  #eq:
-  # Gitea::PullRequest::GetService.call(user.login, repository.identifier, pull.gitea_number, user.gitea_token)
+  # Gitea::PullRequest::GetService.call(user.login, repository.identifier, pull.gpid, user.gitea_token)
  def initialize(owner, repo, number, token=nil)
    @owner  = owner
    @repo   = repo
--- a/app/services/gitea/pull_request/open_service.rb
+++ b/app/services/gitea/pull_request/open_service.rb
@ -8,7 +8,7 @@ class Gitea::PullRequest::OpenService < Gitea::PullRequest::UpdateService
  #   number: number of pull request
  #   token: token of gitea user
  # eq:
-  # Gitea::PullRequest::OpenService.new(owner.login, repo.identifier, pr.gitea_number, pr.base, current_user.gitea_token)
+  # Gitea::PullRequest::OpenService.new(owner.login, repo.identifier, pr.gpid, pr.base, current_user.gitea_token)
  def initialize(owner, repo, number, base, token=nil)
    open_pull_params = Hash.new.merge(base: base, state: 'open').compact
--- a/app/services/gitea/repository/archive_service.rb
+++ b/app/services/gitea/repository/archive_service.rb
@ -1,40 +0,0 @@
 class Gitea::Repository::ArchiveService < Gitea::ClientService
  attr_reader :owner, :repo, :archive, :token
  def initialize(owner, repo, archive, token=nil)
    @owner   = owner
    @repo    = repo
    @archive = archive
    @token   = token
  end
  def call
    response = get(url, params)
    response_payload(response)
  end
  private
  def params
    Hash.new.merge(token: token)
  end
  def url
    "/repos/#{owner}/#{repo}/archive/#{archive}".freeze
  end
  def response_payload(response)
    status = response.status
    body = response&.body
    log_error(status, body)
    status_payload(status, body)
  end
  def status_payload(status, body)
    case status
    when 200 then success
    when 404 then error("你操作的链接不存在!")
    else error("系统错误!")
    end
  end
 end
--- a/app/services/gitea/repository/entries/create_service.rb
+++ b/app/services/gitea/repository/entries/create_service.rb
@ -30,7 +30,8 @@ class Gitea::Repository::Entries::CreateService < Gitea::ClientService
  def call
    response = post(url, params)
-    response_payload(response)
+
    render_201_response(response)
  end
  private
@ -42,21 +43,4 @@ class Gitea::Repository::Entries::CreateService < Gitea::ClientService
    "/repos/#{owner}/#{repo_name}/contents/#{filepath}".freeze
  end
  def response_payload(response)
    status = response.status
    body = response&.body
    log_error(status, body)
    status_payload(status, body)
  end
  def status_payload(status, body)
    case status
    when 201 then success(json_parse!(body))
    when 403 then error("你没有权限操作!")
    when 404 then error("你操作的链接不存在!")
    when 422 then error("#{filepath}文件已存在，不能重复创建!")
    else error("系统错误!")
    end
  end
 end
--- a/app/services/gitea/user/keys/create_service.rb
+++ b/app/services/gitea/user/keys/create_service.rb
@ -1,21 +0,0 @@
 class Gitea::User::Keys::CreateService < Gitea::ClientService 
  attr_reader :token, :params 
  def initialize(token, params) 
    @token = token
    @params = params
  end
  def call 
    response = post(url, request_params)
    render_response(response)
  end
  private
  def request_params 
    Hash.new.merge({token: token, data: params})
  end
  def url
    '/user/keys'.freeze
  end
 end
--- a/app/services/gitea/user/keys/delete_service.rb
+++ b/app/services/gitea/user/keys/delete_service.rb
@ -1,22 +0,0 @@
 class Gitea::User::Keys::DeleteService < Gitea::ClientService
  attr_reader :token, :key_id
  def initialize(token, key_id)
    @token = token
    @key_id = key_id
  end
  def call
    delete(url, params)
  end
  private
  def params
    Hash.new.merge(token: token)
  end
  def url
    "/user/keys/#{key_id}".freeze
  end
 end
--- a/app/services/gitea/user/keys/get_service.rb
+++ b/app/services/gitea/user/keys/get_service.rb
@ -1,22 +0,0 @@
 class Gitea::User::Keys::GetService < Gitea::ClientService
  attr_reader :token, :key_id 
  def initialize(token, key_id)
    @token = token 
    @key_id = key_id
  end
  def call 
    response = get(url, params)
    render_response(response)
  end
  private 
  def params 
    Hash.new.merge({token: token})
  end
  def url 
    "/user/keys/#{key_id}".freeze
  end
 end
--- a/app/services/gitea/user/keys/list_service.rb
+++ b/app/services/gitea/user/keys/list_service.rb
@ -1,26 +0,0 @@
 class Gitea::User::Keys::ListService < Gitea::ClientService
  attr_reader :token, :page, :limit, :fingerprint
  def initialize(token, page, limit, fingerprint="")
    @token = token 
    @page = page 
    @limit = limit 
    @fingerprint = fingerprint
  end
  def call 
    response = get(url, params)
    render_response(response)
  end
  private 
  def params 
    Hash.new.merge({token: token, fingerprint: fingerprint, page: page, limit: limit})
  end
  def url 
    '/user/keys'.freeze
  end
 end
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@ -8,7 +8,6 @@ class Projects::CreateService < ApplicationService
  def call
    Rails.logger.info("#############__________project_params______###########{project_params}")
    raise Error, "user_id不正确." unless authroize_user_id_success
    @project = Project.new(project_params)
    ActiveRecord::Base.transaction do
@ -28,10 +27,6 @@ class Projects::CreateService < ApplicationService
  private
  def authroize_user_id_success 
    (user.id == params[:user_id].to_i) || (user.organizations.find_by_id(params[:user_id]).present?)
  end
  def project_params
    {
      name: params[:name],
--- a/app/services/projects/migrate_service.rb
+++ b/app/services/projects/migrate_service.rb
@ -8,8 +8,6 @@ class Projects::MigrateService < ApplicationService
  end
  def call
    raise Error, "user_id不正确." unless authroize_user_id_success
    @project = Project.new(project_params)
    if @project.save!
      ProjectUnit.init_types(@project.id, project.project_type)
@ -26,9 +24,6 @@ class Projects::MigrateService < ApplicationService
  end
  private
  def authroize_user_id_success 
    (user.id == params[:user_id].to_i) || (user.organizations.find_by_id(params[:user_id]).present?)
  end
  def project_params
    {
--- a/app/services/pull_requests/close_service.rb
+++ b/app/services/pull_requests/close_service.rb
@ -23,7 +23,7 @@ class PullRequests::CloseService < ApplicationService
  def close_gitea_pull
    Gitea::PullRequest::CloseService.call(@owner.login, @repo.identifier,
-      @pull.gitea_number, @pull.base, current_user.gitea_token)
+      @pull.gpid, @pull.base, current_user.gitea_token)
  end
  def update_pull_status!
--- a/app/services/pull_requests/merge_service.rb
+++ b/app/services/pull_requests/merge_service.rb
@ -22,7 +22,7 @@ class PullRequests::MergeService < ApplicationService
  def gitea_pull_merge!
    result = Gitea::PullRequest::MergeService.call(@current_user.gitea_token, @owner.login,
-      @repo.identifier, @pull.gitea_number, gitea_merge_pull_params)
+      @repo.identifier, @pull.gpid, gitea_merge_pull_params)
      @status, @message = result
  end
--- a/app/services/pull_requests/open_service.rb
+++ b/app/services/pull_requests/open_service.rb
@ -23,7 +23,7 @@ class PullRequests::OpenService < ApplicationService
  def open_gitea_pull
    Gitea::PullRequest::OpenService.call(@owner.login, @repo.identifier,
-      @pull.gitea_number, @pull.base, @current_user.gitea_token)
+      @pull.gpid, @pull.base, @current_user.gitea_token)
  end
  def update_pull_status!
--- a/app/views/compare/show.json.jbuilder
+++ b/app/views/compare/show.json.jbuilder
@ -83,5 +83,3 @@ json.diff do
  end
 end
 json.status @merge_status
 json.message @merge_message
--- a/app/views/owners/index.json.jbuilder
+++ b/app/views/owners/index.json.jbuilder
@ -2,6 +2,6 @@ json.total_count @owners.size
 json.owners @owners.each do |owner|
  json.id owner.id
  json.type owner.type
-  json.name owner&.show_real_name
+  json.name owner.login
  json.avatar_url url_to_avatar(owner)
 end
--- a/app/views/projects/branches.json.jbuilder
+++ b/app/views/projects/branches.json.jbuilder
@ -4,8 +4,8 @@ json.array! @branches do |branch|
  json.user_can_merge branch['user_can_merge']
  json.protected branch['protected']
  json.http_url render_http_url(@project)
-  json.zip_url render_zip_url(@owner, @repository, branch['name'])
+  json.zip_url render_zip_url(@project, branch['name'])
-  json.tar_url render_tar_url(@owner, @repository, branch['name'])
+  json.tar_url render_tar_url(@project, branch['name'])
  json.last_commit do
    json.sha branch['commit']['id']
    json.message branch['commit']['message']
--- a/app/views/public_keys/create.json.jbuilder
+++ b/app/views/public_keys/create.json.jbuilder
@ -1,5 +0,0 @@
 json.id @public_key["id"]
 json.name @public_key["title"]
 json.content @public_key["key"]
 json.fingerprint @public_key["fingerprint"]
 json.created_time @public_key["created_at"].to_time.strftime("%Y/%m/%d %H:%M")
--- a/app/views/public_keys/index.json.jbuilder
+++ b/app/views/public_keys/index.json.jbuilder
@ -1,5 +0,0 @@
 json.total_count @public_keys.total_count 
 json.public_keys @public_keys do |public_key|
  json.(public_key, :id, :name, :content, :fingerprint, :created_unix)
  json.created_time Time.at(public_key.created_unix).strftime("%Y/%m/%d %H:%M")
 end
--- a/app/views/pull_requests/show.json.jbuilder
+++ b/app/views/pull_requests/show.json.jbuilder
@ -32,5 +32,3 @@ json.issue do
  json.version @issue.version.try(:name)
  json.issue_tags @issue.get_issue_tags
 end
 json.conflict_files @pull_request.conflict_files
--- a/app/views/repositories/_simple_entry.json.jbuilder
+++ b/app/views/repositories/_simple_entry.json.jbuilder
@ -11,16 +11,7 @@ if @project.forge?
  json.content decode64_content(entry, @owner, @repository, @ref)
  json.target entry['target']
-  
+  json.download_url entry['download_url']
  download_url = 
    if image_type
      dir_path = [@owner.login, @repository.identifier, "raw/branch", @ref].join('/')
      render_download_image_url(dir_path, entry['path'], decode64_content(entry, @owner, @repository, @ref))
    else
      entry['download_url']
    end
  json.download_url download_url
  json.direct_download direct_download
  json.image_type image_type
  json.is_readme_file is_readme?(entry['type'], entry['name'])
--- a/app/views/repositories/entries.json.jbuilder
+++ b/app/views/repositories/entries.json.jbuilder
@ -42,9 +42,8 @@ if @project.forge?
  #json.tags_count @tags_count
  #json.branches_count @branches_count
  json.commits_count @commits_count
-  # json.zip_url archive_repositories_path(@owner&.login, @repository, @ref)
+  json.zip_url render_zip_url(@project, @ref)
-  json.zip_url render_zip_url(@owner, @repository, @ref)
+  json.tar_url render_tar_url(@project, @ref)
  json.tar_url render_tar_url(@owner, @repository, @ref)
  json.entries do
    json.array! @entries do |entry|
      json.name entry['name']
--- a/app/views/repositories/tags.json.jbuilder
+++ b/app/views/repositories/tags.json.jbuilder
@ -2,8 +2,8 @@ json.array! @tags do |tag|
  if tag.present? 
    json.name tag['name']
    json.id tag['id']
-    json.zipball_url render_zip_url(@owner, @repository, tag['name'])
+    json.zipball_url tag['zipball_url']
-    json.tarball_url render_tar_url(@owner, @repository, tag['name'])
+    json.tarball_url tag['tarball_url']
    json.commit do
      json.sha tag['commit']['sha']
    end
--- a/app/views/version_releases/index.json.jbuilder
+++ b/app/views/version_releases/index.json.jbuilder
@ -14,8 +14,8 @@ json.releases do
        json.name re["name"]
        json.body re["body"]
        json.url re["url"]
-        json.tarball_url render_tar_url(@owner, @repository, re["tag_name"])
+        json.tarball_url re["tarball_url"]
-        json.zipball_url render_zip_url(@owner, @repository, re["tag_name"])
+        json.zipball_url re["zipball_url"]
        json.draft re["draft"] ? "草稿" : (re["prerelease"] ? "预发行" : "稳定")
        json.created_at format_time(version.created_at.to_s.to_time)
        json.published_at format_time(version.created_at.to_s.to_time)
@ -30,8 +30,8 @@ json.releases do
          json.name re["name"]
          json.body re["body"]
          json.url re["url"]
-          json.tarball_url render_tar_url(@owner, @repository, re["tag_name"])
+          json.tarball_url re["tarball_url"]
-          json.zipball_url render_zip_url(@owner, @repository, re["tag_name"])
+          json.zipball_url re["zipball_url"]
          json.draft re["draft"] ? "草稿" : (re["prerelease"] ? "预发行" : "稳定")
          json.created_at format_time(version.created_at.to_s.to_time)
          json.published_at format_time(version.created_at.to_s.to_time)
--- a/app/views/versions/index.json.jbuilder
+++ b/app/views/versions/index.json.jbuilder
@ -7,8 +7,8 @@ json.versions do
  json.array! @versions.each.to_a do |version|
    json.extract! version, :id, :name, :description, :effective_date,:status,:percent
-    json.open_issues_count (version.issues.issue_issue.size - version.issues.issue_issue.closed.size)
+    json.open_issues_count (version.issues_count - version.closed_issues_count)
-    json.close_issues_count version.issues.issue_issue.closed.size
+    json.close_issues_count version.closed_issues_count
    json.created_at format_time(version.created_on)
    json.updated_at format_time(version.updated_on)
    json.user_name version.version_user.try(:show_real_name)
--- a/app/views/versions/show.json.jbuilder
+++ b/app/views/versions/show.json.jbuilder
@ -1,7 +1,7 @@
 json.partial! "commons/success"
-json.issues_count @version_issues_size
+json.issues_count @version.issues_count
-json.open_issues_count @version_issues_size - @version_close_issues_size
+json.open_issues_count @version.issues_count - @version.closed_issues_count
-json.close_issues_count @version_close_issues_size
+json.close_issues_count @version.closed_issues_count
 json.limit @limit
 json.user_name @version.version_user.try(:show_real_name)
 json.user_login @version.version_user.try(:login)
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@ -1,7 +1,6 @@
 default: &default
  # 用户登入的时候设置/登出的时候清空
  autologin_cookie_name: 'autologin_trustie'
  platform_url: 'http://localhost:3000'
  #附件上传路径
--- a/config/database.yml.example
+++ b/config/database.yml.example
@ -17,13 +17,6 @@ default: &default
  username: root
  password: 123456
 #  socket: /var/run/mysqld/mysqld.sock
  gitea_server:
    aadapter: mysql2
    database: gitea_development
    host: 127.0.0.1
    username: root
    password: "123456"
    encoding: utf8
 development:
  <<: *default
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@ -4,5 +4,5 @@
 # Rails.application.config.session_store :active_record_store
 # Be sure to restart your server when you modify this file.
-Rails.application.config.session_store :cache_store, :expire_after => 24.hours, :httponly => true, :secure => false, key: '_educoder_session', domain: :all
+Rails.application.config.session_store :cache_store, :expire_after => 24.hours, :httponly => false, :secure => false, key: '_educoder_session', domain: :all
--- a/config/routes.rb
+++ b/config/routes.rb
@ -71,8 +71,6 @@ Rails.application.routes.draw do
      # end
    end
    resources :public_keys, only: [:index, :create, :destroy]
    resources :statistic, only: [:index] do
      collection do
        get :platform_profile
@ -418,6 +416,7 @@ Rails.application.routes.draw do
        member do
          get :files
          get :detail
          get :archive
          get :entries
          match :sub_entries, :via => [:get, :put]
          get :commits
@ -432,7 +431,6 @@ Rails.application.routes.draw do
          get 'commits/:sha', to: 'repositories#commit', as: 'commit'
          get 'readme'
          get 'languages'
          get 'archive/:archive', to: 'repositories#archive', as: "archive", constraints: { archive: /.+/, format: /(zip|gzip)/ }
        end
      end
--- a/db/migrate/20210621090005_add_project_language_index_to_projects.rb
+++ b/db/migrate/20210621090005_add_project_language_index_to_projects.rb
@ -1,7 +0,0 @@
 class AddProjectLanguageIndexToProjects < ActiveRecord::Migration[5.2]
  def change
    add_index :projects, :project_category_id
    add_index :projects, :project_language_id 
    add_index :projects, :license_id
  end
 end
--- a/db/migrate/20210624101058_change_columns_name_from_pull_requests.rb
+++ b/db/migrate/20210624101058_change_columns_name_from_pull_requests.rb
@ -1,22 +0,0 @@
 class ChangeColumnsNameFromPullRequests < ActiveRecord::Migration[5.2]
  def change
    rename_column :pull_requests, :pull_request_id, :gitea_id
    rename_column :pull_requests, :gpid, :gitea_number
    PullRequest.find_each do |pr|
      next if pr.gitea_number.blank?
      project = pr.project
      next if project.blank?
      owner = project&.owner
      gitea_pull = Gitea::PullRequest::GetService.call(owner.login, project.identifier, pr.gitea_number, owner&.gitea_token)
      next if gitea_pull.blank?
      pr.update_column(:gitea_id, gitea_pull["id"])
    end
  end
 end
--- a/lib/tasks/sync_projects_by_forked_project.rake
+++ b/lib/tasks/sync_projects_by_forked_project.rake
@ -1,26 +0,0 @@
 namespace :sync_projects_by_forked_project do 
  desc "sync projects is_public by forked project"
  task is_public: :environment do 
    count = 0
    Project.where.not(forked_from_project_id: nil).group(:forked_from_project_id).count.each do |k, _|
      project = Project.find_by_id(k)
      need_update_forked_projects = Project.where(forked_from_project_id: k)
      need_update_forked_projects.update_all(is_public: project&.is_public)
      need_update_forked_repositories = Repository.where(project_id: need_update_forked_projects.ids)
      need_update_forked_repositories.update_all(hidden: !project&.is_public)
      count +=need_update_forked_projects.size
    end
    puts "共同步了#{count}个项目"
  end
  task destroy: :environment do
    count = 0 
    Project.where.not(forked_from_project_id: nil).find_each do |project| 
      if project.forked_from_project.nil?
        project.update(forked_from_project_id: nil)
        count +=1 
      end
    end
    puts "共同步了#{count}个项目"
  end
 end
--- a/public/docs/api.html
+++ b/public/docs/api.html
@ -325,20 +325,6 @@
                  </li>
              </ul>
          </li>
          <li>
            <a href="#publickeys" class="toc-h1 toc-link" data-title="PublicKeys">PublicKeys</a>
              <ul class="toc-list-h2">
                  <li>
                    <a href="#public_keys" class="toc-h2 toc-link" data-title="public_keys列表">public_keys列表</a>
                  </li>
                  <li>
                    <a href="#public_key" class="toc-h2 toc-link" data-title="创建public_key">创建public_key</a>
                  </li>
                  <li>
                    <a href="#public_key-2" class="toc-h2 toc-link" data-title="删除public_key">删除public_key</a>
                  </li>
              </ul>
          </li>
          <li>
            <a href="#users" class="toc-h1 toc-link" data-title="Users">Users</a>
              <ul class="toc-list-h2">
@ -640,251 +626,6 @@ http://localhost:3000/api/ignores.json
 <aside class="success">
 Success — a happy kitten is an authenticated kitten!
 </aside>
 <!--
 * @Date: 2021-07-14 15:10:29
 * @LastEditors: viletyy
 * @LastEditTime: 2021-07-14 15:37:23
 * @FilePath: /forgeplus/app/docs/slate/source/includes/_public_keys.md
 -->
 <h1 id='publickeys'>PublicKeys</h1><h2 id='public_keys'>public_keys列表</h2>
 <p>获取public_keys列表，支持分页</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/public_keys.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/public_keys.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http'>HTTP 请求</h3>
 <p><code>GET api/public_keys.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>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='b302a98fa6'>返回字段说明</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>public_keys.id</td>
 <td>int</td>
 <td>ID</td>
 </tr>
 <tr>
 <td>public_keys.name</td>
 <td>string</td>
 <td>密钥标题</td>
 </tr>
 <tr>
 <td>public_keys.content</td>
 <td>string</td>
 <td>密钥内容</td>
 </tr>
 <tr>
 <td>public_keys.fingerprint</td>
 <td>string</td>
 <td>密钥标识</td>
 </tr>
 <tr>
 <td>public_keys.created_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">"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">"public_keys"</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">16</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">"xxx"</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">"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDe5ETOTB5PcmcYJkIhfF7+mxmJQDCLg7/LnMoKHpKoo/jYUnFU9OjfsxVo3FTNUvh2475WXMAur5KsFoNKjK9+JHxvoXyJKmyVPWgXU/NRxQyaWPnPLPK8qPRF5ksJE6feBOqtsdxsvBiHs2r1NX/U26Ecnpr6avudD0cmyrEfbYMWbupLrhsd39dswPT73f3W5jc7B9Y47Ioiv8UOju3ABt1+kpuAjaaVC6VtUQoEFiZb1y33yBnyePya7dvFyApyD4ILyyIG2rtZWK7l53YFnwZDuFsTWjEEEQD0U4FBSFdH5wtwx0WQLMSNyTtaFBSG0kJ+uiQQIrxlvikcm63df7zbC3/rWLPsKgW122Zt966dcpFqiCiJNDKZPPw3qpg8TBL6X+qIZ+FxVEk/16/zScpyEfoxQp0GvgxI7hPLErmfkC5tMsib8MAXYBNyvJXna0vg/wOaNNIaI4SAH9Ksh3f/TtalYVjp6WxIwVBfnbq51WnmlnEXePtX6XjAGL+GbF2VQ1nv/IzrY09tNbTV6wQsrSIP3VDzYQxdJ1rdsVNMoJB0H2Pu0NdcSz53Wx45N+myD0QnE05ss+zDp5StY90OYsx2aCo6qAA8Qn2jUjdta7MQWwkPfKrta4tTQ0XbWMjx4/E1+l3J5liwZkl2XOGOwhfXdRsBjaEziZ18kQ== yystopf@163.com"</span><span class="p">,</span><span class="w">
            </span><span class="nl">"fingerprint"</span><span class="p">:</span><span class="w"> </span><span class="s2">"SHA256:cU8AK/+roqUUyiaYXIdS2Nj4+Rb2p6rqWSeRDc+aqKM"</span><span class="p">,</span><span class="w">
            </span><span class="nl">"created_unix"</span><span class="p">:</span><span class="w"> </span><span class="mi">1626246596</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">"2021/07/14 15:09"</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 — a happy kitten is an authenticated kitten!
 </aside>
 <h2 id='public_key'>创建public_key</h2>
 <p>创建public_key</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/public_keys.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/public_keys.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-2'>HTTP 请求</h3>
 <p><code>POST api/public_keys.json</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>key</td>
 <td>是</td>
 <td>否</td>
 <td>string</td>
 <td>密钥</td>
 </tr>
 <tr>
 <td>title</td>
 <td>是</td>
 <td>否</td>
 <td>string</td>
 <td>密钥标题</td>
 </tr>
 </tbody></table>
 <blockquote>
 <p>请求的JSON示例：
 <code>json
 {
  &quot;public_key&quot;: {
    &quot;key&quot;: &quot;ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDe5ETOTB5PcmcYJkIhfF7+mxmJQDCLg7/LnMoKHpKoo/jYUnFU9OjfsxVo3FTNUvh2475WXMAur5KsFoNKjK9+JHxvoXyJKmyVPWgXU/NRxQyaWPnPLPK8qPRF5ksJE6feBOqtsdxsvBiHs2r1NX/U26Ecnpr6avudD0cmyrEfbYMWbupLrhsd39dswPT73f3W5jc7B9Y47Ioiv8UOju3ABt1+kpuAjaaVC6VtUQoEFiZb1y33yBnyePya7dvFyApyD4ILyyIG2rtZWK7l53YFnwZDuFsTWjEEEQD0U4FBSFdH5wtwx0WQLMSNyTtaFBSG0kJ+uiQQIrxlvikcm63df7zbC3/rWLPsKgW122Zt966dcpFqiCiJNDKZPPw3qpg8TBL6X+qIZ+FxVEk/16/zScpyEfoxQp0GvgxI7hPLErmfkC5tMsib8MAXYBNyvJXna0vg/wOaNNIaI4SAH9Ksh3f/TtalYVjp6WxIwVBfnbq51WnmlnEXePtX6XjAGL+GbF2VQ1nv/IzrY09tNbTV6wQsrSIP3VDzYQxdJ1rdsVNMoJB0H2Pu0NdcSz53Wx45N+myD0QnE05ss+zDp5StY90OYsx2aCo6qAA8Qn2jUjdta7MQWwkPfKrta4tTQ0XbWMjx4/E1+l3J5liwZkl2XOGOwhfXdRsBjaEziZ18kQ== yystopf@163.com&quot;, 
    &quot;title&quot;: &quot;xxx&quot;
  }
 }
 </code></p>
 </blockquote>
 <h3 id='b302a98fa6-2'>返回字段说明</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>id</td>
 <td>int</td>
 <td>ID</td>
 </tr>
 <tr>
 <td>name</td>
 <td>string</td>
 <td>密钥标题</td>
 </tr>
 <tr>
 <td>content</td>
 <td>string</td>
 <td>密钥内容</td>
 </tr>
 <tr>
 <td>fingerprint</td>
 <td>string</td>
 <td>密钥标识</td>
 </tr>
 <tr>
 <td>created_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">17</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">"xxx"</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">"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDe5ETOTB5PcmcYJkIhfF7+mxmJQDCLg7/LnMoKHpKoo/jYUnFU9OjfsxVo3FTNUvh2475WXMAur5KsFoNKjK9+JHxvoXyJKmyVPWgXU/NRxQyaWPnPLPK8qPRF5ksJE6feBOqtsdxsvBiHs2r1NX/U26Ecnpr6avudD0cmyrEfbYMWbupLrhsd39dswPT73f3W5jc7B9Y47Ioiv8UOju3ABt1+kpuAjaaVC6VtUQoEFiZb1y33yBnyePya7dvFyApyD4ILyyIG2rtZWK7l53YFnwZDuFsTWjEEEQD0U4FBSFdH5wtwx0WQLMSNyTtaFBSG0kJ+uiQQIrxlvikcm63df7zbC3/rWLPsKgW122Zt966dcpFqiCiJNDKZPPw3qpg8TBL6X+qIZ+FxVEk/16/zScpyEfoxQp0GvgxI7hPLErmfkC5tMsib8MAXYBNyvJXna0vg/wOaNNIaI4SAH9Ksh3f/TtalYVjp6WxIwVBfnbq51WnmlnEXePtX6XjAGL+GbF2VQ1nv/IzrY09tNbTV6wQsrSIP3VDzYQxdJ1rdsVNMoJB0H2Pu0NdcSz53Wx45N+myD0QnE05ss+zDp5StY90OYsx2aCo6qAA8Qn2jUjdta7MQWwkPfKrta4tTQ0XbWMjx4/E1+l3J5liwZkl2XOGOwhfXdRsBjaEziZ18kQ== yystopf@163.com"</span><span class="p">,</span><span class="w">
    </span><span class="nl">"fingerprint"</span><span class="p">:</span><span class="w"> </span><span class="s2">"SHA256:cU8AK/+roqUUyiaYXIdS2Nj4+Rb2p6rqWSeRDc+aqKM"</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">"2021/07/14 15:26"</span><span class="w">
 </span><span class="p">}</span><span class="w">
 </span></code></pre></div>
 <aside class="success">
 Success — a happy kitten is an authenticated kitten!
 </aside>
 <h2 id='public_key-2'>删除public_key</h2>
 <p>删除public_key</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/public_keys/:id.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/public_keys/:id.json</span><span class="dl">'</span><span class="p">)</span>
 </code></pre></div><h3 id='http-3'>HTTP 请求</h3>
 <p><code>DELETE api/public_keys/:id.json</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>id</td>
 <td>是</td>
 <td>否</td>
 <td>int</td>
 <td>密钥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">"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 — a happy kitten is an authenticated kitten!
 </aside>
 <!--
 * @Date: 2021-03-01 10:35:21
 * @LastEditors: viletyy
Author	SHA1	Message	Date
jasder	cb11a5c8e9	发布v3.1.1版本 * FIX 修复pulls、issues 搜索数量统计问题 * FIX 解决在线创建文件错误提示信息不准确的问题 * FIX table name bug * FIX 解决applied_projects相关表操作的问题 * FIX 解决排序参数的判断预防SQL注入 * FIX 项目导航栏数量改为开启中的数量 * FIX 解决项目邀请码的索引查询问题 * FIX FIX get readme file bug * FIX sql attack * FIX projects load by invite code slowly	2021-06-18 17:09:57 +08:00
jasder	c5d73b7cf8	v3.1.0 * 改版升级个人主页 * 修复bug * 更改license	2021-06-09 09:52:57 +08:00
jasder	8a10a183e0	Merge branch 'develop'	2021-05-24 10:18:03 +08:00
jasder	6d1bcabd51	Merge branch 'master' of https://git.trustie.net/jasder/forgeplus	2021-05-24 10:10:24 +08:00
jasder	86f03ffafc	Merge OK	2021-05-08 17:46:22 +08:00