From 53b66f6145c6b4bf6fd7b964e5070ef5351f6428 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 30 Aug 2023 16:34:23 +0800
Subject: [PATCH 001/130] =?UTF-8?q?fixed=20=E6=96=87=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E6=8F=90=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/interactors/gitea/delete_file_interactor.rb         | 3 +++
 app/interactors/gitea/update_file_interactor.rb         | 3 +++
 app/services/gitea/repository/entries/create_service.rb | 6 ++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/interactors/gitea/delete_file_interactor.rb b/app/interactors/gitea/delete_file_interactor.rb
index 103df6cd..03ddf423 100644
--- a/app/interactors/gitea/delete_file_interactor.rb
+++ b/app/interactors/gitea/delete_file_interactor.rb
@@ -42,6 +42,9 @@ module Gitea
     def render_result(response)
       if response.status == 200
         @result = JSON.parse(response.body)
+      else
+        Rails.logger.error("Gitea::Repository::Entries::DeleteService error[#{response.status}]======#{response.body}")
+        @error = "删除失败，请确认该分支是否是保护分支。"
       end
     end
 
diff --git a/app/interactors/gitea/update_file_interactor.rb b/app/interactors/gitea/update_file_interactor.rb
index 38cfd98a..1b729e2c 100644
--- a/app/interactors/gitea/update_file_interactor.rb
+++ b/app/interactors/gitea/update_file_interactor.rb
@@ -42,6 +42,9 @@ module Gitea
     def render_result(response)
       if response.status == 200
         @result = JSON.parse(response.body)
+      else
+        Rails.logger.error("Gitea::Repository::Entries::UpdateService error[#{response.status}]======#{response.body}")
+        @error = "更新失败，请确认该分支是否是保护分支。"
       end
     end
 
diff --git a/app/services/gitea/repository/entries/create_service.rb b/app/services/gitea/repository/entries/create_service.rb
index 14b37333..ac27b3af 100644
--- a/app/services/gitea/repository/entries/create_service.rb
+++ b/app/services/gitea/repository/entries/create_service.rb
@@ -53,7 +53,7 @@ class Gitea::Repository::Entries::CreateService < Gitea::ClientService
   def status_payload(status, body)
     case status
     when 201 then success(json_parse!(body))
-    when 403 then error("你没有权限操作!")
+    when 403 then error("你没有权限操作，请确认该分支是否是保护分支。")
     when 404 then error("你操作的链接不存在!")
     when 422 
       if @body[:new_branch].present? && (@body[:new_branch].include?('/') || @body[:new_branch].include?('\'') || @body[:new_branch].include?('^') || @body[:new_branch].include?('*'))
@@ -61,7 +61,9 @@ class Gitea::Repository::Entries::CreateService < Gitea::ClientService
       else
         error("#{filepath}文件已存在，不能重复创建!")
       end
-    else error("系统错误!")
+    else
+      Rails.logger.error("Gitea api url==#{url},status:#{status},body=#{body}")
+      error("系统错误!")
     end
   end
 end

From cdf62b4626f0c423f1e480cb53ebc6fe3ccb0277 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 30 Aug 2023 17:42:24 +0800
Subject: [PATCH 002/130] =?UTF-8?q?fixed=20=E5=88=86=E6=94=AF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=B6=E6=9C=89=E5=BC=80=E5=90=AF=E7=9A=84pr?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=B8=80=E5=90=8C=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/branches_controller.rb    | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb
index 0c89f601..40f44fea 100644
--- a/app/controllers/api/v1/projects/branches_controller.rb
+++ b/app/controllers/api/v1/projects/branches_controller.rb
@@ -17,7 +17,16 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
 
   def destroy 
     @result_object = Api::V1::Projects::Branches::DeleteService.call(@project, params[:name], current_user&.gitea_token)
-    if @result_object 
+    if @result_object
+      # 有开启的pr需要一同关闭
+      # 1、删除本仓库中存在未关闭的pr,即本仓库分支1->分支2
+      # 2、如果是fork仓库，考虑删除主仓库中存在未关闭的pr,即本仓库：分支1->主：分支2，同时分两种删除：1删除本仓库分支1，2删除主仓库分支2
+      close_pull_requests_by(@project, params[:name])
+      if @project.forked_from_project_id.present?
+        # fork项目中删除分支
+        close_pull_requests_by(@project.fork_project, params[:name])
+      end
+
       return render_ok 
     else
       return render_error('删除分支失败!') 
@@ -39,4 +48,19 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
   def branch_params 
     params.require(:branch).permit(:new_branch_name, :old_branch_name)
   end
+
+  def close_pull_requests_by(project, branch_name)
+    open_pull_requests = project.pull_requests.opening.where(head: branch_name).or(project.pull_requests.opening.where(base: branch_name))
+    if open_pull_requests.present?
+      open_pull_requests.each do |pull_request|
+        closed = PullRequests::CloseService.call(project.owner, project.repository, pull_request, current_user)
+        if closed === true
+          pull_request.project_trends.create!(user: current_user, project: project,action_type: ProjectTrend::CLOSE)
+          # 合并请求下issue处理为关闭
+          pull_request.issue&.update_attributes!({status_id:5})
+          SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, pull_request.id) if Site.has_notice_menu?
+        end
+      end
+    end
+  end
 end
\ No newline at end of file

From d19c94666a6fffb40257dbce6265e4811bc08734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Mon, 16 Oct 2023 10:57:37 +0800
Subject: [PATCH 003/130] =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=BB=93=E5=BA=93id?=
 =?UTF-8?q?=E6=8B=BF=E7=94=A8=E6=88=B7=E6=A0=87=E8=AF=86=E5=92=8C=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 13 +++++++++++--
 config/routes.rb                       |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 446e4bb3..2045eb7f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -4,9 +4,9 @@ class ProjectsController < ApplicationController
   include ProjectsHelper
   include Acceleratorable
 
-  before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend banner_recommend about menu_list verify_auth_token]
+  before_action :require_login, except: %i[index branches branches_slice group_type_list simple show mp_show fork_users praise_users watch_users recommend banner_recommend about menu_list verify_auth_token]
   before_action :require_profile_completed, only: [:create, :migrate,:page_migrate,:verify_auth_token]
-  before_action :load_repository, except: %i[index group_type_list migrate page_migrate create recommend banner_recommend verify_auth_token]
+  before_action :load_repository, except: %i[index mp_show group_type_list migrate page_migrate create recommend banner_recommend verify_auth_token]
   before_action :authorizate_user_can_edit_project!, only: %i[update]
   before_action :project_public?, only: %i[fork_users praise_users watch_users]
   before_action :request_limit, only: %i[index]
@@ -232,6 +232,15 @@ class ProjectsController < ApplicationController
   def show
   end
 
+  def mp_show
+    @project = Project.joins(:owner).find params[:project_id]
+    data={
+      owner:@project.owner.try(:login),
+      identifier:@project.identifier
+    }
+    render_ok(data:data)
+  end
+
   def destroy
     if current_user.admin? || @project.manager?(current_user)
       ActiveRecord::Base.transaction do
diff --git a/config/routes.rb b/config/routes.rb
index 312f267d..7694a77c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -127,6 +127,7 @@ Rails.application.routes.draw do
 
     # blockchain related routes
     get 'users/blockchain/balance', to: 'users#blockchain_balance'
+    get 'projects/mp_show', to: 'projects#mp_show'
     post 'users/blockchain/balance_project', to: 'users#blockchain_balance_one_project'
     post 'users/blockchain/transfer', to: 'users#blockchain_transfer'
     post 'users/blockchain/exchange', to: 'users#blockchain_exchange'

From 472499e2786c84642f3b03ca60b03a8c22ec4b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Tue, 17 Oct 2023 11:25:25 +0800
Subject: [PATCH 004/130] mp_index for issue_priorities issue_tags
 issue_statues

---
 .../v1/issues/issue_priorities_controller.rb  |  8 ++++
 .../api/v1/issues/issue_tags_controller.rb    |  9 +++-
 .../api/v1/issues/statues_controller.rb       |  7 ++++
 app/models/issue_tag.rb                       | 41 +++++++++++++------
 config/routes/api.rb                          | 18 ++++++--
 5 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/app/controllers/api/v1/issues/issue_priorities_controller.rb b/app/controllers/api/v1/issues/issue_priorities_controller.rb
index 319994a2..c3a223a9 100644
--- a/app/controllers/api/v1/issues/issue_priorities_controller.rb
+++ b/app/controllers/api/v1/issues/issue_priorities_controller.rb
@@ -7,4 +7,12 @@ class Api::V1::Issues::IssuePrioritiesController < Api::V1::BaseController
     @priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword]
     @priorities = kaminary_select_paginate(@priorities)
   end
+
+  def mp_index 
+    @priorities = IssuePriority.order(position: :asc)
+    @priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword]
+    @priorities = kaminary_select_paginate(@priorities)
+    render "index"
+  end
+
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb
index fe2eccea..e77b5425 100644
--- a/app/controllers/api/v1/issues/issue_tags_controller.rb
+++ b/app/controllers/api/v1/issues/issue_tags_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::Issues::IssueTagsController < Api::V1::BaseController 
-  before_action :require_login, except: [:index]
+  before_action :require_login, except: [:index, :mp_index]
   before_action :require_public_and_member_above, only: [:index] 
   before_action :require_operate_above, only: [:create, :update, :destroy]
 
@@ -7,12 +7,17 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController
     @issue_tags = @project.issue_tags.reorder("#{sort_by} #{sort_direction}")
     @issue_tags = @issue_tags.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
     if params[:only_name]
-      @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color))
+      @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color)) 
     else 
       @issue_tags = kaminari_paginate(@issue_tags.includes(:project, :user, :issue_issues, :pull_request_issues))
     end
   end
 
+  def mp_index
+    @issue_tags = IssueTag.init_mp_issues_tags
+    render_ok(@issue_tags)
+  end
+
   def create 
     @issue_tag = @project.issue_tags.new(issue_tag_params)
     if @issue_tag.save!
diff --git a/app/controllers/api/v1/issues/statues_controller.rb b/app/controllers/api/v1/issues/statues_controller.rb
index 5a7fbc33..3e2a837e 100644
--- a/app/controllers/api/v1/issues/statues_controller.rb
+++ b/app/controllers/api/v1/issues/statues_controller.rb
@@ -8,4 +8,11 @@ class Api::V1::Issues::StatuesController < Api::V1::BaseController
     @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
     @statues = kaminary_select_paginate(@statues)
   end
+
+  def mp_index
+    @statues = IssueStatus.order("position asc")
+    @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
+    @statues = kaminary_select_paginate(@statues)
+    render "index"
+  end
 end
\ No newline at end of file
diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb
index 7251e98f..a3782aba 100644
--- a/app/models/issue_tag.rb
+++ b/app/models/issue_tag.rb
@@ -32,18 +32,7 @@ class IssueTag < ApplicationRecord
   validates :name, uniqueness: {scope: :project_id, message: "已存在" }
 
   def self.init_data(project_id)
-    data = [
-      ["缺陷", "表示存在意外问题或错误", "#d92d4c"],
-      ["功能", "表示新功能申请", "#ee955a"],
-      ["疑问", "表示存在疑惑", "#2d6ddc"],
-      ["支持", "表示特定功能或特定需求", "#019549"],
-      ["任务", "表示需要分配的任务", "#c1a30d"],
-      ["协助", "表示需要社区用户协助", "#2a0dc1"],
-      ["搁置", "表示此问题暂时不会继续处理", "#892794"],
-      ["文档", "表示文档材料补充", "#9ed600"],
-      ["测试", "表示需要测试的需求", "#2897b9"],
-      ["重复", "表示已存在类似的疑修", "#bb5332"]
-    ]
+    data = init_issue_tag_data
     data.each do |item| 
       next if IssueTag.exists?(project_id: project_id, name: item[0])
       IssueTag.create!(project_id: project_id, name: item[0], description: item[1], color: item[2])
@@ -57,6 +46,34 @@ class IssueTag < ApplicationRecord
   end
 
 
+  def  self.init_issue_tag_data
+    [
+      ["缺陷", "表示存在意外问题或错误", "#d92d4c"],
+      ["功能", "表示新功能申请", "#ee955a"],
+      ["疑问", "表示存在疑惑", "#2d6ddc"],
+      ["支持", "表示特定功能或特定需求", "#019549"],
+      ["任务", "表示需要分配的任务", "#c1a30d"],
+      ["协助", "表示需要社区用户协助", "#2a0dc1"],
+      ["搁置", "表示此问题暂时不会继续处理", "#892794"],
+      ["文档", "表示文档材料补充", "#9ed600"],
+      ["测试", "表示需要测试的需求", "#2897b9"],
+      ["重复", "表示已存在类似的疑修", "#bb5332"]
+    ]
+  end
+
+  def self.init_mp_issues_tags
+    data = {"total_count": 10,}
+    data["issue_tags"] = init_issue_tag_data.map{|item|
+      {
+        "name":  item[0],
+        "description": item[1],
+        "color": item[2],
+      }
+    }
+    data
+  end
+
+
   def to_builder 
     Jbuilder.new do |tag|
       tag.(self, :id, :name, :description)
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 4d554768..b6698996 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -55,12 +55,24 @@ defaults format: :json do
             end
           end
           scope module: :issues do 
-            resources :issue_tags, except: [:new, :edit]
+            resources :issue_tags, except: [:new, :edit] do
+            collection do 
+              get :mp_index
+            end
+          end
             resources :milestones, except: [:new, :edit]
-            resources :issue_statues, only: [:index], controller: '/api/v1/issues/statues'
+            resources :issue_statues, only: [:index], controller: '/api/v1/issues/statues' do
+              collection do 
+                get :mp_index
+              end
+            end
             resources :issue_authors, only: [:index], controller: '/api/v1/issues/authors'
             resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners'
-            resources :issue_priorities, only: [:index]
+            resources :issue_priorities, only: [:index] do
+              collection do 
+                get :mp_index
+              end
+            end
           end
 
           # projects文件夹下的

From 526dac1230ce8c9edb251fdcbe43fb1e351c74cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 18 Oct 2023 13:21:41 +0800
Subject: [PATCH 005/130] change mp to pm

---
 .../api/v1/issues/issue_priorities_controller.rb            | 2 +-
 app/controllers/api/v1/issues/issue_tags_controller.rb      | 4 ++--
 app/controllers/api/v1/issues/statues_controller.rb         | 2 +-
 app/models/issue.rb                                         | 2 ++
 config/routes/api.rb                                        | 6 +++---
 ...18034251_add_pm_project_id_and_pm_sprint_id_to_issues.rb | 6 ++++++
 6 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20231018034251_add_pm_project_id_and_pm_sprint_id_to_issues.rb

diff --git a/app/controllers/api/v1/issues/issue_priorities_controller.rb b/app/controllers/api/v1/issues/issue_priorities_controller.rb
index c3a223a9..2df1288f 100644
--- a/app/controllers/api/v1/issues/issue_priorities_controller.rb
+++ b/app/controllers/api/v1/issues/issue_priorities_controller.rb
@@ -8,7 +8,7 @@ class Api::V1::Issues::IssuePrioritiesController < Api::V1::BaseController
     @priorities = kaminary_select_paginate(@priorities)
   end
 
-  def mp_index 
+  def pm_index 
     @priorities = IssuePriority.order(position: :asc)
     @priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword]
     @priorities = kaminary_select_paginate(@priorities)
diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb
index e77b5425..39534c31 100644
--- a/app/controllers/api/v1/issues/issue_tags_controller.rb
+++ b/app/controllers/api/v1/issues/issue_tags_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::Issues::IssueTagsController < Api::V1::BaseController 
-  before_action :require_login, except: [:index, :mp_index]
+  before_action :require_login, except: [:index, :pm_index]
   before_action :require_public_and_member_above, only: [:index] 
   before_action :require_operate_above, only: [:create, :update, :destroy]
 
@@ -13,7 +13,7 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController
     end
   end
 
-  def mp_index
+  def pm_index
     @issue_tags = IssueTag.init_mp_issues_tags
     render_ok(@issue_tags)
   end
diff --git a/app/controllers/api/v1/issues/statues_controller.rb b/app/controllers/api/v1/issues/statues_controller.rb
index 3e2a837e..c6495ee2 100644
--- a/app/controllers/api/v1/issues/statues_controller.rb
+++ b/app/controllers/api/v1/issues/statues_controller.rb
@@ -9,7 +9,7 @@ class Api::V1::Issues::StatuesController < Api::V1::BaseController
     @statues = kaminary_select_paginate(@statues)
   end
 
-  def mp_index
+  def pm_index
     @statues = IssueStatus.order("position asc")
     @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
     @statues = kaminary_select_paginate(@statues)
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 4420ed18..14876da6 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -34,6 +34,8 @@
 #  ref_name             :string(255)
 #  branch_name          :string(255)
 #  blockchain_token_num :integer
+#  pm_project_id        :integer
+#  pm_sprint_id         :integer
 #
 # Indexes
 #
diff --git a/config/routes/api.rb b/config/routes/api.rb
index b6698996..41d33116 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -57,20 +57,20 @@ defaults format: :json do
           scope module: :issues do 
             resources :issue_tags, except: [:new, :edit] do
             collection do 
-              get :mp_index
+              get :pm_index
             end
           end
             resources :milestones, except: [:new, :edit]
             resources :issue_statues, only: [:index], controller: '/api/v1/issues/statues' do
               collection do 
-                get :mp_index
+                get :pm_index
               end
             end
             resources :issue_authors, only: [:index], controller: '/api/v1/issues/authors'
             resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners'
             resources :issue_priorities, only: [:index] do
               collection do 
-                get :mp_index
+                get :pm_index
               end
             end
           end
diff --git a/db/migrate/20231018034251_add_pm_project_id_and_pm_sprint_id_to_issues.rb b/db/migrate/20231018034251_add_pm_project_id_and_pm_sprint_id_to_issues.rb
new file mode 100644
index 00000000..2c75693f
--- /dev/null
+++ b/db/migrate/20231018034251_add_pm_project_id_and_pm_sprint_id_to_issues.rb
@@ -0,0 +1,6 @@
+class AddPmProjectIdAndPmSprintIdToIssues < ActiveRecord::Migration[5.2]
+  def change
+    add_column :issues, :pm_project_id , :integer
+    add_column :issues, :pm_sprint_id , :integer
+  end
+end

From 2c4253b04bbec3bf040dc7b3db5963009865172d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 18 Oct 2023 13:27:09 +0800
Subject: [PATCH 006/130] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=9Epublic?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 1 +
 app/models/identity_verification.rb       | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 4949946c..cedefd1f 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -229,6 +229,7 @@ class AttachmentsController < ApplicationController
         end
         tip_exception(403, "您没有权限进入") if project.present? && !candown
       end
+      tip_exception(403, "您没有权限查看") if project.present? && !candown if @file.is_public == 0 &&  author_id != current_user.id
     end
   end
 
diff --git a/app/models/identity_verification.rb b/app/models/identity_verification.rb
index 3c8c88d9..6ea6e054 100644
--- a/app/models/identity_verification.rb
+++ b/app/models/identity_verification.rb
@@ -23,7 +23,10 @@
 class IdentityVerification < ApplicationRecord
     belongs_to :user
     enum state: { "待审核": 0, "已通过": 1, "已拒绝": 2}
-
+    after_create do
+        Attachment.where(id:[card_front,card_back,hold_card_front,hold_card_back]).update_all(is_public:0)
+    end
+    
     after_save do
         if state == "已通过"
             user.update(id_card_verify: true, website_permission: true)

From 93dc10b6a5693e89582a8fe074059fd7249851cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 18 Oct 2023 13:38:09 +0800
Subject: [PATCH 007/130] fix attachment_candown

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

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index cedefd1f..cfce8b7a 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -229,7 +229,7 @@ class AttachmentsController < ApplicationController
         end
         tip_exception(403, "您没有权限进入") if project.present? && !candown
       end
-      tip_exception(403, "您没有权限查看") if project.present? && !candown if @file.is_public == 0 &&  author_id != current_user.id
+      tip_exception(403, "您没有权限查看") if @file.is_public == 0 &&  @file.author_id != current_user.id
     end
   end
 

From 467a4f0b94f481ba70a08a995b5c89d1c224c278 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 18 Oct 2023 15:16:14 +0800
Subject: [PATCH 008/130] =?UTF-8?q?fixed=20issue=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E9=99=84=E4=BB=B6=E8=A7=A3=E6=9E=90=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=EF=BC=8C=E5=A2=9E=E5=BC=BA=E9=99=84=E4=BB=B6=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/issues_controller.rb |  3 ++-
 app/controllers/issues_controller.rb        |  1 +
 app/models/issue.rb                         | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb
index 7238254d..ebba95e2 100644
--- a/app/controllers/api/v1/issues_controller.rb
+++ b/app/controllers/api/v1/issues_controller.rb
@@ -23,7 +23,8 @@ class Api::V1::IssuesController < Api::V1::BaseController
   before_action :load_issue, only: [:show, :update, :destroy]
   before_action :check_issue_operate_permission, only: [:update, :destroy]
 
-  def show 
+  def show
+    @issue.associate_attachment_container
     @user_permission = current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user)
   end
 
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 0015b518..cb7beb40 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -321,6 +321,7 @@ class IssuesController < ApplicationController
     @issue_user = @issue.user
     @issue_assign_to = @issue.get_assign_user
     @join_users = join_users(@issue)
+    @issue.associate_attachment_container
     #总耗时
     # cost_time(@issue)
 
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 14876da6..f568e028 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -94,7 +94,7 @@ class Issue < ApplicationRecord
   scope :closed, ->{where(status_id: 5)}
   scope :opened, ->{where.not(status_id: 5)}
   after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
-  after_save :change_versions_count, :send_update_message_to_notice_system
+  after_save :change_versions_count, :send_update_message_to_notice_system, :associate_attachment_container
   after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic
 
   def incre_project_common
@@ -222,6 +222,18 @@ class Issue < ApplicationRecord
     SendTemplateMessageJob.perform_later('IssueExpire', self.id) if Site.has_notice_menu? && self.due_date == Date.today + 1.days
   end
 
+  # 关附件到功能
+  def associate_attachment_container
+    att_ids = []
+    # 附件的格式为（/api/attachments/ + 附件id）的形式，提取出id进行附件属性关联，做附件访问权限控制
+    att_ids += self.description.to_s.scan(/\(\/api\/attachments\/.+\)/).map{|s|s.match(/\d+/)[0]}
+    att_ids += self.description.to_s.scan(/\/api\/attachments\/.+\"/).map{|s|s.match(/\d+/)[0]}
+    att_ids += self.description.to_s.scan(/\/api\/attachments\/\d+/).map{|s|s.match(/\d+/)[0]}
+    if att_ids.present?
+      Attachment.where(id: att_ids).where(container_type: nil).update_all(container_id: self.id, container_type: self.class.name)
+    end
+  end
+
   def to_builder 
     Jbuilder.new do |issue|
       issue.(self, :id, :project_issues_index, :subject, :description, :branch_name, :start_date, :due_date)

From e8b36f33edbc9c0cacf8a0e9cc953ebfddbac59c Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 18 Oct 2023 15:24:39 +0800
Subject: [PATCH 009/130] =?UTF-8?q?fixed=20issue=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E9=99=84=E4=BB=B6=E8=A7=A3=E6=9E=90=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=EF=BC=8C=E5=A2=9E=E5=BC=BA=E9=99=84=E4=BB=B6=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journal.rb                              | 14 ++++++++++++++
 .../api/v1/issues/journals/index.json.jbuilder     |  1 +
 2 files changed, 15 insertions(+)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index ce69c1f3..3229ae88 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -53,10 +53,24 @@ class Journal < ApplicationRecord
 
   enum state: {opened: 0, resolved: 1, disabled: 2}
 
+  after_save :associate_attachment_container
+
   def is_journal_detail?
     self.notes.blank? && self.journal_details.present?
   end
 
+  # 关附件到功能
+  def associate_attachment_container
+    att_ids = []
+    # 附件的格式为（/api/attachments/ + 附件id）的形式，提取出id进行附件属性关联，做附件访问权限控制
+    att_ids += self.notes.to_s.scan(/\(\/api\/attachments\/.+\)/).map{|s|s.match(/\d+/)[0]}
+    att_ids += self.notes.to_s.scan(/\/api\/attachments\/.+\"/).map{|s|s.match(/\d+/)[0]}
+    att_ids += self.notes.to_s.scan(/\/api\/attachments\/\d+/).map{|s|s.match(/\d+/)[0]}
+    if att_ids.present?
+      Attachment.where(id: att_ids).where(container_type: nil).update_all(container_id: self.id, container_type: self.class.name)
+    end
+  end
+
   def operate_content 
     content = ""
     detail = self.journal_details.take
diff --git a/app/views/api/v1/issues/journals/index.json.jbuilder b/app/views/api/v1/issues/journals/index.json.jbuilder
index 49f94aa3..453c39c5 100644
--- a/app/views/api/v1/issues/journals/index.json.jbuilder
+++ b/app/views/api/v1/issues/journals/index.json.jbuilder
@@ -3,5 +3,6 @@ json.total_operate_journals_count @total_operate_journals_count
 json.total_comment_journals_count @total_comment_journals_count
 json.total_count @journals.total_count 
 json.journals @journals do |journal|
+  journal.associate_attachment_container
   json.partial! "detail", journal: journal 
 end
\ No newline at end of file

From 25df7c02d508b704b5976f121f7ae38abeed9f13 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Tue, 24 Oct 2023 20:41:02 +0800
Subject: [PATCH 010/130] =?UTF-8?q?fixed=20issue=E5=92=8C=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E9=87=8C=E7=9A=84=E9=99=84=E4=BB=B6=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=EF=BC=8C=E5=A2=9E=E5=BC=BA=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6,?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0=20=E9=A1=B9=E7=9B=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 3 +++
 app/models/issue.rb                       | 2 +-
 app/models/journal.rb                     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index cfce8b7a..2bbccb49 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -224,6 +224,9 @@ class AttachmentsController < ApplicationController
         elsif @file.container.is_a?(Journal)
           project = @file.container.issue.project
           candown = project.is_public || (current_user.logged? && project.member?(current_user))
+        elsif @file.container.is_a?(Project)
+          project = @file.container
+          candown = project.is_public || (current_user.logged? && project.member?(current_user))
         else
           project = nil
         end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index f568e028..a5fee95f 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -230,7 +230,7 @@ class Issue < ApplicationRecord
     att_ids += self.description.to_s.scan(/\/api\/attachments\/.+\"/).map{|s|s.match(/\d+/)[0]}
     att_ids += self.description.to_s.scan(/\/api\/attachments\/\d+/).map{|s|s.match(/\d+/)[0]}
     if att_ids.present?
-      Attachment.where(id: att_ids).where(container_type: nil).update_all(container_id: self.id, container_type: self.class.name)
+      Attachment.where(id: att_ids).where("container_type IS NULL OR container_type = 'Issue'").update_all(container_id: self.project_id, container_type: "Project")
     end
   end
 
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 3229ae88..30cd9414 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -67,7 +67,7 @@ class Journal < ApplicationRecord
     att_ids += self.notes.to_s.scan(/\/api\/attachments\/.+\"/).map{|s|s.match(/\d+/)[0]}
     att_ids += self.notes.to_s.scan(/\/api\/attachments\/\d+/).map{|s|s.match(/\d+/)[0]}
     if att_ids.present?
-      Attachment.where(id: att_ids).where(container_type: nil).update_all(container_id: self.id, container_type: self.class.name)
+      Attachment.where(id: att_ids).where("container_type IS NULL OR container_type = 'Journal'").update_all(container_id: self.issue.project_id, container_type: "Project")
     end
   end
 

From 9c02b8ba3145eaf2c8d71cde6a00ad0dc03f16e8 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 14 Nov 2023 16:53:29 +0800
Subject: [PATCH 011/130] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aissue?=
 =?UTF-8?q?=E5=AD=90=E8=AF=84=E8=AE=BA=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journal.rb                               | 2 +-
 app/services/api/v1/issues/journals/list_service.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 30cd9414..e0553ad4 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -44,7 +44,7 @@ class Journal < ApplicationRecord
   belongs_to :reply_journal, class_name: 'Journal', foreign_key: :reply_id, optional: true
   has_many :journal_details, :dependent => :delete_all
   has_many :attachments, as: :container, dependent: :destroy
-  has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(10)}, class_name: 'Journal', foreign_key: :parent_id
+  has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(20)}, class_name: 'Journal', foreign_key: :parent_id
   has_many :children_journals, class_name: 'Journal', foreign_key: :parent_id, dependent: :destroy
 
   scope :journal_includes, ->{includes(:user, :journal_details, :attachments)}
diff --git a/app/services/api/v1/issues/journals/list_service.rb b/app/services/api/v1/issues/journals/list_service.rb
index 486fa5d3..6d54e3b4 100644
--- a/app/services/api/v1/issues/journals/list_service.rb
+++ b/app/services/api/v1/issues/journals/list_service.rb
@@ -48,7 +48,7 @@ class Api::V1::Issues::Journals::ListService < ApplicationService
       @queried_journals = @queried_journals.where(notes: nil)
     end
 
-    @queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, first_ten_children_journals: [:parent_journal, :reply_journal])
+    @queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, :children_journals)
     @queried_journals = @queried_journals.reorder("journals.#{sort_by} #{sort_direction}").distinct
 
     @queried_journals

From 9e91427de093ab0dcce67347d56319c8d2c52e94 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 15 Nov 2023 08:43:00 +0800
Subject: [PATCH 012/130] =?UTF-8?q?fixed=20=E5=AE=B9=E9=94=99=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/project_rank/_detail.json.jbuilder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/project_rank/_detail.json.jbuilder b/app/views/project_rank/_detail.json.jbuilder
index d5b4b016..c083033e 100644
--- a/app/views/project_rank/_detail.json.jbuilder
+++ b/app/views/project_rank/_detail.json.jbuilder
@@ -3,8 +3,8 @@ owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id"
 json.id item[0]
 json.score item[1]
 json.name project_common["name"]
-if project_common['identifier'].include?("/")
-  json.identifier project_common["identifier"].split('/')[1]
+if project_common['identifier'].to_s.include?("/")
+  json.identifier project_common["identifier"].to_s.split('/')[1]
   json.owner do 
     json.id nil
     json.type 'User'

From 27bfeb5fc862de48da7716f05cf6490e2b71cdaa Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 15 Nov 2023 08:52:23 +0800
Subject: [PATCH 013/130] =?UTF-8?q?fixed=20=E8=AF=84=E8=AE=BA=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E5=A2=9E=E5=8A=A0parent=5Fid=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20231115126452_add_journal_parent_id_index.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20231115126452_add_journal_parent_id_index.rb

diff --git a/db/migrate/20231115126452_add_journal_parent_id_index.rb b/db/migrate/20231115126452_add_journal_parent_id_index.rb
new file mode 100644
index 00000000..2ebca483
--- /dev/null
+++ b/db/migrate/20231115126452_add_journal_parent_id_index.rb
@@ -0,0 +1,5 @@
+class AddJournalParentIdIndex < ActiveRecord::Migration[5.2]
+  def change
+    add_index :journals, :parent_id
+  end
+end

From 9e4e30a495e5d895cf8b35d524c469e12c349251 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 16 Nov 2023 13:50:49 +0800
Subject: [PATCH 014/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Aurl=E8=BD=AC?=
 =?UTF-8?q?=E4=B9=89=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 2bbccb49..e5362710 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -39,7 +39,8 @@ class AttachmentsController < ApplicationController
       filepath, ref = url.split("/")[-1].split("?")
       url.gsub!(url.split("/")[-1], '')
       Rails.logger.info("url===#{url}")
-      request_url = [domain, api_url, URI.encode(url), CGI.escape(filepath), "?ref=#{CGI.escape(ref.split('ref=')[1])}&access_token=#{User.where(admin: true).take&.gitea_token}"].join
+      Rails.logger.info(filepath)
+      request_url = [domain, api_url, URI.encode(url), URI.escape(filepath), "?ref=#{URI.escape(ref.split('ref=')[1])}&access_token=#{User.where(admin: true).take&.gitea_token}"].join
       Rails.logger.info("request_url===#{request_url}")
       response = Faraday.get(request_url)
       filename = filepath

From 3833816a0a0ac7d1deb8989203e24f31131cdbdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 29 Nov 2023 15:11:41 +0800
Subject: [PATCH 015/130] update issue order by

---
 app/services/api/v1/issues/list_service.rb | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb
index b6ef1178..8f32cfe6 100644
--- a/app/services/api/v1/issues/list_service.rb
+++ b/app/services/api/v1/issues/list_service.rb
@@ -6,8 +6,8 @@ class Api::V1::Issues::ListService < ApplicationService
   attr_reader :milestone_id, :assigner_id, :status_id, :sort_by, :sort_direction, :current_user
   attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count
 
-  validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"}
-  validates :participant_category, inclusion: {in: %w(all aboutme authoredme assignedme atme), message: "请输入正确的ParticipantCategory"}
+  validates :category, inclusion: {in: %w(all opened closed), message: '请输入正确的Category'}
+  validates :participant_category, inclusion: {in: %w(all aboutme authoredme assignedme atme), message: '请输入正确的ParticipantCategory'}
   validates :sort_by, inclusion: {in: ['issues.created_on', 'issues.updated_on', 'issues.blockchain_token_num', 'issue_priorities.position'], message: '请输入正确的SortBy'}, allow_blank: true
   validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}, allow_blank: true
   validates :current_user, presence: true
@@ -19,7 +19,7 @@ class Api::V1::Issues::ListService < ApplicationService
     @participant_category = params[:participant_category] || 'all'
     @keyword = params[:keyword]
     @author_id = params[:author_id]
-    @issue_tag_ids = params[:issue_tag_ids].present? ? params[:issue_tag_ids].split(",") : []
+    @issue_tag_ids = params[:issue_tag_ids].present? ? params[:issue_tag_ids].split(',') : []
     @milestone_id = params[:milestone_id]
     @assigner_id = params[:assigner_id]
     @status_id = params[:status_id]
@@ -31,7 +31,7 @@ class Api::V1::Issues::ListService < ApplicationService
   end
 
   def call 
-    raise Error, errors.full_messages.join(", ") unless valid? 
+    raise Error, errors.full_messages.join(', ') unless valid? 
     # begin
       issue_query_data
 
@@ -60,7 +60,7 @@ class Api::V1::Issues::ListService < ApplicationService
     issues = issues.where(author_id: author_id) if author_id.present?
 
     # issue_tag_ids
-    issues = issues.ransack(issue_tags_value_cont: issue_tag_ids.sort!.join(",")).result unless issue_tag_ids.blank?
+    issues = issues.ransack(issue_tags_value_cont: issue_tag_ids.sort!.join(',')).result unless issue_tag_ids.blank?
     
     # milestone_id
     issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present?
@@ -72,14 +72,14 @@ class Api::V1::Issues::ListService < ApplicationService
     issues = issues.where(status_id: status_id) if status_id.present? && category != 'closed'
 
     if begin_date&.present? || end_date&.present?
-      issues = issues.where("issues.created_on between ? and ?", begin_date&.present? ? begin_date.to_time : Time.now.beginning_of_day, end_date&.present? ? end_date.to_time.end_of_day : Time.now.end_of_day)
+      issues = issues.where('issues.created_on between ? and ?', begin_date&.present? ? begin_date.to_time : Time.now.beginning_of_day, end_date&.present? ? end_date.to_time.end_of_day : Time.now.end_of_day)
     end
 
     # keyword
     issues = issues.ransack(id_or_project_issues_index_eq: keyword).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present?
 
     @total_issues_count = issues.distinct.size
-    @closed_issues_count = issues.closed.distinct.size 
+    @closed_issues_count = issues.closed.distinct.size
     @opened_issues_count = issues.opened.distinct.size
 
     case category 
@@ -88,13 +88,16 @@ class Api::V1::Issues::ListService < ApplicationService
     when 'opened'
       issues = issues.opened
     end
-
     if only_name.present? 
       scope = issues.select(:id, :subject, :project_issues_index, :updated_on, :created_on)
       scope = scope.reorder("#{sort_by} #{sort_direction}").distinct
-    else 
+    else
       scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :comment_journals)
-      scope = scope.reorder("#{sort_by} #{sort_direction}").distinct
+      scope = if sort_by == 'issue_priorities.position'
+                scope.reorder("issue_priorities.position #{sort_direction}, issues.created_on DESC").distinct
+              else
+                scope.reorder("#{sort_by} #{sort_direction}").distinct
+              end
     end
 
     @queried_issues = scope

From 21640fe5e67ef221f6d6277f0ff21724131c2e1e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 1 Dec 2023 09:48:08 +0800
Subject: [PATCH 016/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Aissue=20stat?=
 =?UTF-8?q?us=E5=92=8Cpriority=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/issues/issue_priorities_controller.rb | 2 +-
 app/controllers/api/v1/issues/statues_controller.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/v1/issues/issue_priorities_controller.rb b/app/controllers/api/v1/issues/issue_priorities_controller.rb
index 2df1288f..f31c92ae 100644
--- a/app/controllers/api/v1/issues/issue_priorities_controller.rb
+++ b/app/controllers/api/v1/issues/issue_priorities_controller.rb
@@ -3,7 +3,7 @@ class Api::V1::Issues::IssuePrioritiesController < Api::V1::BaseController
   before_action :require_public_and_member_above, only: [:index]
 
   def index 
-    @priorities = IssuePriority.order(position: :asc)
+    @priorities = IssuePriority.where.not(name: '立刻').order(position: :asc)
     @priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword]
     @priorities = kaminary_select_paginate(@priorities)
   end
diff --git a/app/controllers/api/v1/issues/statues_controller.rb b/app/controllers/api/v1/issues/statues_controller.rb
index c6495ee2..737f1b38 100644
--- a/app/controllers/api/v1/issues/statues_controller.rb
+++ b/app/controllers/api/v1/issues/statues_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::Issues::StatuesController < Api::V1::BaseController
 
   # 状态列表
   def index 
-    @statues = IssueStatus.order("position asc")
+    @statues = IssueStatus.where.not(name: '反馈').order("position asc")
     @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
     @statues = kaminary_select_paginate(@statues)
   end

From d7976766390747482e535d71fac66a0f3bd77bf7 Mon Sep 17 00:00:00 2001
From: kingchan <chenjing19930415@163.com>
Date: Fri, 1 Dec 2023 09:52:32 +0800
Subject: [PATCH 017/130] change created on to updated_on for issue list
 service

---
 app/services/api/v1/issues/list_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb
index 8f32cfe6..820f708e 100644
--- a/app/services/api/v1/issues/list_service.rb
+++ b/app/services/api/v1/issues/list_service.rb
@@ -94,7 +94,7 @@ class Api::V1::Issues::ListService < ApplicationService
     else
       scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :comment_journals)
       scope = if sort_by == 'issue_priorities.position'
-                scope.reorder("issue_priorities.position #{sort_direction}, issues.created_on DESC").distinct
+                scope.reorder("issue_priorities.position #{sort_direction}, issues.updated_on DESC").distinct
               else
                 scope.reorder("#{sort_by} #{sort_direction}").distinct
               end

From c63c0cc636515f2735fe1c62ee29d7fe2ab4a5ed Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 1 Dec 2023 14:59:13 +0800
Subject: [PATCH 018/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Aissue=20stat?=
 =?UTF-8?q?us=E6=9F=A5=E8=AF=A2=E4=B8=8D=E4=BD=BF=E7=94=A8where.not?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/issues/issue_priorities_controller.rb | 2 +-
 app/controllers/api/v1/issues/statues_controller.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/v1/issues/issue_priorities_controller.rb b/app/controllers/api/v1/issues/issue_priorities_controller.rb
index f31c92ae..2df1288f 100644
--- a/app/controllers/api/v1/issues/issue_priorities_controller.rb
+++ b/app/controllers/api/v1/issues/issue_priorities_controller.rb
@@ -3,7 +3,7 @@ class Api::V1::Issues::IssuePrioritiesController < Api::V1::BaseController
   before_action :require_public_and_member_above, only: [:index]
 
   def index 
-    @priorities = IssuePriority.where.not(name: '立刻').order(position: :asc)
+    @priorities = IssuePriority.order(position: :asc)
     @priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword]
     @priorities = kaminary_select_paginate(@priorities)
   end
diff --git a/app/controllers/api/v1/issues/statues_controller.rb b/app/controllers/api/v1/issues/statues_controller.rb
index 737f1b38..c6495ee2 100644
--- a/app/controllers/api/v1/issues/statues_controller.rb
+++ b/app/controllers/api/v1/issues/statues_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::Issues::StatuesController < Api::V1::BaseController
 
   # 状态列表
   def index 
-    @statues = IssueStatus.where.not(name: '反馈').order("position asc")
+    @statues = IssueStatus.order("position asc")
     @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
     @statues = kaminary_select_paginate(@statues)
   end

From 98770ca47e1ff887c96fdab5165b35631fc4a45a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 1 Dec 2023 17:04:34 +0800
Subject: [PATCH 019/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=BA=AF=E6=BA=90=E6=B3=A8=E5=86=8C=E5=90=8E=E9=A1=BB?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=B0=83=E7=94=A8=E7=99=BB=E5=BD=95=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/models/trace_user.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/trace_user.rb b/app/models/trace_user.rb
index 69198706..6e032e9f 100644
--- a/app/models/trace_user.rb
+++ b/app/models/trace_user.rb
@@ -43,8 +43,9 @@ class TraceUser < ApplicationRecord
   def build_token 
     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']
+    response1 = Trace::AddUserService.call(username, password, unit, telnumber, email, name)
+    response2 = Trace::LoginService.call(username, password)
+    self.token = response2[1]['token']
     self.expired_at = Time.now + 1.hours
   end
 

From b2250db79aa7fd31328654275bbe496d8d524908 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 7 Dec 2023 09:50:09 +0800
Subject: [PATCH 020/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=A0=87=E7=AD=BE=E8=AF=A6=E6=83=85api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/tags_controller.rb        |  7 ++-
 .../api/v1/projects/tags/get_service.rb       | 54 +++++++++++++++++++
 .../_simple_gitea_index_detail.json.jbuilder  |  6 ++-
 .../api/v1/projects/tags/show.json.jbuilder   |  1 +
 config/routes/api.rb                          |  5 +-
 5 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 app/services/api/v1/projects/tags/get_service.rb
 create mode 100644 app/views/api/v1/projects/tags/show.json.jbuilder

diff --git a/app/controllers/api/v1/projects/tags_controller.rb b/app/controllers/api/v1/projects/tags_controller.rb
index b87d4842..44fdd9ba 100644
--- a/app/controllers/api/v1/projects/tags_controller.rb
+++ b/app/controllers/api/v1/projects/tags_controller.rb
@@ -1,10 +1,13 @@
 class Api::V1::Projects::TagsController < Api::V1::BaseController 
-  before_action :require_public_and_member_above, only: [:index] 
+  before_action :require_public_and_member_above, only: [:index, :show] 
 
   def index 
     @release_tags = @repository.version_releases.pluck(:tag_name)
     @result_object = Api::V1::Projects::Tags::ListService.call(@project, {page: page, limit: limit}, current_user&.gitea_token)
-    puts @result_object
+  end
+
+  def show 
+    @result_object = Api::V1::Projects::Tags::GetService.call(@project, params[:name], current_user&.gitea_token)
   end
 
   before_action :require_operate_above, only: [:destroy] 
diff --git a/app/services/api/v1/projects/tags/get_service.rb b/app/services/api/v1/projects/tags/get_service.rb
new file mode 100644
index 00000000..740f18d0
--- /dev/null
+++ b/app/services/api/v1/projects/tags/get_service.rb
@@ -0,0 +1,54 @@
+class Api::V1::Projects::Tags::GetService < ApplicationService
+  include ActiveModel::Model
+
+  attr_reader :project, :token, :owner, :repo, :tag_name
+  attr_accessor :gitea_data 
+
+  validates :tag_name, presence: true
+
+  def initialize(project, tag_name, token=nil)
+    @project = project
+    @owner = project&.owner&.login 
+    @repo = project&.identifier
+    @tag_name = tag_name.to_s
+    @token = token
+    Rails.logger.info project&.owner&.login 
+    Rails.logger.info project&.identifier
+    Rails.logger.info tag_name 
+    Rails.logger.info token
+  end
+
+  def call 
+
+    raise Error, errors.full_messages.join(",") unless valid?
+
+    check_tag_exist
+
+    load_gitea_data
+
+    gitea_data
+  rescue 
+    raise Error, "服务器错误，请联系系统管理员！"
+  end
+
+  private 
+  def request_params
+    params = {
+      access_token: token
+    }
+
+    params
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_hat_client.get_repos_tags_by_owner_repo_tag(owner, repo, tag_name, {query: request_params}) rescue nil
+    raise Error, '获取标签失败！' unless @gitea_data.is_a?(Hash)
+  end
+
+  def check_tag_exist
+    result = $gitea_hat_client.get_repos_tag_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
+
+    raise Error, '查询标签名称失败！' unless result.is_a?(Array)
+    raise Error, '标签不存在！' if !result.include?(@tag_name)
+  end
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder b/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder
index 460b56f5..32b384fb 100644
--- a/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder
+++ b/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder
@@ -4,7 +4,11 @@ if tag.present? && tag.is_a?(Hash)
   json.zipball_url render_zip_url(@owner, @repository, tag['name'])
   json.tarball_url render_tar_url(@owner, @repository, tag['name'])
   json.tagger do 
-    json.partial! 'api/v1/users/commit_user', user: render_cache_commit_author(tag['tagger']), name: tag['tagger']['name']
+    if tag['tagger'].present?
+      json.partial! 'api/v1/users/commit_user', user: render_cache_commit_author(tag['tagger']), name: tag['tagger']['name']
+    else
+      json.nil!
+    end
   end
   json.time_ago time_from_now(tag['tagger']['date'].to_time)
   json.created_at_unix tag['tagger']['date'].to_time.to_i
diff --git a/app/views/api/v1/projects/tags/show.json.jbuilder b/app/views/api/v1/projects/tags/show.json.jbuilder
new file mode 100644
index 00000000..a0e45fb7
--- /dev/null
+++ b/app/views/api/v1/projects/tags/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "api/v1/projects/tags/simple_gitea_index_detail", tag: @result_object
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 20c56138..f3fa24de 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -85,8 +85,9 @@ defaults format: :json do
             end
             match 'branches/*name', to: "branches#destroy", via: :all
 
-            resources :tags, param: :name, only: [:index, :destroy]
-            match 'tags/*name', to: "tags#destroy", via: :all
+            resources :tags, param: :name, only: [:index, :show, :destroy]
+            delete 'tags/*name', to: "tags#destroy", via: :all
+            get 'tags/*name', to: "tags#show", via: :all
 
             resources :commits, only: [:index]
             resources :code_stats, only: [:index]

From 9ac061f2a963f38b254fa179229e51e10445fea8 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 11 Dec 2023 09:17:43 +0800
Subject: [PATCH 021/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Agemfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Gemfile b/Gemfile
index 8051448e..3f165215 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,4 +143,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.4.2'
+gem 'gitea-client', '~> 1.4.3'

From 0cb38bce4f9229e17782ed18d2b2edc42acdfb6b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 11 Dec 2023 16:07:24 +0800
Subject: [PATCH 022/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E7=96=91=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/issues_controller.rb     | 17 +++++++++++++++--
 .../api/v1/issues/show_by_id.json.jbuilder      |  2 ++
 config/routes/api.rb                            |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 app/views/api/v1/issues/show_by_id.json.jbuilder

diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb
index ebba95e2..76185a16 100644
--- a/app/controllers/api/v1/issues_controller.rb
+++ b/app/controllers/api/v1/issues_controller.rb
@@ -1,6 +1,6 @@
 class Api::V1::IssuesController < Api::V1::BaseController 
-  before_action :require_login, except: [:index, :show]
-  before_action :require_public_and_member_above, only: [:index, :show, :create, :update, :destroy] 
+  before_action :require_login, except: [:index, :show, :show_by_id]
+  before_action :require_public_and_member_above, only: [:index, :show, :show_by_id, :create, :update, :destroy] 
   before_action :require_operate_above, only: [:batch_update, :batch_destroy]
 
   def index 
@@ -22,6 +22,12 @@ class Api::V1::IssuesController < Api::V1::BaseController
 
   before_action :load_issue, only: [:show, :update, :destroy]
   before_action :check_issue_operate_permission, only: [:update, :destroy]
+  before_action :load_issue_by_id, only: [:show_by_id]
+
+  def show_by_id 
+    @issue.associate_attachment_container
+    @user_permission = current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user)
+  end
 
   def show
     @issue.associate_attachment_container
@@ -70,6 +76,13 @@ class Api::V1::IssuesController < Api::V1::BaseController
     end
   end
 
+  def load_issue_by_id 
+    @issue = Issue.find_by_id(params[:index])
+    if @issue.blank? 
+      render_not_found("疑修不存在!")
+    end
+  end
+
   def load_issues 
     return render_error("请输入正确的ID数组！") unless params[:ids].is_a?(Array)
     params[:ids].each do |id|
diff --git a/app/views/api/v1/issues/show_by_id.json.jbuilder b/app/views/api/v1/issues/show_by_id.json.jbuilder
new file mode 100644
index 00000000..55028fc6
--- /dev/null
+++ b/app/views/api/v1/issues/show_by_id.json.jbuilder
@@ -0,0 +1,2 @@
+json.partial! "api/v1/issues/detail", locals: {issue: @issue}
+json.user_permission @user_permission
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 4478af38..baa66412 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -47,6 +47,7 @@ defaults format: :json do
             end
 
             member do 
+              get :show_by_id
               resources :journals, module: :issues, only: [:index, :create, :update, :destroy] do 
                 member do
                   get :children_journals 

From d74901cffa9a5a0a065d6aee6768c4d835c6faec Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Tue, 12 Dec 2023 14:31:21 +0800
Subject: [PATCH 023/130] =?UTF-8?q?fixed=20=E8=A7=A3=E5=86=B3=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98=E8=AE=BF=E9=97=AE=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8Cid=E6=94=B9=E4=B8=BAuuid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb     |  6 +-
 app/helpers/application_helper.rb             |  2 +-
 app/models/attachment.rb                      | 88 ++++++++++---------
 app/models/issue.rb                           | 12 ++-
 app/models/journal.rb                         | 10 +++
 .../api/v1/issues/concerns/checkable.rb       |  2 +-
 .../api/v1/issues/concerns/loadable.rb        |  2 +-
 app/views/attachments/create.json.jbuilder    |  9 +-
 8 files changed, 82 insertions(+), 49 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index e5362710..bf8c870a 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -94,6 +94,7 @@ class AttachmentsController < ApplicationController
         @attachment.author_id = current_user.id
         @attachment.disk_directory = month_folder
         @attachment.cloud_url = remote_path
+        @attachment.uuid = SecureRandom.uuid
         @attachment.save!
       else
         logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
@@ -147,8 +148,9 @@ class AttachmentsController < ApplicationController
       if params[:type] == 'history'
         AttachmentHistory.find params[:id]
       else
-        Attachment.find params[:id]
+        Attachment.find_by(id: params[:id]) || Attachment.find_by(uuid: params[:id])
       end
+    tip_exception(404, "您访问的页面不存在或已被删除") if @file.blank?
   end
 
   def delete_file(file_path)
@@ -218,7 +220,7 @@ class AttachmentsController < ApplicationController
   def attachment_candown
     unless current_user.admin? || current_user.business?
       candown = true
-      if @file.container
+      if @file.container && @file.uuid.nil?
         if @file.container.is_a?(Issue)
           project = @file.container.project
           candown = project.is_public || (current_user.logged? && project.member?(current_user))
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 93645247..5d558242 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -299,7 +299,7 @@ module ApplicationHelper
   end
 
   def download_url attachment,options={}
-    attachment_path(attachment,options)
+    attachment&.uuid.present? ? attachment_path(attachment.uuid,options) : attachment_path(attachment,options)
   end
 
   # 耗时：天、小时、分、秒
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index f79aca15..defc7366 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -1,44 +1,45 @@
-# == Schema Information
-#
-# Table name: attachments
-#
-#  id                        :integer          not null, primary key
-#  container_id              :integer
-#  container_type            :string(30)
-#  filename                  :string(255)      default(""), not null
-#  disk_filename             :string(255)      default(""), not null
-#  filesize                  :integer          default("0"), not null
-#  content_type              :string(255)      default("")
-#  digest                    :string(60)       default(""), not null
-#  downloads                 :integer          default("0"), not null
-#  author_id                 :integer          default("0"), not null
-#  created_on                :datetime
-#  description               :text(65535)
-#  disk_directory            :string(255)
-#  attachtype                :integer          default("1")
-#  is_public                 :integer          default("1")
-#  copy_from                 :integer
-#  quotes                    :integer          default("0")
-#  is_publish                :integer          default("1")
-#  publish_time              :datetime
-#  resource_bank_id          :integer
-#  unified_setting           :boolean          default("1")
-#  cloud_url                 :string(255)      default("")
-#  course_second_category_id :integer          default("0")
-#  delay_publish             :boolean          default("0")
-#  memo_image                :boolean          default("0")
-#  extra_type                :integer          default("0")
-#
-# Indexes
-#
-#  index_attachments_on_author_id                        (author_id)
-#  index_attachments_on_container_id_and_container_type  (container_id,container_type)
-#  index_attachments_on_course_second_category_id        (course_second_category_id)
-#  index_attachments_on_created_on                       (created_on)
-#  index_attachments_on_is_public                        (is_public)
-#  index_attachments_on_quotes                           (quotes)
-#
-
+# == Schema Information
+#
+# Table name: attachments
+#
+#  id                        :integer          not null, primary key
+#  container_id              :integer
+#  container_type            :string(30)
+#  filename                  :string(255)      default(""), not null
+#  disk_filename             :string(255)      default(""), not null
+#  filesize                  :integer          default("0"), not null
+#  content_type              :string(255)      default("")
+#  digest                    :string(60)       default(""), not null
+#  downloads                 :integer          default("0"), not null
+#  author_id                 :integer          default("0"), not null
+#  created_on                :datetime
+#  description               :text(65535)
+#  disk_directory            :string(255)
+#  attachtype                :integer          default("1")
+#  is_public                 :integer          default("1")
+#  copy_from                 :integer
+#  quotes                    :integer          default("0")
+#  is_publish                :integer          default("1")
+#  publish_time              :datetime
+#  resource_bank_id          :integer
+#  unified_setting           :boolean          default("1")
+#  cloud_url                 :string(255)      default("")
+#  course_second_category_id :integer          default("0")
+#  delay_publish             :boolean          default("0")
+#  memo_image                :boolean          default("0")
+#  extra_type                :integer          default("0")
+#  uuid                      :string(255)
+#
+# Indexes
+#
+#  index_attachments_on_author_id                        (author_id)
+#  index_attachments_on_container_id_and_container_type  (container_id,container_type)
+#  index_attachments_on_course_second_category_id        (course_second_category_id)
+#  index_attachments_on_created_on                       (created_on)
+#  index_attachments_on_is_public                        (is_public)
+#  index_attachments_on_quotes                           (quotes)
+#
+
 
 
 
@@ -97,6 +98,11 @@ class Attachment < ApplicationRecord
     downloads
   end
 
+  def generate_uuid
+    self.uuid = uuid || SecureRandom.uuid
+    save!
+  end
+
   def quotes_count
     quotes.nil? ? 0 : quotes
   end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index a5fee95f..93d30b5d 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -224,13 +224,23 @@ class Issue < ApplicationRecord
 
   # 关附件到功能
   def associate_attachment_container
+    return if self.project_id == 0
     att_ids = []
     # 附件的格式为（/api/attachments/ + 附件id）的形式，提取出id进行附件属性关联，做附件访问权限控制
     att_ids += self.description.to_s.scan(/\(\/api\/attachments\/.+\)/).map{|s|s.match(/\d+/)[0]}
     att_ids += self.description.to_s.scan(/\/api\/attachments\/.+\"/).map{|s|s.match(/\d+/)[0]}
     att_ids += self.description.to_s.scan(/\/api\/attachments\/\d+/).map{|s|s.match(/\d+/)[0]}
     if att_ids.present?
-      Attachment.where(id: att_ids).where("container_type IS NULL OR container_type = 'Issue'").update_all(container_id: self.project_id, container_type: "Project")
+      Attachment.where(id: att_ids).where("container_type IS NULL OR container_type = 'Issue'").update_all(container_id: self.project_id, container_type: 'Project')
+    end
+
+    att_ids2 = []
+    # uuid_regex= /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
+    # 附件的格式为（/api/attachments/ + uuid）的形式，提取出id进行附件属性关联，做附件访问权限控制
+    att_ids2 += self.description.to_s.scan(/\(\/api\/attachments\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\)/).map{|s|s.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/)[0]}
+    att_ids2 += self.description.to_s.scan(/\/api\/attachments\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/).map{|s|s.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/)[0]}
+    if att_ids2.present?
+      Attachment.where(uuid: att_ids2).where("container_type IS NULL OR container_type = 'Issue'").update_all(container_id: self.project_id, container_type: 'Project')
     end
   end
 
diff --git a/app/models/journal.rb b/app/models/journal.rb
index e0553ad4..dad60cd7 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -61,6 +61,7 @@ class Journal < ApplicationRecord
 
   # 关附件到功能
   def associate_attachment_container
+    return if self.issue&.project_id.to_i == 0
     att_ids = []
     # 附件的格式为（/api/attachments/ + 附件id）的形式，提取出id进行附件属性关联，做附件访问权限控制
     att_ids += self.notes.to_s.scan(/\(\/api\/attachments\/.+\)/).map{|s|s.match(/\d+/)[0]}
@@ -69,6 +70,15 @@ class Journal < ApplicationRecord
     if att_ids.present?
       Attachment.where(id: att_ids).where("container_type IS NULL OR container_type = 'Journal'").update_all(container_id: self.issue.project_id, container_type: "Project")
     end
+
+    att_ids2 = []
+    # uuid_regex= /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
+    # 附件的格式为（/api/attachments/ + uuid）的形式，提取出id进行附件属性关联，做附件访问权限控制
+    att_ids2 += self.notes.to_s.scan(/\(\/api\/attachments\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\)/).map{|s|s.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/)[0]}
+    att_ids2 += self.notes.to_s.scan(/\/api\/attachments\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/).map{|s|s.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/)[0]}
+    if att_ids2.present?
+      Attachment.where(uuid: att_ids).where("container_type IS NULL OR container_type = 'Journal'").update_all(container_id: self.issue.project_id, container_type: "Project")
+    end
   end
 
   def operate_content 
diff --git a/app/services/api/v1/issues/concerns/checkable.rb b/app/services/api/v1/issues/concerns/checkable.rb
index b19c245e..58fc6dc6 100644
--- a/app/services/api/v1/issues/concerns/checkable.rb
+++ b/app/services/api/v1/issues/concerns/checkable.rb
@@ -31,7 +31,7 @@ module Api::V1::Issues::Concerns::Checkable
   def check_attachments (attachment_ids)
     raise ApplicationService::Error, "请输入正确的附件ID数组！" unless attachment_ids.is_a?(Array)
     attachment_ids.each do |aid|
-      raise ApplicationService::Error, "请输入正确的附件ID！" unless Attachment.exists?(id: aid)
+      raise ApplicationService::Error, "请输入正确的附件ID！" unless Attachment.exists?(id: aid) || Attachment.exists?(uuid: aid)
     end 
   end
 
diff --git a/app/services/api/v1/issues/concerns/loadable.rb b/app/services/api/v1/issues/concerns/loadable.rb
index df30042e..ffd5ff4a 100644
--- a/app/services/api/v1/issues/concerns/loadable.rb
+++ b/app/services/api/v1/issues/concerns/loadable.rb
@@ -9,7 +9,7 @@ module Api::V1::Issues::Concerns::Loadable
   end
 
   def load_attachments(attachment_ids)
-    @attachments = Attachment.where(id: attachment_ids)
+    @attachments = Attachment.where(id: attachment_ids).or(Attachment.where(uuid: attachment_ids))
   end
 
   def load_atme_receivers(receivers_login)
diff --git a/app/views/attachments/create.json.jbuilder b/app/views/attachments/create.json.jbuilder
index 3c0ef355..3b12193c 100644
--- a/app/views/attachments/create.json.jbuilder
+++ b/app/views/attachments/create.json.jbuilder
@@ -1,2 +1,7 @@
-json.id       @attachment.id
-json.filesize @attachment.filesize
+json.id  @attachment.uuid
+json.title @attachment.title
+json.filesize number_to_human_size(@attachment.filesize)
+json.is_pdf @attachment.is_pdf?
+json.url Rails.application.config_for(:configuration)['platform_url'] + (@attachment.is_pdf? ? download_url(@attachment,disposition:"inline") : download_url(@attachment)).to_s
+json.created_on @attachment.created_on.strftime("%Y-%m-%d %H:%M")
+json.content_type @attachment.content_type

From 852d43017840ad1b85e6bf5f18fa81baab636417 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 12 Dec 2023 15:02:03 +0800
Subject: [PATCH 024/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=A0=87=E7=AD=BE=E8=AF=A6=E6=83=85=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/api/v1/projects/tags/get_service.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/services/api/v1/projects/tags/get_service.rb b/app/services/api/v1/projects/tags/get_service.rb
index 740f18d0..bfceab4c 100644
--- a/app/services/api/v1/projects/tags/get_service.rb
+++ b/app/services/api/v1/projects/tags/get_service.rb
@@ -12,10 +12,6 @@ class Api::V1::Projects::Tags::GetService < ApplicationService
     @repo = project&.identifier
     @tag_name = tag_name.to_s
     @token = token
-    Rails.logger.info project&.owner&.login 
-    Rails.logger.info project&.identifier
-    Rails.logger.info tag_name 
-    Rails.logger.info token
   end
 
   def call 
@@ -27,8 +23,6 @@ class Api::V1::Projects::Tags::GetService < ApplicationService
     load_gitea_data
 
     gitea_data
-  rescue 
-    raise Error, "服务器错误，请联系系统管理员！"
   end
 
   private 
@@ -41,7 +35,7 @@ class Api::V1::Projects::Tags::GetService < ApplicationService
   end
 
   def load_gitea_data
-    @gitea_data = $gitea_hat_client.get_repos_tags_by_owner_repo_tag(owner, repo, tag_name, {query: request_params}) rescue nil
+    @gitea_data = $gitea_hat_client.get_repos_tags_by_owner_repo_tag(owner, repo, URI.escape(tag_name), {query: request_params}) rescue nil
     raise Error, '获取标签失败！' unless @gitea_data.is_a?(Hash)
   end
 

From 8264717017d6ab875931057e6dbe1c8ac7d76f0d Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Tue, 12 Dec 2023 15:20:52 +0800
Subject: [PATCH 025/130] =?UTF-8?q?fixed=20=E8=A7=A3=E5=86=B3=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98=E8=AE=BF=E9=97=AE=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8Cid=E6=94=B9=E4=B8=BAuuid,migrate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20231121084405_add_uuid_to_attachments.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20231121084405_add_uuid_to_attachments.rb

diff --git a/db/migrate/20231121084405_add_uuid_to_attachments.rb b/db/migrate/20231121084405_add_uuid_to_attachments.rb
new file mode 100644
index 00000000..5d0e2ba0
--- /dev/null
+++ b/db/migrate/20231121084405_add_uuid_to_attachments.rb
@@ -0,0 +1,5 @@
+class AddUuidToAttachments < ActiveRecord::Migration[5.2]
+  def change
+    add_column :attachments, :uuid, :string, index: true
+  end
+end

From 9a0809e45babd52ed599dfd227aacc554b351654 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Tue, 12 Dec 2023 15:33:48 +0800
Subject: [PATCH 026/130] =?UTF-8?q?fixed=20=E5=8F=91=E8=A1=8C=E7=89=88?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/version_releases_controller.rb b/app/controllers/version_releases_controller.rb
index 76a214d0..62724c12 100644
--- a/app/controllers/version_releases_controller.rb
+++ b/app/controllers/version_releases_controller.rb
@@ -152,11 +152,12 @@ class VersionReleasesController < ApplicationController
 
   def create_attachments(attachment_ids, target)
     attachment_ids.each do |id|
-      attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+      attachment = Attachment.select(:id, :container_id, :container_type).where(id: id).or(Attachment.where(uuid: id))&.first
       unless attachment.blank?
         attachment.container = target
         attachment.author_id = current_user.id
         attachment.description = ""
+        attachment.uuid = SecureRandom.uuid
         attachment.save
       end
     end

From de1266ba6c3e3f98ab2a6420128d62c490bea461 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Tue, 12 Dec 2023 16:41:02 +0800
Subject: [PATCH 027/130] =?UTF-8?q?fixed=20=E8=A7=A3=E5=86=B3=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98=E8=AE=BF=E9=97=AE=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8Cid=E6=94=B9=E4=B8=BAuuid=EF=BC=8C=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb             |  4 ++--
 app/controllers/journals_controller.rb           |  2 +-
 app/controllers/version_releases_controller.rb   |  2 +-
 app/models/attachment.rb                         |  1 +
 app/models/identity_verification.rb              | 16 ++++++++--------
 app/models/journal.rb                            |  6 +++---
 app/services/api/v1/issues/concerns/checkable.rb |  4 ++--
 app/services/api/v1/issues/concerns/loadable.rb  |  2 +-
 ...0231212012107_change_identity_verification.rb |  8 ++++++++
 9 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 db/migrate/20231212012107_change_identity_verification.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index cb7beb40..84219b89 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -139,7 +139,7 @@ class IssuesController < ApplicationController
       SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @issue&.id) if Site.has_notice_menu?
       if params[:attachment_ids].present?
         params[:attachment_ids].each do |id|
-          attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+          attachment = Attachment.where_id_or_uuid(id).select(:id, :container_id, :container_type)&.first
           unless attachment.blank?
             attachment.container = @issue
             attachment.author_id = current_user.id
@@ -232,7 +232,7 @@ class IssuesController < ApplicationController
     if issue_files.present?
       change_files = true
       issue_files.each do |id|
-        attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+        attachment = Attachment.where_id_or_uuid(id).select(:id, :container_id, :container_type)&.first
         unless attachment.blank?
           attachment.container = @issue
           attachment.author_id = current_user.id
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 8f785756..6b9abd5c 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -35,7 +35,7 @@ class JournalsController < ApplicationController
         if journal.save
           if params[:attachment_ids].present?
             params[:attachment_ids].each do |id|
-              attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+              attachment = Attachment.where_id_or_uuid(id).select(:id, :container_id, :container_type)&.first
               unless attachment.blank?
                 attachment.container = journal
                 attachment.author_id = current_user.id
diff --git a/app/controllers/version_releases_controller.rb b/app/controllers/version_releases_controller.rb
index 62724c12..ed608873 100644
--- a/app/controllers/version_releases_controller.rb
+++ b/app/controllers/version_releases_controller.rb
@@ -152,7 +152,7 @@ class VersionReleasesController < ApplicationController
 
   def create_attachments(attachment_ids, target)
     attachment_ids.each do |id|
-      attachment = Attachment.select(:id, :container_id, :container_type).where(id: id).or(Attachment.where(uuid: id))&.first
+      attachment = Attachment.where_id_or_uuid(id).select(:id, :container_id, :container_type)&.first
       unless attachment.blank?
         attachment.container = target
         attachment.author_id = current_user.id
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index defc7366..49124a22 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -69,6 +69,7 @@ class Attachment < ApplicationRecord
   scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type, :container_type, :container_id) }
   scope :search_by_container,           -> (ids) {where(container_id: ids)}
   scope :unified_setting, -> {where("unified_setting = ? ", 1)}
+  scope :where_id_or_uuid, -> (id) { where("id = ? or uuid= ? ", id, id) }
 
   validates_length_of :description, maximum: 100, message: "不能超过100个字符"
 
diff --git a/app/models/identity_verification.rb b/app/models/identity_verification.rb
index 6ea6e054..8673a4a6 100644
--- a/app/models/identity_verification.rb
+++ b/app/models/identity_verification.rb
@@ -6,10 +6,10 @@
 #  user_id         :integer          not null
 #  number          :string(255)      not null
 #  name            :string(255)      not null
-#  card_front      :integer
-#  card_back       :integer
-#  hold_card_front :integer
-#  hold_card_back  :integer
+#  card_front      :string(255)
+#  card_back       :string(255)
+#  hold_card_front :string(255)
+#  hold_card_back  :string(255)
 #  state           :integer          default("0")
 #  description     :string(255)
 #  created_at      :datetime         not null
@@ -34,18 +34,18 @@ class IdentityVerification < ApplicationRecord
     end
 
     def card_front_attachment
-        Attachment.find_by_id card_front
+        Attachment.where_id_or_uuid.first card_front
     end
     
     def card_back_attachment
-        Attachment.find_by_id card_back
+        Attachment.where_id_or_uuid.first card_back
     end
 
     def hold_card_front_attachment
-        Attachment.find_by_id hold_card_front
+        Attachment.where_id_or_uuid.first hold_card_front
     end
 
     def hold_card_back_attachment
-        Attachment.find_by_id hold_card_back
+        Attachment.where_id_or_uuid hold_card_back
     end
 end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index dad60cd7..2e754c51 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -88,9 +88,9 @@ class Journal < ApplicationRecord
     when 'issue'
       return "创建了<b>疑修</b>"
     when 'attachment'
-      old_value = Attachment.where(id: detail.old_value.split(",")).pluck(:filename).join("、")
-      new_value = Attachment.where(id: detail.value.split(",")).pluck(:filename).join("、")
-      if old_value.nil? || old_value.blank? 
+      old_value = Attachment.where("id in (?) or uuid in (?)", detail.old_value.to_s.split(","), detail.old_value.to_s.split(",")).pluck(:filename).join("、")
+      new_value = Attachment.where("id in (?) or uuid in (?)", detail.value.to_s.split(","), detail.value.to_s.split(",")).pluck(:filename).join("、")
+      if old_value.nil? || old_value.blank?
         content += "添加了<b>#{new_value}</b>附件"
       else 
         new_value = "无" if new_value.blank?
diff --git a/app/services/api/v1/issues/concerns/checkable.rb b/app/services/api/v1/issues/concerns/checkable.rb
index 58fc6dc6..7d163ada 100644
--- a/app/services/api/v1/issues/concerns/checkable.rb
+++ b/app/services/api/v1/issues/concerns/checkable.rb
@@ -31,8 +31,8 @@ module Api::V1::Issues::Concerns::Checkable
   def check_attachments (attachment_ids)
     raise ApplicationService::Error, "请输入正确的附件ID数组！" unless attachment_ids.is_a?(Array)
     attachment_ids.each do |aid|
-      raise ApplicationService::Error, "请输入正确的附件ID！" unless Attachment.exists?(id: aid) || Attachment.exists?(uuid: aid)
-    end 
+      raise ApplicationService::Error, "请输入正确的附件ID！" unless Attachment.where("id=? or uuid=?", aid, aid).exists?
+    end
   end
 
   def check_atme_receivers(receivers_login)
diff --git a/app/services/api/v1/issues/concerns/loadable.rb b/app/services/api/v1/issues/concerns/loadable.rb
index ffd5ff4a..547ff50d 100644
--- a/app/services/api/v1/issues/concerns/loadable.rb
+++ b/app/services/api/v1/issues/concerns/loadable.rb
@@ -9,7 +9,7 @@ module Api::V1::Issues::Concerns::Loadable
   end
 
   def load_attachments(attachment_ids)
-    @attachments = Attachment.where(id: attachment_ids).or(Attachment.where(uuid: attachment_ids))
+    @attachments = Attachment.where("id in (?) or uuid in (?)", attachment_ids, attachment_ids)
   end
 
   def load_atme_receivers(receivers_login)
diff --git a/db/migrate/20231212012107_change_identity_verification.rb b/db/migrate/20231212012107_change_identity_verification.rb
new file mode 100644
index 00000000..6a6ac408
--- /dev/null
+++ b/db/migrate/20231212012107_change_identity_verification.rb
@@ -0,0 +1,8 @@
+class ChangeIdentityVerification < ActiveRecord::Migration[5.2]
+  def change
+    change_column :identity_verifications, :card_front, :string
+    change_column :identity_verifications, :card_back, :string
+    change_column :identity_verifications, :hold_card_front, :string
+    change_column :identity_verifications, :hold_card_back, :string
+  end
+end

From 247c5a60b1864cad12e8606febde28832b4b2e2d Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Tue, 12 Dec 2023 16:47:48 +0800
Subject: [PATCH 028/130] =?UTF-8?q?fixed=20=E8=A7=A3=E5=86=B3=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98=E8=AE=BF=E9=97=AE=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8Cid=E6=94=B9=E4=B8=BAuuid=EF=BC=8C=E5=85=B3=E8=81=94pag?=
 =?UTF-8?q?es=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/identity_verification.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/identity_verification.rb b/app/models/identity_verification.rb
index 8673a4a6..9d766763 100644
--- a/app/models/identity_verification.rb
+++ b/app/models/identity_verification.rb
@@ -34,18 +34,18 @@ class IdentityVerification < ApplicationRecord
     end
 
     def card_front_attachment
-        Attachment.where_id_or_uuid.first card_front
+        Attachment.where_id_or_uuid(card_front).first
     end
     
     def card_back_attachment
-        Attachment.where_id_or_uuid.first card_back
+        Attachment.where_id_or_uuid(card_back).first
     end
 
     def hold_card_front_attachment
-        Attachment.where_id_or_uuid.first hold_card_front
+        Attachment.where_id_or_uuid(hold_card_front).first
     end
 
     def hold_card_back_attachment
-        Attachment.where_id_or_uuid hold_card_back
+        Attachment.where_id_or_uuid(hold_card_back).first
     end
 end

From 60c8b25075b42d2c4ff31dbfd1072126247bd759 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Tue, 12 Dec 2023 16:57:39 +0800
Subject: [PATCH 029/130] =?UTF-8?q?fixed=20=E8=A7=A3=E5=86=B3=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98=E8=AE=BF=E9=97=AE=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8Cid=E6=94=B9=E4=B8=BAuuid,=E6=9F=A5=E7=9C=8B=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index bf8c870a..ecc4760b 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -144,11 +144,12 @@ class AttachmentsController < ApplicationController
 
   private
   def find_file
+    tip_exception(404, "您访问的页面不存在或已被删除") if params[:id].blank?
     @file =
       if params[:type] == 'history'
         AttachmentHistory.find params[:id]
       else
-        Attachment.find_by(id: params[:id]) || Attachment.find_by(uuid: params[:id])
+        Attachment.where_id_or_uuid(params[:id]).first
       end
     tip_exception(404, "您访问的页面不存在或已被删除") if @file.blank?
   end

From b29e50064576e979097479adceb61de90a8de142 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 13 Dec 2023 09:26:49 +0800
Subject: [PATCH 030/130] =?UTF-8?q?fixed=20=E8=A7=A3=E5=86=B3=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98=E8=AE=BF=E9=97=AE=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8Cid=E6=94=B9=E4=B8=BAuuid,id=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/attachment.rb                         | 2 +-
 app/models/identity_verification.rb              | 2 +-
 app/services/api/v1/issues/concerns/checkable.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 49124a22..81047460 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -69,7 +69,7 @@ class Attachment < ApplicationRecord
   scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type, :container_type, :container_id) }
   scope :search_by_container,           -> (ids) {where(container_id: ids)}
   scope :unified_setting, -> {where("unified_setting = ? ", 1)}
-  scope :where_id_or_uuid, -> (id) { where("id = ? or uuid= ? ", id, id) }
+  scope :where_id_or_uuid, -> (id) { (Float(id) rescue nil).present? ? where(id: id) : where(uuid: id) }
 
   validates_length_of :description, maximum: 100, message: "不能超过100个字符"
 
diff --git a/app/models/identity_verification.rb b/app/models/identity_verification.rb
index 9d766763..fdef74d4 100644
--- a/app/models/identity_verification.rb
+++ b/app/models/identity_verification.rb
@@ -24,7 +24,7 @@ class IdentityVerification < ApplicationRecord
     belongs_to :user
     enum state: { "待审核": 0, "已通过": 1, "已拒绝": 2}
     after_create do
-        Attachment.where(id:[card_front,card_back,hold_card_front,hold_card_back]).update_all(is_public:0)
+        Attachment.where(uuid:[card_front,card_back,hold_card_front,hold_card_back]).update_all(is_public:0)
     end
     
     after_save do
diff --git a/app/services/api/v1/issues/concerns/checkable.rb b/app/services/api/v1/issues/concerns/checkable.rb
index 7d163ada..5eef8158 100644
--- a/app/services/api/v1/issues/concerns/checkable.rb
+++ b/app/services/api/v1/issues/concerns/checkable.rb
@@ -31,7 +31,7 @@ module Api::V1::Issues::Concerns::Checkable
   def check_attachments (attachment_ids)
     raise ApplicationService::Error, "请输入正确的附件ID数组！" unless attachment_ids.is_a?(Array)
     attachment_ids.each do |aid|
-      raise ApplicationService::Error, "请输入正确的附件ID！" unless Attachment.where("id=? or uuid=?", aid, aid).exists?
+      raise ApplicationService::Error, "请输入正确的附件ID！" unless Attachment.where_id_or_uuid(aid).exists?
     end
   end
 

From 062e654d4502ff53a340c5f631cfe0ddd5810f19 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 14 Dec 2023 11:43:42 +0800
Subject: [PATCH 031/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E9=A1=BB=E9=AA=8C=E8=AF=81=E4=B8=A4?=
 =?UTF-8?q?=E6=AC=A1=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 4cec1be4..c7f4c276 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -214,6 +214,7 @@ class AccountsController < ApplicationController
   end
 
   def change_password 
+    return render_error("两次输入的密码不正确") if params[:password].to_s != params[:new_password_repeat].to_s
     @user = User.find_by(login: params[:login])
     return render_error("未找到相关用户!") if @user.blank?
     return render_error("旧密码不正确") unless @user.check_password?(params[:old_password])

From 129970a52586434d7c8e90dc16b7851b70d7651a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 14 Dec 2023 11:47:32 +0800
Subject: [PATCH 032/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index c7f4c276..bfc2cd42 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -214,7 +214,7 @@ class AccountsController < ApplicationController
   end
 
   def change_password 
-    return render_error("两次输入的密码不正确") if params[:password].to_s != params[:new_password_repeat].to_s
+    return render_error("两次输入的密码不一致") if params[:password].to_s != params[:new_password_repeat].to_s
     @user = User.find_by(login: params[:login])
     return render_error("未找到相关用户!") if @user.blank?
     return render_error("旧密码不正确") unless @user.check_password?(params[:old_password])

From c75953d34319ed8ce162a03d1fe502d5442e873b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 14 Dec 2023 16:45:02 +0800
Subject: [PATCH 033/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=88=86=E6=94=AF=E5=B7=B2=E5=AD=98=E5=9C=A8=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/gitea/repository/entries/create_service.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/services/gitea/repository/entries/create_service.rb b/app/services/gitea/repository/entries/create_service.rb
index ac27b3af..40610674 100644
--- a/app/services/gitea/repository/entries/create_service.rb
+++ b/app/services/gitea/repository/entries/create_service.rb
@@ -59,7 +59,11 @@ class Gitea::Repository::Entries::CreateService < Gitea::ClientService
       if @body[:new_branch].present? && (@body[:new_branch].include?('/') || @body[:new_branch].include?('\'') || @body[:new_branch].include?('^') || @body[:new_branch].include?('*'))
         error("不合法的分支名称!")
       else
-        error("#{filepath}文件已存在，不能重复创建!")
+        if json_parse!(body)["message"].present? &&  json_parse!(body)["message"].starts_with?("branch already exists")
+          error("#{@body[:new_branch]}分支已存在!")
+        else 
+          error("#{filepath}文件已存在，不能重复创建!")
+        end
       end
     else
       Rails.logger.error("Gitea api url==#{url},status:#{status},body=#{body}")

From c972d538eebf16b3421254f51f4cf1eb03ef741f Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Thu, 14 Dec 2023 16:45:29 +0800
Subject: [PATCH 034/130] =?UTF-8?q?fixed=20=E7=94=A8=E6=88=B7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8C=89=E6=98=B5=E7=A7=B0=E5=92=8C=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 34d617f1..d7608ec3 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -22,7 +22,7 @@ class UsersController < ApplicationController
   end
 
   def list
-    scope = User.active.recent.like(params[:search]).includes(:user_extension)
+    scope = User.active.like(params[:search]).includes(:user_extension).order(nickname: :desc, last_login_on: :desc)
     @total_count = scope.size
     @users = paginate(scope)
   end

From 4b57e96914291f44f71b4fe936221fee5aa34611 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Thu, 14 Dec 2023 16:45:29 +0800
Subject: [PATCH 035/130] =?UTF-8?q?fixed=20=E7=94=A8=E6=88=B7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8C=89=E6=98=B5=E7=A7=B0=E5=92=8C=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 34d617f1..d7608ec3 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -22,7 +22,7 @@ class UsersController < ApplicationController
   end
 
   def list
-    scope = User.active.recent.like(params[:search]).includes(:user_extension)
+    scope = User.active.like(params[:search]).includes(:user_extension).order(nickname: :desc, last_login_on: :desc)
     @total_count = scope.size
     @users = paginate(scope)
   end

From ad969917308b40089f1e127925713c529ff1734d Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 15 Dec 2023 09:01:11 +0800
Subject: [PATCH 036/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E9=80=97=E5=8F=B7=E4=B8=BA=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E9=80=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb | 4 ++--
 app/controllers/oauth2_controller.rb   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index bfc2cd42..ba059bf0 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -193,12 +193,12 @@ class AccountsController < ApplicationController
     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?
+    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}分钟后重新登录或找回密码")
+        normal_status(-2, "登录密码出错已达上限，账号已被锁定，请#{login_control.forbid_expires/60}分钟后重新登录或找回密码")
       else
         normal_status(-2, "你已经输错密码#{login_control.error_times+1}次，还剩余#{login_control.remain_times-1}次机会")
       end
diff --git a/app/controllers/oauth2_controller.rb b/app/controllers/oauth2_controller.rb
index f1ac19a2..9be575a1 100644
--- a/app/controllers/oauth2_controller.rb
+++ b/app/controllers/oauth2_controller.rb
@@ -20,12 +20,12 @@ class Oauth2Controller < ActionController::Base
       return @error = {msg: '违反平台使用规范，账号已被锁定', id: 'login'} if @user.locked?
 
       login_control = LimitForbidControl::UserLogin.new(@user)
-      return  @error = {msg: "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码", id: 'account'} if login_control.forbid?
+      return  @error = {msg: "登录密码出错已达上限，账号已被锁定，请#{login_control.forbid_expires/60}分钟后重新登录或找回密码", id: 'account'} if login_control.forbid?
 
       password_ok = @user.check_password?(params[:password].to_s)
       unless password_ok
         if login_control.remain_times-1 == 0
-           @error = {msg: "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码", id: 'account'}
+           @error = {msg: "登录密码出错已达上限，账号已被锁定，请#{login_control.forbid_expires/60}分钟后重新登录或找回密码", id: 'account'}
         else
            @error = {msg: "你已经输错密码#{login_control.error_times+1}次，还剩余#{login_control.remain_times-1}次机会", id: 'account'}
         end

From 0b21d4af4172ce8b3110081fb7fab12e35f84329 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 15 Dec 2023 15:36:31 +0800
Subject: [PATCH 037/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 130 ++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 32d3e6eb..3b607395 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -127,4 +127,134 @@ namespace :batch_add_issues do
       end
     end
   end
+
+
+  task github: :environment do
+    project_id = ENV['project_id']
+    puts "project_id=================#{project_id}"
+    next if project_id.blank?
+    project = Project.find project_id
+    count = 0
+    if ENV['count'].present?
+      count = ENV['count'].to_i
+    end
+
+    total_count = 3000
+    puts "total_count==========#{total_count}"
+    if total_count > 100
+      total_page =  (total_count / 100) + 1
+      total_page.times do |i|
+        add_github_issues_to_project(project, i + 1 + count)
+      end
+    else
+      add_github_issues_to_project(project, 1)
+    end
+  end
+
+  def add_github_issues_to_project(project,page)
+    # curl -X GET --header 'Content-Type: application/json;charset=UTF-8' 'https://gitee.com/api/v5/repos/mindspore/mindspore/issues?access_token=5ccebd935915fb6cfcae634b161047a2&state=open&sort=created&direction=desc&page=1&per_page=10'
+    # api_url = "https://gitee.com/api/v5/repos/mindspore/mindspore/issues?access_token=96a637aa055f15056e77e3cf11a67525&state=all&sort=created&direction=desc&page=#{page}&per_page=100"
+    api_url = "https://api.github.com/repos/OpenXiangShan/XiangShan/issues?sort=created&direction=desc&per_page=100&state=all&page=#{page}"
+    uri = URI.parse(api_url)
+    response = Net::HTTP.get_response(uri)
+    puts "gitee api response.code ===== #{response.code}"
+    lists = JSON.parse(response.body)
+    puts "lists.size =====#{lists.size}"
+
+    # "1" => "新增",
+    # "2" => "正在解决",
+    # "3" => "已解决",
+    # "5" => "关闭",
+    # "6" => "拒绝"
+    # Issue的状态: open（开启的）, progressing(进行中), closed（关闭的）, rejected（拒绝的）。 默认: open
+    lists.each do |issue|
+      next if issue['pull_request'].present?
+      created_issue = Issue.find_by(project_id: project.id, subject: issue['title'])
+      unless created_issue.present?
+        priority = [1, 2, 3, 4].include?(issue['priority'].to_i) ? issue['priority'].to_i : 2
+        issue_status = ["", "open", "progressing", "", "", "closed", "rejected"].index(issue['state'])
+        issue_status = 1 if issue_status.nil?
+        user_login = issue['user']['login']
+        user_login = user_login[0..20] if user_login.size > 29
+        issue_created_at = issue['created_at']
+        issue_updated_at = issue['updated_at']
+        user = User.find_by(login: user_login)
+        unless user.present?
+          username = "gh-#{user_login}"
+          email = "#{username}@gitlink.org.cn"
+          phone = ""
+          password = "a12345678"
+          user = User.new(nickname: user_login, login: username, mail: email, password: password, type: 'User', phone: phone)
+          interactor = Gitea::RegisterInteractor.call({ username: username, email: email, password: password })
+          gitea_user = interactor.result
+          result = Gitea::User::GenerateTokenService.call(username, password)
+          user.gitea_token = result['sha1']
+          user.gitea_uid = gitea_user[:body]['id']
+          user.created_on = issue_created_at
+          user.updated_on = issue_created_at
+          user.is_test = true
+          user.save!
+          UserExtension.create!(user_id: user.id)
+          puts "import_user batch success: phone #{phone} email: #{email}"
+        end
+
+        issue_params = {
+          :status_id => issue_status,
+          :priority_id => priority,
+          # :milestone_id,
+          # :branch_name,
+          # :start_date,
+          # :due_date,
+          :subject => issue['title'],
+          :description => issue['body'],
+          # :blockchain_token_num,
+          :issue_tag_ids => [],
+          :assigner_ids => [],
+          :attachment_ids => [],
+          :receivers_login => []
+        }
+        created_issue = Api::V1::Issues::CreateService.call(project, issue_params, user)
+        created_issue.update_columns(created_on: issue_created_at, updated_on: issue_updated_at)
+      end
+
+      issue_number = issue['number']
+      # comment_api_url = "https://gitee.com/api/v5/repos/mindspore/mindspore/issues/#{issue_number}/comments?access_token=96a637aa055f15056e77e3cf11a67525&page=1&per_page=100&order=asc"
+      comment_api_url = "https://api.github.com/repos/OpenXiangShan/XiangShan/issues/#{issue_number}/comments?page=1&per_page=100"
+      comment_uri = URI.parse(comment_api_url)
+      comment_response = Net::HTTP.get_response(comment_uri)
+      comment_lists = JSON.parse(comment_response.body)
+
+      comment_lists.each do |comment|
+        next if Journal.find_by(journalized_id: created_issue.id, journalized_type: 'Issue', notes: comment['body']).present?
+        user_login = comment['user']['login']
+        next if user_login.size >29
+        comment_created_at = comment['created_at']
+        comment_updated_at = comment['updated_at']
+        comment_user = User.find_by(login: user_login)
+        unless comment_user.present?
+          username = "gh-#{user_login}"
+          email = "#{username}@gitlink.org.cn"
+          phone = ""
+          password = "a12345678"
+          comment_user = User.new(nickname: user_login, login: username, mail: email, password: password, type: 'User', phone: phone)
+          interactor = Gitea::RegisterInteractor.call({ username: username, email: email, password: password })
+          gitea_user = interactor.result
+          result = Gitea::User::GenerateTokenService.call(username, password)
+          comment_user.gitea_token = result['sha1']
+          comment_user.gitea_uid = gitea_user[:body]['id']
+          comment_user.created_on = comment_created_at
+          comment_user.updated_on = comment_created_at
+          comment_user.save!
+          UserExtension.create!(user_id: comment_user.id)
+        end
+
+        journal_params = {:notes => comment['body'],
+                          :attachment_ids => [],
+                          :receivers_login => []}
+
+        object_result = Api::V1::Issues::Journals::CreateService.call(created_issue, journal_params, comment_user)
+        object_result.update_columns(created_on: comment_created_at, updated_on: comment_updated_at)
+      end
+    end
+  end
 end

From 1eb18e4036196859fa94b39e234aae508ad098fc Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 15 Dec 2023 15:47:41 +0800
Subject: [PATCH 038/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 3b607395..b30925f3 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -178,13 +178,13 @@ namespace :batch_add_issues do
         user_login = user_login[0..20] if user_login.size > 29
         issue_created_at = issue['created_at']
         issue_updated_at = issue['updated_at']
-        user = User.find_by(login: user_login)
+        username = "gh-#{user_login}"
+        user = User.find_by(login: username)
         unless user.present?
-          username = "gh-#{user_login}"
           email = "#{username}@gitlink.org.cn"
           phone = ""
           password = "a12345678"
-          user = User.new(nickname: user_login, login: username, mail: email, password: password, type: 'User', phone: phone)
+          user = User.new(nickname: username, login: username, mail: email, password: password, type: 'User', phone: phone)
           interactor = Gitea::RegisterInteractor.call({ username: username, email: email, password: password })
           gitea_user = interactor.result
           result = Gitea::User::GenerateTokenService.call(username, password)
@@ -230,13 +230,13 @@ namespace :batch_add_issues do
         next if user_login.size >29
         comment_created_at = comment['created_at']
         comment_updated_at = comment['updated_at']
-        comment_user = User.find_by(login: user_login)
+        username = "gh-#{user_login}"
+        comment_user = User.find_by(login: username)
         unless comment_user.present?
-          username = "gh-#{user_login}"
           email = "#{username}@gitlink.org.cn"
           phone = ""
           password = "a12345678"
-          comment_user = User.new(nickname: user_login, login: username, mail: email, password: password, type: 'User', phone: phone)
+          comment_user = User.new(nickname: username, login: username, mail: email, password: password, type: 'User', phone: phone)
           interactor = Gitea::RegisterInteractor.call({ username: username, email: email, password: password })
           gitea_user = interactor.result
           result = Gitea::User::GenerateTokenService.call(username, password)

From 505d873ea656cd6d28243e1f4b55336cdc963c93 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 15 Dec 2023 15:59:27 +0800
Subject: [PATCH 039/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=A4=84=E7=90=86,=20=E9=99=90?=
 =?UTF-8?q?=E6=B5=81=E9=9C=80=E8=A6=81=E8=AF=B7=E6=B1=82=E7=AD=89=E5=BE=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index b30925f3..6340899d 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -144,6 +144,7 @@ namespace :batch_add_issues do
     if total_count > 100
       total_page =  (total_count / 100) + 1
       total_page.times do |i|
+        sleep 30.seconds
         add_github_issues_to_project(project, i + 1 + count)
       end
     else
@@ -218,6 +219,7 @@ namespace :batch_add_issues do
       end
 
       issue_number = issue['number']
+      sleep 3.seconds
       # comment_api_url = "https://gitee.com/api/v5/repos/mindspore/mindspore/issues/#{issue_number}/comments?access_token=96a637aa055f15056e77e3cf11a67525&page=1&per_page=100&order=asc"
       comment_api_url = "https://api.github.com/repos/OpenXiangShan/XiangShan/issues/#{issue_number}/comments?page=1&per_page=100"
       comment_uri = URI.parse(comment_api_url)

From b7597c3fa73388e946b8c0cbecf566bb90dd7344 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 15 Dec 2023 16:47:22 +0800
Subject: [PATCH 040/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=A4=84=E7=90=86,=20=E9=99=90?=
 =?UTF-8?q?=E6=B5=81=E9=9C=80=E8=A6=81=E8=AF=B7=E6=B1=82=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?,token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 6340899d..109198f0 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -144,7 +144,7 @@ namespace :batch_add_issues do
     if total_count > 100
       total_page =  (total_count / 100) + 1
       total_page.times do |i|
-        sleep 30.seconds
+        sleep 3.seconds
         add_github_issues_to_project(project, i + 1 + count)
       end
     else
@@ -157,7 +157,11 @@ namespace :batch_add_issues do
     # api_url = "https://gitee.com/api/v5/repos/mindspore/mindspore/issues?access_token=96a637aa055f15056e77e3cf11a67525&state=all&sort=created&direction=desc&page=#{page}&per_page=100"
     api_url = "https://api.github.com/repos/OpenXiangShan/XiangShan/issues?sort=created&direction=desc&per_page=100&state=all&page=#{page}"
     uri = URI.parse(api_url)
-    response = Net::HTTP.get_response(uri)
+    # response = Net::HTTP.get_response(uri)
+    http = Net::HTTP.new(uri.hostname, uri.port)
+    http.use_ssl = true
+    comment_response = http.send_request('GET', uri.path, nil, {'Content-Type' => 'application/json','authorization' => "Bearer #{ENV['token']}"})
+
     puts "gitee api response.code ===== #{response.code}"
     lists = JSON.parse(response.body)
     puts "lists.size =====#{lists.size}"
@@ -219,11 +223,14 @@ namespace :batch_add_issues do
       end
 
       issue_number = issue['number']
-      sleep 3.seconds
+      sleep 1.seconds
       # comment_api_url = "https://gitee.com/api/v5/repos/mindspore/mindspore/issues/#{issue_number}/comments?access_token=96a637aa055f15056e77e3cf11a67525&page=1&per_page=100&order=asc"
       comment_api_url = "https://api.github.com/repos/OpenXiangShan/XiangShan/issues/#{issue_number}/comments?page=1&per_page=100"
       comment_uri = URI.parse(comment_api_url)
-      comment_response = Net::HTTP.get_response(comment_uri)
+      # comment_response = Net::HTTP.get_response(comment_uri)
+      http = Net::HTTP.new(comment_uri.hostname, comment_uri.port)
+      http.use_ssl = true
+      comment_response = http.send_request('GET', comment_uri.path, nil, {'Content-Type' => 'application/json','authorization' => "Bearer #{ENV['token']}"})
       comment_lists = JSON.parse(comment_response.body)
 
       comment_lists.each do |comment|

From de393148d9533a4586504f7aff99f950436ca9a9 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 15 Dec 2023 16:48:33 +0800
Subject: [PATCH 041/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=A4=84=E7=90=86,=20=E9=99=90?=
 =?UTF-8?q?=E6=B5=81=E9=9C=80=E8=A6=81=E8=AF=B7=E6=B1=82=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?,token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 109198f0..d6b76dd0 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -160,7 +160,7 @@ namespace :batch_add_issues do
     # response = Net::HTTP.get_response(uri)
     http = Net::HTTP.new(uri.hostname, uri.port)
     http.use_ssl = true
-    comment_response = http.send_request('GET', uri.path, nil, {'Content-Type' => 'application/json','authorization' => "Bearer #{ENV['token']}"})
+    response = http.send_request('GET', uri.path, nil, {'Content-Type' => 'application/json','authorization' => "Bearer #{ENV['token']}"})
 
     puts "gitee api response.code ===== #{response.code}"
     lists = JSON.parse(response.body)

From b80ed537fcf9b05a4311b94fe19c3ddf247ce9f9 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 15 Dec 2023 17:04:53 +0800
Subject: [PATCH 042/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=A4=84=E7=90=86,=20=E9=99=90?=
 =?UTF-8?q?=E6=B5=81=E9=9C=80=E8=A6=81=E8=AF=B7=E6=B1=82=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?,token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index d6b76dd0..198c76ef 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -144,7 +144,7 @@ namespace :batch_add_issues do
     if total_count > 100
       total_page =  (total_count / 100) + 1
       total_page.times do |i|
-        sleep 3.seconds
+        sleep 1.seconds
         add_github_issues_to_project(project, i + 1 + count)
       end
     else
@@ -160,7 +160,7 @@ namespace :batch_add_issues do
     # response = Net::HTTP.get_response(uri)
     http = Net::HTTP.new(uri.hostname, uri.port)
     http.use_ssl = true
-    response = http.send_request('GET', uri.path, nil, {'Content-Type' => 'application/json','authorization' => "Bearer #{ENV['token']}"})
+    response = http.send_request('GET', uri, nil, {'Content-Type' => 'application/json','authorization' => "Bearer #{ENV['token']}"})
 
     puts "gitee api response.code ===== #{response.code}"
     lists = JSON.parse(response.body)
@@ -230,7 +230,7 @@ namespace :batch_add_issues do
       # comment_response = Net::HTTP.get_response(comment_uri)
       http = Net::HTTP.new(comment_uri.hostname, comment_uri.port)
       http.use_ssl = true
-      comment_response = http.send_request('GET', comment_uri.path, nil, {'Content-Type' => 'application/json','authorization' => "Bearer #{ENV['token']}"})
+      comment_response = http.send_request('GET', comment_uri, nil, {'Content-Type' => 'application/json','authorization' => "Bearer #{ENV['token']}"})
       comment_lists = JSON.parse(comment_response.body)
 
       comment_lists.each do |comment|

From 9979ae6d3a6862cf0abac7035ba84105119fef06 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 18 Dec 2023 09:49:53 +0800
Subject: [PATCH 043/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,title?=
 =?UTF-8?q?=20=E9=95=BF=E5=BA=A6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 198c76ef..1e5b1af1 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -68,7 +68,8 @@ namespace :batch_add_issues do
           UserExtension.create!(user_id: user.id)
           puts "import_user batch success: phone #{phone} email: #{email}"
         end
-
+        title = issue['title']
+        title = title[0..190] if title.size > 190
         issue_params = {
           :status_id => issue_status,
           :priority_id => priority,
@@ -76,7 +77,7 @@ namespace :batch_add_issues do
           # :branch_name,
           # :start_date,
           # :due_date,
-          :subject => issue['title'],
+          :subject => title,
           :description => issue['body'],
           # :blockchain_token_num,
           :issue_tag_ids => [],

From 7b1d0e21eedc2c715dc2752ee77649e07e69b5f9 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 18 Dec 2023 10:00:01 +0800
Subject: [PATCH 044/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,title?=
 =?UTF-8?q?=20=E9=95=BF=E5=BA=A6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 1e5b1af1..49cced50 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -204,6 +204,8 @@ namespace :batch_add_issues do
           puts "import_user batch success: phone #{phone} email: #{email}"
         end
 
+        title = issue['title']
+        title = title[0..190] if title.size > 190
         issue_params = {
           :status_id => issue_status,
           :priority_id => priority,
@@ -211,7 +213,7 @@ namespace :batch_add_issues do
           # :branch_name,
           # :start_date,
           # :due_date,
-          :subject => issue['title'],
+          :subject => title,
           :description => issue['body'],
           # :blockchain_token_num,
           :issue_tag_ids => [],

From eaf389ecea57796664d5f084803b665ffd9fd804 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 18 Dec 2023 10:33:31 +0800
Subject: [PATCH 045/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,title?=
 =?UTF-8?q?=20=E9=95=BF=E5=BA=A6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 49cced50..96763344 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -203,6 +203,11 @@ namespace :batch_add_issues do
           UserExtension.create!(user_id: user.id)
           puts "import_user batch success: phone #{phone} email: #{email}"
         end
+        if issue['labels'].present?
+          issue['labels'].each do |tag|
+            project.issue_tags.find_or_create_by!(name: tag['name'], description: tag['description'], color: "##{tag['color']}")
+          end
+        end
 
         title = issue['title']
         title = title[0..190] if title.size > 190

From c6a38c06d06e05664e10c6f2c082d812720dee5c Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 18 Dec 2023 10:54:04 +0800
Subject: [PATCH 046/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 96763344..673d6a1a 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -203,12 +203,15 @@ namespace :batch_add_issues do
           UserExtension.create!(user_id: user.id)
           puts "import_user batch success: phone #{phone} email: #{email}"
         end
+        issue_tags_value = []
         if issue['labels'].present?
           issue['labels'].each do |tag|
-            project.issue_tags.find_or_create_by!(name: tag['name'], description: tag['description'], color: "##{tag['color']}")
+            label = project.issue_tags.find_or_create_by!(name: tag['name'], description: tag['description'], color: "##{tag['color']}")
+            issue_tags_value.push(label.id)
           end
         end
 
+
         title = issue['title']
         title = title[0..190] if title.size > 190
         issue_params = {
@@ -221,7 +224,7 @@ namespace :batch_add_issues do
           :subject => title,
           :description => issue['body'],
           # :blockchain_token_num,
-          :issue_tag_ids => [],
+          :issue_tag_ids => issue_tags_value.join(","),
           :assigner_ids => [],
           :attachment_ids => [],
           :receivers_login => []

From 5fe9719cc9b159f51259cb8d23375c95279711a3 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 18 Dec 2023 10:54:47 +0800
Subject: [PATCH 047/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 673d6a1a..40b8fb3c 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -175,7 +175,9 @@ namespace :batch_add_issues do
     # Issue的状态: open（开启的）, progressing(进行中), closed（关闭的）, rejected（拒绝的）。 默认: open
     lists.each do |issue|
       next if issue['pull_request'].present?
-      created_issue = Issue.find_by(project_id: project.id, subject: issue['title'])
+      title = issue['title']
+      title = title[0..190] if title.size > 190
+      created_issue = Issue.find_by(project_id: project.id, subject: title)
       unless created_issue.present?
         priority = [1, 2, 3, 4].include?(issue['priority'].to_i) ? issue['priority'].to_i : 2
         issue_status = ["", "open", "progressing", "", "", "closed", "rejected"].index(issue['state'])
@@ -211,9 +213,6 @@ namespace :batch_add_issues do
           end
         end
 
-
-        title = issue['title']
-        title = title[0..190] if title.size > 190
         issue_params = {
           :status_id => issue_status,
           :priority_id => priority,

From 3806ddaa179d85c411bac7166361960b5e74cc58 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 18 Dec 2023 10:59:24 +0800
Subject: [PATCH 048/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index 40b8fb3c..b1df5677 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -223,7 +223,7 @@ namespace :batch_add_issues do
           :subject => title,
           :description => issue['body'],
           # :blockchain_token_num,
-          :issue_tag_ids => issue_tags_value.join(","),
+          :issue_tag_ids => issue_tags_value,
           :assigner_ids => [],
           :attachment_ids => [],
           :receivers_login => []

From 326dcc56abfc0264497de707c9c71e4af25587b2 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 18 Dec 2023 11:19:20 +0800
Subject: [PATCH 049/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index b1df5677..e01182d7 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -229,7 +229,6 @@ namespace :batch_add_issues do
           :receivers_login => []
         }
         created_issue = Api::V1::Issues::CreateService.call(project, issue_params, user)
-        created_issue.update_columns(created_on: issue_created_at, updated_on: issue_updated_at)
       end
 
       issue_number = issue['number']
@@ -273,6 +272,7 @@ namespace :batch_add_issues do
 
         object_result = Api::V1::Issues::Journals::CreateService.call(created_issue, journal_params, comment_user)
         object_result.update_columns(created_on: comment_created_at, updated_on: comment_updated_at)
+        created_issue.update_columns(created_on: issue_created_at, updated_on: issue_updated_at)
       end
     end
   end

From 761021d19100cbc9565e058069adbfcbdb303032 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 18 Dec 2023 11:52:37 +0800
Subject: [PATCH 050/130] =?UTF-8?q?Github=20issues=E8=BF=81=E7=A7=BB,?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/batch_add_issues.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/batch_add_issues.rake b/lib/tasks/batch_add_issues.rake
index e01182d7..9389b95c 100644
--- a/lib/tasks/batch_add_issues.rake
+++ b/lib/tasks/batch_add_issues.rake
@@ -178,14 +178,14 @@ namespace :batch_add_issues do
       title = issue['title']
       title = title[0..190] if title.size > 190
       created_issue = Issue.find_by(project_id: project.id, subject: title)
+      issue_created_at = issue['created_at']
+      issue_updated_at = issue['updated_at']
       unless created_issue.present?
         priority = [1, 2, 3, 4].include?(issue['priority'].to_i) ? issue['priority'].to_i : 2
         issue_status = ["", "open", "progressing", "", "", "closed", "rejected"].index(issue['state'])
         issue_status = 1 if issue_status.nil?
         user_login = issue['user']['login']
         user_login = user_login[0..20] if user_login.size > 29
-        issue_created_at = issue['created_at']
-        issue_updated_at = issue['updated_at']
         username = "gh-#{user_login}"
         user = User.find_by(login: username)
         unless user.present?

From 75fff13550509023bec5eae00d05287bf0487d71 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 18 Dec 2023 15:49:41 +0800
Subject: [PATCH 051/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=9F=A5=E8=AF=A2=E4=B8=B0?=
 =?UTF-8?q?=E5=AF=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/projects_rank_controller.rb        | 75 +++++++++++++++++--
 app/views/admins/projects_rank/index.html.erb | 68 ++++-------------
 app/views/admins/projects_rank/index.js.erb   |  1 +
 .../projects_rank/shared/_data_list.html.erb  | 39 ++++++++++
 4 files changed, 121 insertions(+), 62 deletions(-)
 create mode 100644 app/views/admins/projects_rank/index.js.erb
 create mode 100644 app/views/admins/projects_rank/shared/_data_list.html.erb

diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb
index c4f968da..df759872 100644
--- a/app/controllers/admins/projects_rank_controller.rb
+++ b/app/controllers/admins/projects_rank_controller.rb
@@ -1,16 +1,77 @@
 class Admins::ProjectsRankController < Admins::BaseController
-
+  before_action :get_timeable_key_names, only:[:index]
   def index 
-    @rank_date = rank_date
-    deleted_data = $redis_cache.smembers("v2-project-rank-deleted")
-    $redis_cache.zrem("v2-project-rank-#{rank_date}", deleted_data) unless deleted_data.blank?
-    @date_rank = $redis_cache.zrevrange("v2-project-rank-#{rank_date}", 0, -1, withscores: true)
+    puts @names_array
+    unless @names_array.blank?
+      $redis_cache.zunionstore("admin-days-project-rank", @names_array)
+      deleted_data = $redis_cache.smembers("v2-project-rank-deleted")
+      $redis_cache.zrem("admin-days-project-rank", deleted_data) unless deleted_data.blank?
+      @date_rank = $redis_cache.zrevrange("admin-days-project-rank", 0, -1, withscores: true)
+      @date_rank = @date_rank.map do |i| 
+        visits = 0 
+        watchers = 0
+        praises = 0
+        forks = 0
+        issues = 0
+        pullrequests = 0
+        commits = 0
+        (begin_date..end_date).to_a.each do |d|
+          result = $redis_cache.hgetall("v2-project-statistic:#{i[0]}-#{d}")
+          visits += result["visits"].to_i 
+          watchers += result["watchers"].to_i 
+          praises += result["praises"].to_i 
+          forks += result["forks"].to_i 
+          issues += result["issues"].to_i 
+          pullrequests += result["pullrequests"].to_i 
+          commits += result["commits"].to_i 
+        end
+        i + [visits,watchers,praises,forks,issues,pullrequests,commits]
+      end
+      case params[:sort_by]
+      when 'visits'
+        @date_rank = @date_rank.sort{|i| i[2]}
+      when 'watchers'
+        @date_rank = @date_rank.sort{|i| i[3]}
+      when 'praises'
+        @date_rank = @date_rank.sort{|i| i[4]}
+      when 'forks'
+        @date_rank = @date_rank.sort{|i| i[5]}
+      when 'issues'
+        @date_rank = @date_rank.sort{|i| i[6]}
+      when 'pullrequests'
+        @date_rank = @date_rank.sort{|i| i[7]}
+      when 'commits'
+        @date_rank = @date_rank.sort{|i| i[8]}
+      else 
+        @date_rank = @date_rank.sort{|i| i[1]}
+      end
+      if params[:sort_direction].blank? || params[:sort_direction].to_s.downcase == "desc"
+        @date_rank = @date_rank.reverse
+      end
+    else 
+      @date_rank = []
+    end
   end
 
   private 
 
-  def rank_date 
-    params.fetch(:date, Date.today.to_s)
+  def begin_date 
+    params.fetch(:begin_date, Date.today.to_s)
+  end
+
+  def end_date 
+    params.fetch(:end_date, Date.today.to_s)
+  end
+
+  def get_timeable_key_names 
+    begin
+      @names_array = []
+      (begin_date..end_date).to_a.each do |i|
+        @names_array << "v2-project-rank-#{i}"
+      end
+    rescue
+      @names_array = []
+    end
   end
 
 end
\ No newline at end of file
diff --git a/app/views/admins/projects_rank/index.html.erb b/app/views/admins/projects_rank/index.html.erb
index d3a7926b..3ea7b8ae 100644
--- a/app/views/admins/projects_rank/index.html.erb
+++ b/app/views/admins/projects_rank/index.html.erb
@@ -6,69 +6,27 @@
 <div class="box search-form-container user-list-form">
   <%= form_tag(admins_projects_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-rank-date-form') do %>
     <div class="form-group mr-2">
-      <label for="status">日期：</label>
+      <label for="status">开始日期：</label>
       <% dates_array = (0..30).to_a.map { |item| [(Date.today-item.days).to_s, (Date.today-item.days).to_s] } %>
-      <%= select_tag(:date, options_for_select(dates_array, params[:date]), class:"form-control",id: "project-rank-date-select")%>
+      <%= select_tag(:begin_date, options_for_select(dates_array, params[:begin_date]), class:"form-control",id: "project-rank-begin-date-select")%>
+    </div>
+    <div class="form-group mr-2">
+      <label for="status">截止日期：</label>
+      <% dates_array = (0..30).to_a.map { |item| [(Date.today-item.days).to_s, (Date.today-item.days).to_s] } %>
+      <%= select_tag(:end_date, options_for_select(dates_array, params[:end_date]), class:"form-control",id: "project-rank-end-date-select")%>
     </div>
   <% end %>
   
 </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="30%">项目</th>
-      <th width="10%">得分</th>
-      <th width="10%">访问数</th>
-      <th width="10%">关注数</th>
-      <th width="10%">点赞数</th>
-      <th width="10%">fork数</th>
-      <th width="10%">疑修数</th>
-      <th width="10%">合并请求数</th>
-      <th width="10%">提交数</th>
-    </tr>
-    </thead>
-    <tbody>
-      <% @date_rank.each_with_index do |item, index| %>
-        <tr class="">
-          <td><%= index + 1%></td>
-          <% project_common = $redis_cache.hgetall("v2-project-common:#{item[0]}") %>
-          <% owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id"]}")%>
-          <td>
-            <a href="/<%= owner_common["login"] %>/<%= project_common["identifier"]%>">
-              <%=  "#{owner_common["name"]}/#{project_common["name"]}" %>
-            </a>
-          </td>
-        
-          <td><%= item[1] %></td>
-          <% project_date_statistic_key = "v2-project-statistic:#{item[0]}-#{@rank_date}"%>
-          <% if $redis_cache.exists(project_date_statistic_key)%>
-            <% visits = $redis_cache.hget(project_date_statistic_key, "visits") %>
-            <td><%= visits || 0 %></td>
-            <% watchers = $redis_cache.hget(project_date_statistic_key, "watchers") %>
-            <td><%= watchers || 0 %></td>
-            <% praises = $redis_cache.hget(project_date_statistic_key, "praises") %>
-            <td><%= praises || 0 %></td>
-            <% forks = $redis_cache.hget(project_date_statistic_key, "forks") %>
-            <td><%= forks || 0 %></td>
-            <% issues = $redis_cache.hget(project_date_statistic_key, "issues") %>
-            <td><%= issues || 0 %></td>
-            <% pullrequests = $redis_cache.hget(project_date_statistic_key, "pullrequests") %>
-            <td><%= pullrequests || 0 %></td>
-            <% commits = $redis_cache.hget(project_date_statistic_key, "commits") %>
-            <td><%= commits || 0 %></td>
-          <% else %>
-            <td colspan="7">暂无数据</td>
-          <% end %>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+<div class="box admin-list-container project-rank-list-container">
+  <%= render partial: 'admins/projects_rank/shared/data_list', locals: { date_rank: @date_rank } %>
 </div>
 <script>
-  $("#project-rank-date-select").on('change', function() {
+  $("#project-rank-begin-date-select").on('change', function() {
+    $("#project-rank-date-form").submit()
+  });
+  $("#project-rank-end-date-select").on('change', function() {
     $("#project-rank-date-form").submit()
   });
 </script>
\ No newline at end of file
diff --git a/app/views/admins/projects_rank/index.js.erb b/app/views/admins/projects_rank/index.js.erb
new file mode 100644
index 00000000..7e0f0e5f
--- /dev/null
+++ b/app/views/admins/projects_rank/index.js.erb
@@ -0,0 +1 @@
+$('.project-rank-list-container').html("<%= j( render partial: 'admins/projects_rank/shared/data_list', locals: { date_rank: @date_rank } ) %>");
\ No newline at end of file
diff --git a/app/views/admins/projects_rank/shared/_data_list.html.erb b/app/views/admins/projects_rank/shared/_data_list.html.erb
new file mode 100644
index 00000000..06b41b45
--- /dev/null
+++ b/app/views/admins/projects_rank/shared/_data_list.html.erb
@@ -0,0 +1,39 @@
+<table class="table table-hover text-center subject-list-table">
+    <thead class="thead-light">
+    <tr>
+      <th width="20%">排名</th>
+      <th width="30%">项目</th>
+      <th width="10%">得分</th>
+      <th width="10%"><%= sort_tag('访问数', name: 'visits', path: admins_projects_rank_index_path) %></th>
+      <th width="10%"><%= sort_tag('关注数', name: 'watchers', path: admins_projects_rank_index_path) %></th>
+      <th width="10%"><%= sort_tag('点赞数', name: 'praises', path: admins_projects_rank_index_path) %></th>
+      <th width="10%"><%= sort_tag('fork数', name: 'forks', path: admins_projects_rank_index_path) %></th>
+      <th width="10%"><%= sort_tag('疑修数', name: 'issues', path: admins_projects_rank_index_path) %></th>
+      <th width="10%"><%= sort_tag('合并请求数', name: 'pullrequests', path: admins_projects_rank_index_path) %></th>
+      <th width="10%"><%= sort_tag('提交数', name: 'commits', path: admins_projects_rank_index_path) %></th>
+    </tr>
+    </thead>
+    <tbody>
+      <% date_rank.each_with_index do |item, index| %>
+        <tr class="">
+          <td><%= index + 1%></td>
+          <% project_common = $redis_cache.hgetall("v2-project-common:#{item[0]}") %>
+          <% owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id"]}")%>
+          <td>
+            <a href="/<%= owner_common["login"] %>/<%= project_common["identifier"]%>">
+              <%=  "#{owner_common["name"]}/#{project_common["name"]}" %>
+            </a>
+          </td>
+        
+          <td><%= item[1] %></td>
+          <td><%= item[2] %></td>
+          <td><%= item[3] %></td>
+          <td><%= item[4] %></td>
+          <td><%= item[5] %></td>
+          <td><%= item[6] %></td>
+          <td><%= item[7] %></td>
+          <td><%= item[8] %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
\ No newline at end of file

From 016a2f8cf5c3278c3f180a71a5977955c66862c6 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 18 Dec 2023 16:04:14 +0800
Subject: [PATCH 052/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86sidebar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admins/shared/_sidebar.html.erb | 52 +++++++++++------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index 813e2338..4db54507 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -13,13 +13,7 @@
 
   <!-- Sidebar Links -->
   <ul class="list-unstyled components">
-    <li><%= sidebar_item(admins_path, '概览', icon: 'dashboard', controller: 'admins-dashboards') %></li>
-    <li>
-      <%= sidebar_item_group('#rank-submenu', '排行榜', icon: 'calendar') do %>
-        <li><%= sidebar_item(admins_users_rank_index_path, '用户排行榜', icon: 'user', controller: 'admins-users_rank') %></li>
-        <li><%= sidebar_item(admins_projects_rank_index_path, '项目排行榜', icon: 'database', controller: 'admins-projects_rank') %></li>
-      <% end %>
-    </li>
+    <li><%= sidebar_item(admins_path, '数据概览', icon: 'dashboard', controller: 'admins-dashboards') %></li>
     <li>
       <%= sidebar_item_group('#user-submenu', '用户', icon: 'user') do %>
         <li><%= sidebar_item(admins_users_path, '用户列表', icon: 'user', controller: 'admins-users') %></li>
@@ -27,15 +21,23 @@
        
       <% end %>
     </li>
-
     <li>
-      <%= sidebar_item_group('#pages-submenu', '站点管理', icon: 'cogs') do %>
-        <li><%= sidebar_item(admins_identity_verifications_path, '身份审核列表', icon: 'user', controller: 'admins-identity_verifications') %></li>
-        <li><%= sidebar_item(admins_site_pages_path, '用户站点列表', icon: 'sitemap', controller: 'admins-site_pages') %></li>
-        <li><%= sidebar_item(admins_page_themes_path, '站点主题配置', icon: 'cogs', controller: 'admins-page_themes') %></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>
+        <li><%= sidebar_item(admins_feedbacks_path, '用户反馈', icon: 'question-circle', controller: 'admins-feedbacks') %></li>
+        <li><%= sidebar_item(admins_system_notifications_path, '系统公告配置', icon: 'bell', controller: 'admins-system_notifications') %></li>
       <% end %>
     </li>
+    <li><%= sidebar_item(admins_laboratories_path, '导航栏配置', icon: 'cloud', controller: 'admins-laboratories') %></li>
+    <li>
+      <%= sidebar_item_group('#setting-system', '开发者配置', icon: 'wrench') do %>
+        <li><%= sidebar_item(admins_sites_path, 'setting接口配置', icon: 'deaf', controller: 'admins-sites') %></li>
+        <li><%= sidebar_item(admins_edu_settings_path, '全局变量配置', icon: 'pencil-square', controller: 'admins-edu_settings') %></li>
+        <li><%= sidebar_item(admins_message_templates_path, '消息模版配置', icon: 'folder', controller: 'admins-message_templates') %></li>
+      <% end %>
+    </li>
+    <li><%= sidebar_item(admins_reversed_keywords_path, '禁用词管理', icon: 'key', controller: 'admins-reversed_keywords') %></li>
     <li>
       <%= sidebar_item_group('#projects-submenu', '开源项目', icon: 'database') do %>
         <li><%= sidebar_item(admins_projects_path, '项目列表', icon: 'database', controller: 'admins-projects') %></li>
@@ -45,9 +47,6 @@
         <li><%= sidebar_item(admins_project_ignores_path, '忽略文件', icon: 'git', controller: 'admins-project_ignores') %></li>
       <% end %>
     </li>
-
-    <li><%= sidebar_item(admins_reversed_keywords_path, '系统保留关键词', icon: 'key', controller: 'admins-reversed_keywords') %></li>
-    <li><%= sidebar_item(admins_laboratories_path, '云上实验室', icon: 'cloud', controller: 'admins-laboratories') %></li>
     <li>
       <%= sidebar_item_group('#setting-index', '首页配置', icon: 'file') do %>
         <li><%= sidebar_item(admins_topic_banners_path, 'banner管理', icon: 'image', controller: 'admins-topic-banners') %></li>
@@ -71,25 +70,26 @@
       <% end %>
     </li>
     <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>
-        <li><%= sidebar_item(admins_feedbacks_path, '用户反馈', icon: 'question-circle', controller: 'admins-feedbacks') %></li>
+      <%= sidebar_item_group('#pages-submenu', '个人站点管理', icon: 'cogs') do %>
+        <li><%= sidebar_item(admins_identity_verifications_path, '身份审核列表', icon: 'user', controller: 'admins-identity_verifications') %></li>
+        <li><%= sidebar_item(admins_site_pages_path, '用户站点列表', icon: 'sitemap', controller: 'admins-site_pages') %></li>
+        <li><%= sidebar_item(admins_page_themes_path, '站点主题配置', icon: 'cogs', controller: 'admins-page_themes') %></li>
+       
       <% end %>
     </li>
     <li>
-      <%= sidebar_item_group('#setting-system', '系统配置', icon: 'wrench') do %>
-        <li><%= sidebar_item(admins_sites_path, 'setting接口配置', icon: 'deaf', controller: 'admins-sites') %></li>
-        <li><%= sidebar_item(admins_edu_settings_path, '全局变量配置', icon: 'pencil-square', controller: 'admins-edu_settings') %></li>
-        <li><%= sidebar_item(admins_system_notifications_path, '系统通知配置', icon: 'bell', controller: 'admins-system_notifications') %></li>
-        <li><%= sidebar_item(admins_message_templates_path, '消息模版配置', icon: 'folder', controller: 'admins-message_templates') %></li>
+      <%= sidebar_item_group('#rank-submenu', '活跃度排行', icon: 'calendar') do %>
+        <li><%= sidebar_item(admins_users_rank_index_path, '用户活跃度排行', icon: 'user', controller: 'admins-users_rank') %></li>
+        <li><%= sidebar_item(admins_projects_rank_index_path, '项目活跃度排行', icon: 'database', controller: 'admins-projects_rank') %></li>
       <% end %>
     </li>
+
+    <%= render_admin_statistics_item %>
+
     <li>
       <%= sidebar_item('/admins/sidekiq', '定时任务', icon: 'bell', controller: 'root') %>
     </li>
     
-    <%= render_admin_statistics_item %>
 
     <li><%= sidebar_item('/', '返回主站', icon: 'sign-out', controller: 'root') %></li>
   </ul>

From 21f559f2547911ada4d73bb8a042d2d5f1ef6235 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 19 Dec 2023 14:57:54 +0800
Subject: [PATCH 053/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BD=BF=E7=94=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AD=98=E5=82=A8=E4=BB=A5=E5=8F=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  3 +-
 .../admins/projects_rank_controller.rb        | 96 +++++++------------
 app/jobs/daily_project_statistics_job.rb      | 32 +++++++
 app/models/daily_project_statistic.rb         | 28 ++++++
 app/views/admins/projects_rank/index.html.erb | 30 +++---
 app/views/admins/projects_rank/index.js.erb   |  2 +-
 .../projects_rank/shared/_data_list.html.erb  | 24 +++--
 config/sidekiq_cron.yml                       |  5 +
 ...9020521_create_daily_project_statistics.rb | 19 ++++
 9 files changed, 153 insertions(+), 86 deletions(-)
 create mode 100644 app/jobs/daily_project_statistics_job.rb
 create mode 100644 app/models/daily_project_statistic.rb
 create mode 100644 db/migrate/20231219020521_create_daily_project_statistics.rb

diff --git a/.gitignore b/.gitignore
index 4a01bd5e..2735825a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,4 +84,5 @@ redis_data/
 dump.rdb
 .tags*
 ceshi_user.xlsx
-public/trace_task_results
\ No newline at end of file
+public/trace_task_results
+public/项目活跃度排行.xls
\ No newline at end of file
diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb
index df759872..c1f9722c 100644
--- a/app/controllers/admins/projects_rank_controller.rb
+++ b/app/controllers/admins/projects_rank_controller.rb
@@ -1,56 +1,17 @@
 class Admins::ProjectsRankController < Admins::BaseController
-  before_action :get_timeable_key_names, only:[:index]
   def index 
-    puts @names_array
-    unless @names_array.blank?
-      $redis_cache.zunionstore("admin-days-project-rank", @names_array)
-      deleted_data = $redis_cache.smembers("v2-project-rank-deleted")
-      $redis_cache.zrem("admin-days-project-rank", deleted_data) unless deleted_data.blank?
-      @date_rank = $redis_cache.zrevrange("admin-days-project-rank", 0, -1, withscores: true)
-      @date_rank = @date_rank.map do |i| 
-        visits = 0 
-        watchers = 0
-        praises = 0
-        forks = 0
-        issues = 0
-        pullrequests = 0
-        commits = 0
-        (begin_date..end_date).to_a.each do |d|
-          result = $redis_cache.hgetall("v2-project-statistic:#{i[0]}-#{d}")
-          visits += result["visits"].to_i 
-          watchers += result["watchers"].to_i 
-          praises += result["praises"].to_i 
-          forks += result["forks"].to_i 
-          issues += result["issues"].to_i 
-          pullrequests += result["pullrequests"].to_i 
-          commits += result["commits"].to_i 
-        end
-        i + [visits,watchers,praises,forks,issues,pullrequests,commits]
-      end
-      case params[:sort_by]
-      when 'visits'
-        @date_rank = @date_rank.sort{|i| i[2]}
-      when 'watchers'
-        @date_rank = @date_rank.sort{|i| i[3]}
-      when 'praises'
-        @date_rank = @date_rank.sort{|i| i[4]}
-      when 'forks'
-        @date_rank = @date_rank.sort{|i| i[5]}
-      when 'issues'
-        @date_rank = @date_rank.sort{|i| i[6]}
-      when 'pullrequests'
-        @date_rank = @date_rank.sort{|i| i[7]}
-      when 'commits'
-        @date_rank = @date_rank.sort{|i| i[8]}
-      else 
-        @date_rank = @date_rank.sort{|i| i[1]}
-      end
-      if params[:sort_direction].blank? || params[:sort_direction].to_s.downcase == "desc"
-        @date_rank = @date_rank.reverse
-      end
-    else 
-      @date_rank = []
-    end
+    @statistics = DailyProjectStatistic.where("date >= ? AND date <= ?", begin_date, end_date)
+    @statistics = @statistics.group(:project_id).select("project_id, 
+                                                         sum(score) as score,
+                                                         sum(visits) as visits,
+                                                         sum(watchers) as watchers,
+                                                         sum(praises) as praises,
+                                                         sum(forks) as forks,
+                                                         sum(issues) as issues,
+                                                         sum(pullrequests) as pullrequests,
+                                                         sum(commits) as commits").includes(:project)
+    @statistics = @statistics.order("#{sort_by} #{sort_direction}")
+    export_excel(@statistics.limit(50))
   end
 
   private 
@@ -63,15 +24,32 @@ class Admins::ProjectsRankController < Admins::BaseController
     params.fetch(:end_date, Date.today.to_s)
   end
 
-  def get_timeable_key_names 
-    begin
-      @names_array = []
-      (begin_date..end_date).to_a.each do |i|
-        @names_array << "v2-project-rank-#{i}"
-      end
-    rescue
-      @names_array = []
+  def sort_by
+    params.fetch(:sort_by, "score")
+  end
+
+  def sort_direction
+    params.fetch(:sort_direction, "desc")
+  end
+
+  def export_excel(data)
+    book = Spreadsheet::Workbook.new 
+    sheet = book.create_worksheet :name => "项目活跃度排行"
+    sheet.row(0).concat %w(排名 项目全称 项目地址 得分 访问数 关注数 点赞数 fork数 疑修数 合并请求数 提交数)
+    data.each_with_index do |d, index|
+      sheet[index+1,0] = index+1
+      sheet[index+1,1] = "#{d&.project&.owner&.nickname}/#{d&.project&.name}"
+      sheet[index+1,2] = "#{Rails.application.config_for(:configuration)['platform_url']}/#{d&.project&.owner&.login}/#{d&.project&.identifier}"
+      sheet[index+1,3] = d.score
+      sheet[index+1,4] = d.visits
+      sheet[index+1,5] = d.watchers
+      sheet[index+1,6] = d.praises
+      sheet[index+1,7] = d.forks
+      sheet[index+1,8] = d.issues
+      sheet[index+1,9] = d.pullrequests
+      sheet[index+1,10] = d.commits
     end
+    book.write "#{Rails.root}/public/项目活跃度排行.xls"
   end
 
 end
\ No newline at end of file
diff --git a/app/jobs/daily_project_statistics_job.rb b/app/jobs/daily_project_statistics_job.rb
new file mode 100644
index 00000000..98506748
--- /dev/null
+++ b/app/jobs/daily_project_statistics_job.rb
@@ -0,0 +1,32 @@
+class DailyProjectStatisticsJob < ApplicationJob
+  queue_as :cache
+
+  def perform
+    date = (Date.today - 1.days).to_s
+    daily_data_keys = $redis_cache.keys("v2-project-statistic:*-#{date}")
+    daily_data_keys.each do |key| 
+      result = $redis_cache.hgetall(key)
+      project_id = key.gsub('v2-project-statistic:', '').gsub("-#{date}", '')
+      visits = result["visits"].to_i 
+      watchers = result["watchers"].to_i 
+      praises = result["praises"].to_i
+      forks = result["forks"].to_i 
+      issues = result["issues"].to_i 
+      pullrequests = result["pullrequests"].to_i 
+      commits = result["commits"].to_i 
+      score = visits *1 + watchers *5 + praises * 5 + forks * 10 + issues *5 + pullrequests * 10 + commits * 5 
+      DailyProjectStatistic.create!(
+        project_id: project_id,
+        date: date,
+        score: score ,
+        visits: visits,
+        watchers: watchers,
+        praises: praises,
+        forks: forks, 
+        issues: issues,
+        pullrequests: pullrequests,
+        commits: commits
+      )
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/daily_project_statistic.rb b/app/models/daily_project_statistic.rb
new file mode 100644
index 00000000..f7fc0aad
--- /dev/null
+++ b/app/models/daily_project_statistic.rb
@@ -0,0 +1,28 @@
+# == Schema Information
+#
+# Table name: daily_project_statistics
+#
+#  id           :integer          not null, primary key
+#  project_id   :integer
+#  date         :string(255)
+#  visits       :integer          default("0")
+#  watchers     :integer          default("0")
+#  praises      :integer          default("0")
+#  forks        :integer          default("0")
+#  issues       :integer          default("0")
+#  pullrequests :integer          default("0")
+#  commits      :integer          default("0")
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+# Indexes
+#
+#  index_daily_project_statistics_on_date        (date)
+#  index_daily_project_statistics_on_project_id  (project_id)
+#
+
+class DailyProjectStatistic < ApplicationRecord
+
+
+  belongs_to :project
+end
diff --git a/app/views/admins/projects_rank/index.html.erb b/app/views/admins/projects_rank/index.html.erb
index 3ea7b8ae..e9d38afa 100644
--- a/app/views/admins/projects_rank/index.html.erb
+++ b/app/views/admins/projects_rank/index.html.erb
@@ -5,28 +5,34 @@
 
 <div class="box search-form-container user-list-form">
   <%= form_tag(admins_projects_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-rank-date-form') do %>
-    <div class="form-group mr-2">
-      <label for="status">开始日期：</label>
-      <% dates_array = (0..30).to_a.map { |item| [(Date.today-item.days).to_s, (Date.today-item.days).to_s] } %>
-      <%= select_tag(:begin_date, options_for_select(dates_array, params[:begin_date]), class:"form-control",id: "project-rank-begin-date-select")%>
+    <div class="input-group">
+      <span class="input-group-text">开始日期</span>
+      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || Date.today.to_s%>" aria-label="选择日期">
     </div>
-    <div class="form-group mr-2">
-      <label for="status">截止日期：</label>
-      <% dates_array = (0..30).to_a.map { |item| [(Date.today-item.days).to_s, (Date.today-item.days).to_s] } %>
-      <%= select_tag(:end_date, options_for_select(dates_array, params[:end_date]), class:"form-control",id: "project-rank-end-date-select")%>
+    <div class="input-group">
+      <span class="input-group-text">结束日期</span>
+      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.today.to_s%>" aria-label="选择日期">
     </div>
   <% end %>
-  
+  <%= link_to '导出', "/项目活跃度排行.xls", class: 'btn btn-primary mr-3' %>    
 </div>
 
 <div class="box admin-list-container project-rank-list-container">
-  <%= render partial: 'admins/projects_rank/shared/data_list', locals: { date_rank: @date_rank } %>
+  <%= render partial: 'admins/projects_rank/shared/data_list', locals: { statistics: @statistics } %>
 </div>
 <script>
-  $("#project-rank-begin-date-select").on('change', function() {
+  $(".datetimepicker").on('change', function() {
     $("#project-rank-date-form").submit()
   });
-  $("#project-rank-end-date-select").on('change', function() {
+  $(".datetimepicker").on('change', function() {
     $("#project-rank-date-form").submit()
   });
+  $('.datetimepicker').datetimepicker({
+    language: 'zh-CN', // 中文语言包
+    autoclose: 1, // 选中日期后自动关闭
+    format: 'yyyy-mm-dd', // 日期格式
+    minView: "month", // 最小日期显示单元，这里最小显示月份界面，即可以选择到日
+    todayBtn: 1, // 显示今天按钮
+    todayHighlight: 1, // 显示今天高亮
+  });
 </script>
\ No newline at end of file
diff --git a/app/views/admins/projects_rank/index.js.erb b/app/views/admins/projects_rank/index.js.erb
index 7e0f0e5f..0d36dd86 100644
--- a/app/views/admins/projects_rank/index.js.erb
+++ b/app/views/admins/projects_rank/index.js.erb
@@ -1 +1 @@
-$('.project-rank-list-container').html("<%= j( render partial: 'admins/projects_rank/shared/data_list', locals: { date_rank: @date_rank } ) %>");
\ No newline at end of file
+$('.project-rank-list-container').html("<%= j( render partial: 'admins/projects_rank/shared/data_list', locals: { statistics: @statistics } ) %>");
\ No newline at end of file
diff --git a/app/views/admins/projects_rank/shared/_data_list.html.erb b/app/views/admins/projects_rank/shared/_data_list.html.erb
index 06b41b45..bb9f4577 100644
--- a/app/views/admins/projects_rank/shared/_data_list.html.erb
+++ b/app/views/admins/projects_rank/shared/_data_list.html.erb
@@ -14,25 +14,23 @@
     </tr>
     </thead>
     <tbody>
-      <% date_rank.each_with_index do |item, index| %>
+      <% statistics.each_with_index do |item, index| %>
         <tr class="">
           <td><%= index + 1%></td>
-          <% project_common = $redis_cache.hgetall("v2-project-common:#{item[0]}") %>
-          <% owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id"]}")%>
           <td>
-            <a href="/<%= owner_common["login"] %>/<%= project_common["identifier"]%>">
-              <%=  "#{owner_common["name"]}/#{project_common["name"]}" %>
+            <a href="<%= "/#{item&.project&.owner&.login}/#{item&.project&.identifier}"%>">
+              <%= "#{item&.project&.owner&.nickname}/#{item&.project&.name}" %>
             </a>
           </td>
         
-          <td><%= item[1] %></td>
-          <td><%= item[2] %></td>
-          <td><%= item[3] %></td>
-          <td><%= item[4] %></td>
-          <td><%= item[5] %></td>
-          <td><%= item[6] %></td>
-          <td><%= item[7] %></td>
-          <td><%= item[8] %></td>
+          <td><%= item&.score %></td>
+          <td><%= item&.visits %></td>
+          <td><%= item&.watchers %></td>
+          <td><%= item&.praises %></td>
+          <td><%= item&.forks %></td>
+          <td><%= item&.issues %></td>
+          <td><%= item&.pullrequests %></td>
+          <td><%= item&.commits %></td>
         </tr>
       <% end %>
     </tbody>
diff --git a/config/sidekiq_cron.yml b/config/sidekiq_cron.yml
index 448e9c94..0ec8f997 100644
--- a/config/sidekiq_cron.yml
+++ b/config/sidekiq_cron.yml
@@ -7,3 +7,8 @@ delay_expired_issue:
   cron: "0 0 * * *"
   class: "DelayExpiredIssueJob"
   queue: message
+
+create_daily_project_statistics:
+  cron: "0 1 * * *"
+  class: "DailyProjectStatisticsJob"
+  queue: cache
\ No newline at end of file
diff --git a/db/migrate/20231219020521_create_daily_project_statistics.rb b/db/migrate/20231219020521_create_daily_project_statistics.rb
new file mode 100644
index 00000000..4465154d
--- /dev/null
+++ b/db/migrate/20231219020521_create_daily_project_statistics.rb
@@ -0,0 +1,19 @@
+class CreateDailyProjectStatistics < ActiveRecord::Migration[5.2]
+  def change
+    create_table :daily_project_statistics do |t|
+      t.references :project
+      t.date :date
+      t.index :date 
+      t.integer :score, default: 0
+      t.integer :visits, default: 0 
+      t.integer :watchers, default: 0 
+      t.integer :praises, default: 0
+      t.integer :forks, default: 0
+      t.integer :issues, default: 0
+      t.integer :pullrequests, default: 0
+      t.integer :commits, default: 0
+
+      t.timestamps
+    end
+  end
+end

From 26461f3a4407838b907c9ef1c1cdf7d5feed5c18 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 19 Dec 2023 15:05:00 +0800
Subject: [PATCH 054/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2sql=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb
index c1f9722c..bee024f8 100644
--- a/app/controllers/admins/projects_rank_controller.rb
+++ b/app/controllers/admins/projects_rank_controller.rb
@@ -25,11 +25,11 @@ class Admins::ProjectsRankController < Admins::BaseController
   end
 
   def sort_by
-    params.fetch(:sort_by, "score")
+    DailyProjectStatistic.column_names.include?(params.fetch(:sort_by, "score")) ? params.fetch(:sort_by, "score") : "score"
   end
 
   def sort_direction
-    params.fetch(:sort_direction, "desc")
+    %w(desc asc).include?(params.fetch(:sort_direction, "desc")) ? params.fetch(:sort_direction, "desc") : "desc"
   end
 
   def export_excel(data)

From 3b5b78faede4a62e7a15f615430c485fee313d46 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 19 Dec 2023 15:36:57 +0800
Subject: [PATCH 055/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E8=8E=B7=E5=8F=96=E8=A7=84=E5=88=99=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/projects_rank_controller.rb        | 2 +-
 app/jobs/daily_project_statistics_job.rb                  | 1 +
 app/views/admins/projects_rank/shared/_data_list.html.erb | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb
index bee024f8..06a796bd 100644
--- a/app/controllers/admins/projects_rank_controller.rb
+++ b/app/controllers/admins/projects_rank_controller.rb
@@ -38,7 +38,7 @@ class Admins::ProjectsRankController < Admins::BaseController
     sheet.row(0).concat %w(排名 项目全称 项目地址 得分 访问数 关注数 点赞数 fork数 疑修数 合并请求数 提交数)
     data.each_with_index do |d, index|
       sheet[index+1,0] = index+1
-      sheet[index+1,1] = "#{d&.project&.owner&.nickname}/#{d&.project&.name}"
+      sheet[index+1,1] = "#{d&.project&.owner&.real_name}/#{d&.project&.name}"
       sheet[index+1,2] = "#{Rails.application.config_for(:configuration)['platform_url']}/#{d&.project&.owner&.login}/#{d&.project&.identifier}"
       sheet[index+1,3] = d.score
       sheet[index+1,4] = d.visits
diff --git a/app/jobs/daily_project_statistics_job.rb b/app/jobs/daily_project_statistics_job.rb
index 98506748..ad606f13 100644
--- a/app/jobs/daily_project_statistics_job.rb
+++ b/app/jobs/daily_project_statistics_job.rb
@@ -7,6 +7,7 @@ class DailyProjectStatisticsJob < ApplicationJob
     daily_data_keys.each do |key| 
       result = $redis_cache.hgetall(key)
       project_id = key.gsub('v2-project-statistic:', '').gsub("-#{date}", '')
+      next unless Project.find_by_id(project_id).present?
       visits = result["visits"].to_i 
       watchers = result["watchers"].to_i 
       praises = result["praises"].to_i
diff --git a/app/views/admins/projects_rank/shared/_data_list.html.erb b/app/views/admins/projects_rank/shared/_data_list.html.erb
index bb9f4577..2dc0fc1e 100644
--- a/app/views/admins/projects_rank/shared/_data_list.html.erb
+++ b/app/views/admins/projects_rank/shared/_data_list.html.erb
@@ -19,7 +19,7 @@
           <td><%= index + 1%></td>
           <td>
             <a href="<%= "/#{item&.project&.owner&.login}/#{item&.project&.identifier}"%>">
-              <%= "#{item&.project&.owner&.nickname}/#{item&.project&.name}" %>
+              <%= "#{item&.project&.owner&.real_name}/#{item&.project&.name}" %>
             </a>
           </td>
         

From 6b8749589e57bd750d72a3c3fea0b18332950ab2 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 19 Dec 2023 15:45:35 +0800
Subject: [PATCH 056/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E4=B8=BA=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/admins/projects_rank/index.html.erb b/app/views/admins/projects_rank/index.html.erb
index e9d38afa..4b1d81fe 100644
--- a/app/views/admins/projects_rank/index.html.erb
+++ b/app/views/admins/projects_rank/index.html.erb
@@ -10,7 +10,7 @@
       <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || Date.today.to_s%>" aria-label="选择日期">
     </div>
     <div class="input-group">
-      <span class="input-group-text">结束日期</span>
+      <span class="input-group-text">截止日期</span>
       <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.today.to_s%>" aria-label="选择日期">
     </div>
   <% end %>

From d590e1165ea72a76abf33b5527d9da84a114f56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 20 Dec 2023 09:22:10 +0800
Subject: [PATCH 057/130] website update

---
 app/controllers/site_pages_controller.rb | 38 ++++++-----
 app/models/attachment.rb                 | 83 ++++++++++++------------
 app/models/issue.rb                      |  5 ++
 app/models/issue_tag.rb                  |  1 +
 app/models/journal.rb                    |  1 +
 app/models/user.rb                       |  4 +-
 6 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/app/controllers/site_pages_controller.rb b/app/controllers/site_pages_controller.rb
index 903e037d..085f1b02 100644
--- a/app/controllers/site_pages_controller.rb
+++ b/app/controllers/site_pages_controller.rb
@@ -17,23 +17,31 @@ class SitePagesController < ApplicationController
     end
     
     def create
-        return normal_status(-1, "你还未开通Page服务，无法进行部署") unless current_user.website_permission
-        return normal_status(-1, "你已使用了 #{params[:identifier]} 作为page标识") if Page.exists?(identifier: params[:identifier], user: current_user)
-        return normal_status(-1, "该仓库已开通Page服务") if Page.exists?(project: @project)
+        return normal_status(-1, '你还未开通Page服务，无法进行部署') unless current_user.website_permission
+        return normal_status(-1, '你已开通Page服务') if Page.exists?(user: current_user)
+        return normal_status(-1, '该仓库已开通Page服务') if Page.exists?(project: @project)
         @page = Page.new(create_params)
         @page.user = current_user
         @page.project = @project
         @page.save
     end
 
+    def update
+        return normal_status(-1, '你还未开通Page服务') unless current_user.website_permission
+        return normal_status(-1, '你还未开通Page站点') unless Page.exists?(user: current_user)
+        @page = Page.find_by(user: current_user)
+        @page.update(language_frame: params[:language_frame])
+        render_ok
+    end
+
     def build
-        return normal_status(-1, "你还未开通Page服务，无法进行部署") unless current_user.website_permission
-        return normal_status(-1, "该仓库还未开通Page服务，无法进行部署") unless Page.exists?(project: @project)
+        return normal_status(-1, '你还未开通Page服务，无法进行部署') unless current_user.website_permission
+        return normal_status(-1, '该仓库还未开通Page服务，无法进行部署') unless Page.exists?(project: @project)
         @page = Page.find params[:id]
         return normal_status(-1, @page.state_description) unless @page.state
         response_str =  @page.deploy_page(params[:branch])
-        data = JSON.parse(response_str)["result"] || data = JSON.parse(response_str)["error"]
-        if data.to_s.include?("部署成功")
+        data = JSON.parse(response_str)['result'] || (data = JSON.parse(response_str)['error'])
+        if data.to_s.include?('部署成功')
             @page.update(last_build_at: Time.now, build_state: true, last_build_info: data)
         else
             @page.update(build_state:false, last_build_info: data)
@@ -42,22 +50,22 @@ class SitePagesController < ApplicationController
     end
 
     def softbot_build
-        branch = params[:ref].split("/").last
+        branch = params[:ref].split('/').last
         user = User.find_by_login params[:repository][:owner][:login]
-        return normal_status(-1, "你还未开通Page服务，无法进行部署") unless user.website_permission
+        return normal_status(-1, '你还未开通Page服务，无法进行部署') unless user.website_permission
 
         project = Project.where(identifier: params[:repository][:name],user_id: user.id)
-        return normal_status(-1, "你没有权限操作") if project.owner?(user)
-        return normal_status(-1, "该仓库还未开通Page服务，无法进行部署") if Page.exists?(user: user, project: project)
+        return normal_status(-1, '你没有权限操作') if project.owner?(user)
+        return normal_status(-1, '该仓库还未开通Page服务，无法进行部署') if Page.exists?(user: user, project: project)
 
         @page = Page.find_by(user: user, project: project)
         response_str =  @page.deploy_page(branch)
-        data = JSON.parse(response_str)["result"]
+        data = JSON.parse(response_str)['result']
         if data.nil?
-            data = JSON.parse(response_str)["error"]
+            data = JSON.parse(response_str)['error']
         end
         
-        if data.include?("部署成功")
+        if data.include?('部署成功')
             @page.update(last_build_at: Time.now, build_state: true, last_build_info: data)
         else
             @page.update(build_state:false, last_build_info: data)
@@ -85,7 +93,7 @@ class SitePagesController < ApplicationController
     end
 
     def theme_params
-        params[:language_frame] || "hugo"
+        params[:language_frame] || 'hugo'
     end
 
     def create_params
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 81047460..9fd858bf 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -1,44 +1,45 @@
-# == Schema Information
-#
-# Table name: attachments
-#
-#  id                        :integer          not null, primary key
-#  container_id              :integer
-#  container_type            :string(30)
-#  filename                  :string(255)      default(""), not null
-#  disk_filename             :string(255)      default(""), not null
-#  filesize                  :integer          default("0"), not null
-#  content_type              :string(255)      default("")
-#  digest                    :string(60)       default(""), not null
-#  downloads                 :integer          default("0"), not null
-#  author_id                 :integer          default("0"), not null
-#  created_on                :datetime
-#  description               :text(65535)
-#  disk_directory            :string(255)
-#  attachtype                :integer          default("1")
-#  is_public                 :integer          default("1")
-#  copy_from                 :integer
-#  quotes                    :integer          default("0")
-#  is_publish                :integer          default("1")
-#  publish_time              :datetime
-#  resource_bank_id          :integer
-#  unified_setting           :boolean          default("1")
-#  cloud_url                 :string(255)      default("")
-#  course_second_category_id :integer          default("0")
-#  delay_publish             :boolean          default("0")
-#  memo_image                :boolean          default("0")
-#  extra_type                :integer          default("0")
-#  uuid                      :string(255)
-#
-# Indexes
-#
-#  index_attachments_on_author_id                        (author_id)
-#  index_attachments_on_container_id_and_container_type  (container_id,container_type)
-#  index_attachments_on_course_second_category_id        (course_second_category_id)
-#  index_attachments_on_created_on                       (created_on)
-#  index_attachments_on_is_public                        (is_public)
-#  index_attachments_on_quotes                           (quotes)
-#
+# == Schema Information
+#
+# Table name: attachments
+#
+#  id                        :integer          not null, primary key
+#  container_id              :integer
+#  container_type            :string(30)
+#  filename                  :string(255)      default(""), not null
+#  disk_filename             :string(255)      default(""), not null
+#  filesize                  :integer          default("0"), not null
+#  content_type              :string(255)      default("")
+#  digest                    :string(60)       default(""), not null
+#  downloads                 :integer          default("0"), not null
+#  author_id                 :integer          default("0"), not null
+#  created_on                :datetime
+#  description               :text(65535)
+#  disk_directory            :string(255)
+#  attachtype                :integer          default("1")
+#  is_public                 :integer          default("1")
+#  copy_from                 :integer
+#  quotes                    :integer          default("0")
+#  is_publish                :integer          default("1")
+#  publish_time              :datetime
+#  resource_bank_id          :integer
+#  unified_setting           :boolean          default("1")
+#  cloud_url                 :string(255)      default("")
+#  course_second_category_id :integer          default("0")
+#  delay_publish             :boolean          default("0")
+#  memo_image                :boolean          default("0")
+#  extra_type                :integer          default("0")
+#  uuid                      :string(255)
+#
+# Indexes
+#
+#  index_attachments_on_author_id                        (author_id)
+#  index_attachments_on_container_id_and_container_type  (container_id,container_type)
+#  index_attachments_on_course_second_category_id        (course_second_category_id)
+#  index_attachments_on_created_on                       (created_on)
+#  index_attachments_on_is_public                        (is_public)
+#  index_attachments_on_quotes                           (quotes)
+#
+
 
 
 
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 93d30b5d..f96bac8f 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -36,12 +36,17 @@
 #  blockchain_token_num :integer
 #  pm_project_id        :integer
 #  pm_sprint_id         :integer
+#  pm_issue_type        :integer
+#  time_scale           :decimal(10, 2)   default("0.00")
+#  child_count          :integer          default("0")
+#  changer_id           :integer
 #
 # Indexes
 #
 #  index_issues_on_assigned_to_id           (assigned_to_id)
 #  index_issues_on_author_id                (author_id)
 #  index_issues_on_category_id              (category_id)
+#  index_issues_on_changer_id               (changer_id)
 #  index_issues_on_created_on               (created_on)
 #  index_issues_on_fixed_version_id         (fixed_version_id)
 #  index_issues_on_priority_id              (priority_id)
diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb
index a3782aba..f5f0abbd 100644
--- a/app/models/issue_tag.rb
+++ b/app/models/issue_tag.rb
@@ -14,6 +14,7 @@
 #  gid                 :integer
 #  gitea_url           :string(255)
 #  pull_requests_count :integer          default("0")
+#  pm_project_id       :integer
 #
 # Indexes
 #
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 2e754c51..0fdca0f9 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -27,6 +27,7 @@
 #
 #  index_journals_on_created_on      (created_on)
 #  index_journals_on_journalized_id  (journalized_id)
+#  index_journals_on_parent_id       (parent_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/user.rb b/app/models/user.rb
index 8f1e2954..8ffa5b18 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -189,7 +189,7 @@ class User < Owner
   has_many :user_clas, :dependent => :destroy
   has_many :clas, through: :user_clas
 
-  has_many :pages, :dependent => :destroy
+  has_one :page, :dependent => :destroy
   
   # Groups and active users
   scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
@@ -773,7 +773,7 @@ class User < Owner
 
   def check_website_permission
     if website_permission_changed? && website_permission == false
-      self.pages.update_all(state: false, state_description:"因违规使用，现关闭Page服务")
+      self.page.update(state: false, state_description:"因违规使用，现关闭Page服务")
       PageService.close_site(self.id)
     end
   end

From ae8b86ef025d3bce82000cea8da7e52785eb9b00 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 20 Dec 2023 09:43:57 +0800
Subject: [PATCH 058/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/system_notifications_controller.rb      |  8 ++++----
 app/views/admins/carousels/index.html.erb          |  2 +-
 app/views/admins/laboratories/index.html.erb       |  2 +-
 .../shared/_create_laboratory_modal.html.erb       |  2 +-
 app/views/admins/laboratory_settings/show.html.erb |  2 +-
 .../admins/reversed_keywords/_form_modal.html.erb  |  4 ++--
 app/views/admins/reversed_keywords/index.html.erb  |  2 +-
 .../admins/system_notifications/_form.html.erb     | 14 +++++++-------
 .../admins/system_notifications/index.html.erb     |  4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/controllers/admins/system_notifications_controller.rb b/app/controllers/admins/system_notifications_controller.rb
index e2081f1a..33f3f20f 100644
--- a/app/controllers/admins/system_notifications_controller.rb
+++ b/app/controllers/admins/system_notifications_controller.rb
@@ -25,7 +25,7 @@ class Admins::SystemNotificationsController < Admins::BaseController
     @notification = SystemNotification.new(notification_params)
     if @notification.save
       redirect_to admins_system_notifications_path
-      flash[:success] = '系统消息创建成功'
+      flash[:success] = '系统公告创建成功'
     else
       redirect_to admins_system_notifications_path
       flash[:danger] = @notification.errors.full_messages.join(",")
@@ -37,7 +37,7 @@ class Admins::SystemNotificationsController < Admins::BaseController
       if @notification.update_attributes(notification_params)
         format.html do 
           redirect_to admins_system_notifications_path
-          flash[:success] = '系统消息更新成功'
+          flash[:success] = '系统公告更新成功'
         end
         format.js {render_ok}
       else 
@@ -53,10 +53,10 @@ class Admins::SystemNotificationsController < Admins::BaseController
   def destroy 
     if @notification.destroy 
       redirect_to admins_system_notifications_path 
-      flash[:success] = "系统消息删除成功"
+      flash[:success] = "系统公告删除成功"
     else 
       redirect_to admins_system_notifications_path 
-      flash[:danger] = "系统消息删除失败"
+      flash[:danger] = "系统公告删除失败"
     end
   end
 
diff --git a/app/views/admins/carousels/index.html.erb b/app/views/admins/carousels/index.html.erb
index 299d1dcf..e9529c86 100644
--- a/app/views/admins/carousels/index.html.erb
+++ b/app/views/admins/carousels/index.html.erb
@@ -1,6 +1,6 @@
 <%
   define_admin_breadcrumbs do
-    add_admin_breadcrumb('云上实验室', admins_laboratories_path)
+    add_admin_breadcrumb('导航栏配置', admins_laboratories_path)
     add_admin_breadcrumb('轮播图')
   end
 %>
diff --git a/app/views/admins/laboratories/index.html.erb b/app/views/admins/laboratories/index.html.erb
index 8811f4ab..adf34d6f 100644
--- a/app/views/admins/laboratories/index.html.erb
+++ b/app/views/admins/laboratories/index.html.erb
@@ -1,5 +1,5 @@
 <% define_admin_breadcrumbs do %>
-  <% add_admin_breadcrumb('云上实验室') %>
+  <% add_admin_breadcrumb('导航栏配置') %>
 <% end %>
 
 <div class="box search-form-container laboratory-list-form">
diff --git a/app/views/admins/laboratories/shared/_create_laboratory_modal.html.erb b/app/views/admins/laboratories/shared/_create_laboratory_modal.html.erb
index 0a77477d..77ec0bd8 100644
--- a/app/views/admins/laboratories/shared/_create_laboratory_modal.html.erb
+++ b/app/views/admins/laboratories/shared/_create_laboratory_modal.html.erb
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-dialog-centered" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">新建云上实验室</h5>
+        <h5 class="modal-title">新建导航栏配置</h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
diff --git a/app/views/admins/laboratory_settings/show.html.erb b/app/views/admins/laboratory_settings/show.html.erb
index df1db4fa..95fe5b38 100644
--- a/app/views/admins/laboratory_settings/show.html.erb
+++ b/app/views/admins/laboratory_settings/show.html.erb
@@ -1,5 +1,5 @@
 <% define_admin_breadcrumbs do %>
-  <% add_admin_breadcrumb('云上实验室', admins_laboratories_path) %>
+  <% add_admin_breadcrumb('导航栏配置', admins_laboratories_path) %>
   <% add_admin_breadcrumb('单位定制') %>
 <% end %>
 
diff --git a/app/views/admins/reversed_keywords/_form_modal.html.erb b/app/views/admins/reversed_keywords/_form_modal.html.erb
index 7dd2f2ba..8e79a1ab 100644
--- a/app/views/admins/reversed_keywords/_form_modal.html.erb
+++ b/app/views/admins/reversed_keywords/_form_modal.html.erb
@@ -11,13 +11,13 @@
         <div class="modal-body">
           <div class="form-group">
             <label>
-              系统保留关键词标识 <span class="ml10 color-orange mr20">*</span>
+              禁用词标识 <span class="ml10 color-orange mr20">*</span>
             </label>
             <%= p.text_field :identifier,class: "form-control input-lg",required: true%>
           </div>
           <div class="form-group">
           <label>
-            系统保留关键词描述 
+            禁用词描述 
           </label>
           <%= p.text_area :description,class: "form-control",placeholder: ""%>
         </div>
diff --git a/app/views/admins/reversed_keywords/index.html.erb b/app/views/admins/reversed_keywords/index.html.erb
index a5218c9c..e48e2ad0 100644
--- a/app/views/admins/reversed_keywords/index.html.erb
+++ b/app/views/admins/reversed_keywords/index.html.erb
@@ -1,5 +1,5 @@
 <% define_admin_breadcrumbs do %>
-  <% add_admin_breadcrumb('系统保留关键词') %>
+  <% add_admin_breadcrumb('禁用词管理') %>
 <% end %>
 
 <div class="box search-form-container project-list-form">
diff --git a/app/views/admins/system_notifications/_form.html.erb b/app/views/admins/system_notifications/_form.html.erb
index 33c35747..e8aacf4a 100644
--- a/app/views/admins/system_notifications/_form.html.erb
+++ b/app/views/admins/system_notifications/_form.html.erb
@@ -1,5 +1,5 @@
 <div class="box search-form-container project-list-form">
-  <div style="line-height: 38px;" class="flex-1"><%= type == "create" ? "新建" : "编辑" %>系统通知</div>
+  <div style="line-height: 38px;" class="flex-1"><%= type == "create" ? "新建" : "编辑" %>系统公告</div>
   <%= link_to "返回", admins_system_notifications_path, class: "btn btn-default pull-right" %>
 </div>
 
@@ -8,36 +8,36 @@
   <div class="form-group">
     <label>
       <span class="color-grey-6 pt10">
-        系统通知标题
+        系统公告标题
         <span class="ml10 color-orange mr20">*</span>
       </span>
     </label>
     <div class="mt-10">
-      <%= p.text_field :subject, class: "form-control input-lg", placeholder: "请输入系统通知标题" %>
+      <%= p.text_field :subject, class: "form-control input-lg", placeholder: "请输入系统公告标题" %>
     </div>
 
   </div>
   <div class="form-group">
     <label>
       <span class="color-grey-6 pt10">
-        系统通知副标题
+        系统公告副标题
         <span class="ml10 color-orange mr20">*</span>
       </span>
     </label>
     <div class="mt-10">
-      <%= p.text_field :sub_subject, class: "form-control input-lg", placeholder: "请输入系统通知副标题" %>
+      <%= p.text_field :sub_subject, class: "form-control input-lg", placeholder: "请输入系统公告副标题" %>
     </div>
 
   </div>
   <div class="form-group">
     <label>
       <span class="color-grey-6 pt10">
-        系统通知正文
+        系统公告正文
         <span class="ml10 color-orange mr20">*</span>
       </span>
     </label>
     <div class="pl-0 my-3 setting-item-body" id="system-notification-content-editor">
-      <%= p.text_area :content, class:"form-control", style: 'display: none;', rows: "10", cols: "20", placeholer: "请输入系统通知正文" %>
+      <%= p.text_area :content, class:"form-control", style: 'display: none;', rows: "10", cols: "20", placeholer: "请输入系统公告正文" %>
     </div>
 
   </div>
diff --git a/app/views/admins/system_notifications/index.html.erb b/app/views/admins/system_notifications/index.html.erb
index 01a35f21..6e2fdada 100644
--- a/app/views/admins/system_notifications/index.html.erb
+++ b/app/views/admins/system_notifications/index.html.erb
@@ -1,11 +1,11 @@
 <% define_admin_breadcrumbs do %>
-  <% add_admin_breadcrumb('系统通知模版') %>
+  <% add_admin_breadcrumb('系统公告配置') %>
 <% end %>
 
 <div id="admins-system-notification-content">
   <div class="box search-form-container project-list-form">
     <%= form_tag(admins_system_notifications_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: '系统通知标题检索') %>
+      <%= 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 %>

From 3f621bd5b5201b025fc76456d0560c05a3b271fe Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 20 Dec 2023 09:51:51 +0800
Subject: [PATCH 059/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=B4=BB=E8=B7=83=E5=BA=A6=E6=8E=92=E8=A1=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=BB=9F=E8=AE=A1=E4=B8=80=E5=91=A8=E5=86=85=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/projects_rank_controller.rb        | 2 +-
 app/views/admins/projects_rank/index.html.erb             | 2 +-
 app/views/admins/projects_rank/shared/_data_list.html.erb | 2 +-
 app/views/admins/users_rank/index.html.erb                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb
index 06a796bd..e4d8046e 100644
--- a/app/controllers/admins/projects_rank_controller.rb
+++ b/app/controllers/admins/projects_rank_controller.rb
@@ -17,7 +17,7 @@ class Admins::ProjectsRankController < Admins::BaseController
   private 
 
   def begin_date 
-    params.fetch(:begin_date, Date.today.to_s)
+    params.fetch(:begin_date, (Date.today-7.days).to_s)
   end
 
   def end_date 
diff --git a/app/views/admins/projects_rank/index.html.erb b/app/views/admins/projects_rank/index.html.erb
index 4b1d81fe..e8f334f0 100644
--- a/app/views/admins/projects_rank/index.html.erb
+++ b/app/views/admins/projects_rank/index.html.erb
@@ -7,7 +7,7 @@
   <%= form_tag(admins_projects_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-rank-date-form') do %>
     <div class="input-group">
       <span class="input-group-text">开始日期</span>
-      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || Date.today.to_s%>" aria-label="选择日期">
+      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.today - 7.days).to_s%>" aria-label="选择日期">
     </div>
     <div class="input-group">
       <span class="input-group-text">截止日期</span>
diff --git a/app/views/admins/projects_rank/shared/_data_list.html.erb b/app/views/admins/projects_rank/shared/_data_list.html.erb
index 2dc0fc1e..e95cfdef 100644
--- a/app/views/admins/projects_rank/shared/_data_list.html.erb
+++ b/app/views/admins/projects_rank/shared/_data_list.html.erb
@@ -18,7 +18,7 @@
         <tr class="">
           <td><%= index + 1%></td>
           <td>
-            <a href="<%= "/#{item&.project&.owner&.login}/#{item&.project&.identifier}"%>">
+            <a target="_blank" href="<%= "/#{item&.project&.owner&.login}/#{item&.project&.identifier}"%>">
               <%= "#{item&.project&.owner&.real_name}/#{item&.project&.name}" %>
             </a>
           </td>
diff --git a/app/views/admins/users_rank/index.html.erb b/app/views/admins/users_rank/index.html.erb
index 9fa5a5ae..f36680ea 100644
--- a/app/views/admins/users_rank/index.html.erb
+++ b/app/views/admins/users_rank/index.html.erb
@@ -34,7 +34,7 @@
           <td><%= index + 1%></td>
           <% owner_common = $redis_cache.hgetall("v2-owner-common:#{item[0]}")%>
           <td>
-            <a href="/<%= owner_common["login"] %>">
+            <a target="_blank" href="/<%= owner_common["login"] %>">
               <%= owner_common["name"] %>
             </a>
           </td>

From 3fefc0d7c64670c63db9262141fd3845e95ff15b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 20 Dec 2023 09:58:03 +0800
Subject: [PATCH 060/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=A1=B9=E7=9B=AE=E9=A1=BB=E5=90=8C=E6=97=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=89=80=E6=9C=89=E7=9A=84=E7=BB=9F=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/models/project.rb b/app/models/project.rb
index 5f9fcef6..34e98150 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -136,6 +136,7 @@ class Project < ApplicationRecord
   has_many :project_topic_ralates, dependent: :destroy 
   has_many :project_topics, through: :project_topic_ralates
   has_many :commit_logs, dependent: :destroy
+  has_many :daily_project_statistics, 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

From 69c4d461a4dda10eca25c44dc3bc47d5efd5f85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 20 Dec 2023 10:41:39 +0800
Subject: [PATCH 061/130] update reposit detail

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

diff --git a/app/views/repositories/detail.json.jbuilder b/app/views/repositories/detail.json.jbuilder
index df959150..d4299a1f 100644
--- a/app/views/repositories/detail.json.jbuilder
+++ b/app/views/repositories/detail.json.jbuilder
@@ -19,6 +19,7 @@ json.version_releasesed_count @project.releases_size(@user.try(:id), "released")
 json.permission render_permission(@user, @project)
 json.mirror_url @project&.repository.remote_mirror_url
 json.mirror @project&.repository.mirror_url.present?
+json.web_site @project.page.try(:identifier)
 json.type @project.numerical_for_project_type
 json.open_devops @project.open_devops?
 json.topics @project.project_topics.each do |topic| 

From 3a0a95a18fea1d1028600c6b4973b6abd8852192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Thu, 21 Dec 2023 14:13:42 +0800
Subject: [PATCH 062/130] update model page url

---
 .gitignore         | 2 +-
 app/models/page.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2735825a..d0186c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@
 
 # Ignore lock config file
 *.log
-
+.env
 # mac
 *.DS_Store
 .bashrc
diff --git a/app/models/page.rb b/app/models/page.rb
index 57a30aca..97c2093e 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -46,7 +46,7 @@ class Page < ApplicationRecord
 
   def url 
     @deploy_domain = EduSetting.find_by_name("site_page_deploy_domain").try(:value)
-    "http://#{user.login}.#{@deploy_domain}/#{identifier}"
+    "http://#{identifier}"
   end
 
   def build_script_path

From 9f60518e3ea8ab5184299720d600c4f2bf645a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Thu, 21 Dec 2023 14:35:07 +0800
Subject: [PATCH 063/130] update page service

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

diff --git a/app/services/page_service.rb b/app/services/page_service.rb
index 687added..5c166e82 100644
--- a/app/services/page_service.rb
+++ b/app/services/page_service.rb
@@ -26,7 +26,7 @@ class PageService
         Rails.logger.info "################### PageService close_site #{user_id} / #{identifier}"
         user = User.find user_id
         uri = if identifier.present?
-            URI.parse("http://gitlink.#{@deploy_domain}/gitlink_execute_script?key=#{@deploy_key}&script_path=remove_dir&owner=#{user.login.downcase}/#{identifier}/")
+            URI.parse("http://gitlink.#{@deploy_domain}/gitlink_execute_script?key=#{@deploy_key}&script_path=remove_dir&owner=#{user.login.downcase}/*")
         else
             URI.parse("http://gitlink.#{@deploy_domain}/gitlink_execute_script?key=#{@deploy_key}&script_path=remove_dir&owner=#{user.login.downcase}/")
         end

From 5aff33405470de250f1d2ab8e00dbb93b6203713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Thu, 21 Dec 2023 15:07:56 +0800
Subject: [PATCH 064/130] add page destroy callback

---
 app/models/page.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/page.rb b/app/models/page.rb
index 97c2093e..1c606760 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -34,6 +34,10 @@ class Page < ApplicationRecord
     PageService.genernate_user(user_id)
   end
 
+  before_destroy do
+    PageService.close_site(user_id, identifier)
+  end
+
   before_save do
     if state_changed? && state == false
       PageService.close_site(user_id, identifier)

From d79213d14f6f833e4a63ed5b473a7c68181f2527 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 22 Dec 2023 08:42:57 +0800
Subject: [PATCH 065/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aissue?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8column=E6=97=A0=E5=80=BC=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/api/v1/issues/list_service.rb | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb
index 820f708e..b267647e 100644
--- a/app/services/api/v1/issues/list_service.rb
+++ b/app/services/api/v1/issues/list_service.rb
@@ -60,13 +60,31 @@ class Api::V1::Issues::ListService < ApplicationService
     issues = issues.where(author_id: author_id) if author_id.present?
 
     # issue_tag_ids
-    issues = issues.ransack(issue_tags_value_cont: issue_tag_ids.sort!.join(',')).result unless issue_tag_ids.blank?
+    if issue_tag_ids.present? 
+      if issue_tag_ids.include?('-1')
+        issues = issues.where(issue_tags_value: nil).or(issues.where(issue_tags_value: ""))
+      else 
+        issues = issues.ransack(issue_tags_value_cont: issue_tag_ids.sort!.join(',')).result
+      end
+    end
     
     # milestone_id
-    issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present?
+    if milestone_id.present? 
+      if milestone_id.to_i == -1 
+        issues = issues.where(fixed_version_id: nil) 
+      else 
+        issues = issues.where(fixed_version_id: milestone_id) 
+      end
+    end
 
     # assigner_id
-    issues = issues.joins(:assigners).where(users: {id: assigner_id}) if assigner_id.present?
+    if assigner_id.present?
+      if assigner_id.to_i == -1 
+        issues = issues.left_joins(:assigners).where(users: {id: nil})
+      else 
+        issues = issues.joins(:assigners).where(users: {id: assigner_id})
+      end
+    end
 
     # status_id
     issues = issues.where(status_id: status_id) if status_id.present? && category != 'closed'

From 1cd25c188c98f400ac64b806c8f228dc7e72ad5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 10 Jan 2024 10:19:45 +0800
Subject: [PATCH 066/130] add page site close description rule

---
 app/controllers/admins/site_pages_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admins/site_pages_controller.rb b/app/controllers/admins/site_pages_controller.rb
index f0e05e71..306c9162 100644
--- a/app/controllers/admins/site_pages_controller.rb
+++ b/app/controllers/admins/site_pages_controller.rb
@@ -29,8 +29,12 @@ class Admins::SitePagesController <  Admins::BaseController
     end
 
     def update
-        @site_page.update(update_params)
-        flash[:success] = '保存成功'
+        if update_params[:state] == "false" && update_params[:state_description].blank?
+            flash[:danger] = '关闭站点理由不能为空'
+        else
+            @site_page.update(update_params)
+            flash[:success] = '保存成功'
+        end
         render 'edit'
     end
 

From f2b732b8e77ee289ae7fdb274bc0b3a72add6d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 10 Jan 2024 14:58:02 +0800
Subject: [PATCH 067/130] add log for identity_verifications

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

diff --git a/app/controllers/admins/identity_verifications_controller.rb b/app/controllers/admins/identity_verifications_controller.rb
index 51d5e423..26dc35d3 100644
--- a/app/controllers/admins/identity_verifications_controller.rb
+++ b/app/controllers/admins/identity_verifications_controller.rb
@@ -15,6 +15,7 @@ class Admins::IdentityVerificationsController < Admins::BaseController
 
     def update
         if @identity_verification.update(update_params)
+            UserAction.create(action_id: @identity_verification.id, action_type: "UpdateIdentityVerifications", user_id: current_user.id, :ip => request.remote_ip, data_bank: @identity_verification.attributes.to_json)
             redirect_to admins_identity_verifications_path
             flash[:success] = "更新成功"
         else  

From 35e6d945dd5096ea7c3c4d0343b3da00e6b46d11 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 11 Jan 2024 13:39:13 +0800
Subject: [PATCH 068/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=A0=87=E8=AF=86=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/forms/organizations/create_form.rb | 4 ++--
 app/models/organization.rb             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/forms/organizations/create_form.rb b/app/forms/organizations/create_form.rb
index 2163f477..1f40350b 100644
--- a/app/forms/organizations/create_form.rb
+++ b/app/forms/organizations/create_form.rb
@@ -1,12 +1,12 @@
 class Organizations::CreateForm < BaseForm
-  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  NAME_REGEX = /^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*$/ #只含有数字、字母、下划线不能以下划线开头和结尾
   attr_accessor :name, :description, :website, :location, :repo_admin_change_team_access, :visibility, :max_repo_creation, :nickname, :original_name
 
   validates :name, :nickname, :visibility, presence: true
   validates :name, :nickname, length: { maximum: 100 }
   validates :location, length: { maximum: 50 }
   validates :description, length: { maximum: 200 }
-  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
+  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能以数字或字母开头，仅支持横杠、下划线、点三种符号，不允许符号连续排列，长度4-50个字符" }
 
   validate do 
     check_name(name) unless name.blank? || name == original_name
diff --git a/app/models/organization.rb b/app/models/organization.rb
index d61dda56..f6c14298 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -63,7 +63,7 @@
 
 class Organization < Owner
   alias_attribute :name, :login
-  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  NAME_REGEX = /^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*$/ #只含有数字、字母、下划线不能以下划线开头和结尾
 
   default_scope { where(type: "Organization") }
 
@@ -74,7 +74,7 @@ class Organization < Owner
 
   validates :login, presence: true
   validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false
-  validates :login, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
+  validates :login, format: { with: NAME_REGEX, multiline: true, message: "只能以数字或字母开头，仅支持横杠、下划线、点三种符号，不允许符号连续排列，长度4-50个字符" }
 
   delegate :description, :website, :location, :repo_admin_change_team_access, :recommend,
            :visibility, :max_repo_creation, :num_projects, :num_users, :num_teams, to: :organization_extension, allow_nil: true

From 6756687c07f42090f07ec46f57784b3a33d7d144 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Thu, 11 Jan 2024 14:14:56 +0800
Subject: [PATCH 069/130] =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=A1=A8uuid?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/202401111014309_add_index_uuid_to_attachments.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/202401111014309_add_index_uuid_to_attachments.rb

diff --git a/db/migrate/202401111014309_add_index_uuid_to_attachments.rb b/db/migrate/202401111014309_add_index_uuid_to_attachments.rb
new file mode 100644
index 00000000..8635dbd4
--- /dev/null
+++ b/db/migrate/202401111014309_add_index_uuid_to_attachments.rb
@@ -0,0 +1,5 @@
+class AddIndexUuidToAttachments < ActiveRecord::Migration[5.2]
+  def change
+    add_index :attachments, :uuid
+  end
+end

From 1e159ec1cfa30246feeaf007728e63499bfc01cb Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Thu, 11 Jan 2024 14:18:53 +0800
Subject: [PATCH 070/130] =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=A1=A8uuid?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/202401111014309_add_index_uuid_to_attachments.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/202401111014309_add_index_uuid_to_attachments.rb

diff --git a/db/migrate/202401111014309_add_index_uuid_to_attachments.rb b/db/migrate/202401111014309_add_index_uuid_to_attachments.rb
new file mode 100644
index 00000000..8635dbd4
--- /dev/null
+++ b/db/migrate/202401111014309_add_index_uuid_to_attachments.rb
@@ -0,0 +1,5 @@
+class AddIndexUuidToAttachments < ActiveRecord::Migration[5.2]
+  def change
+    add_index :attachments, :uuid
+  end
+end

From e2374676c3397a75aaf5dabd0143f5feff395fe8 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 15 Jan 2024 11:23:59 +0800
Subject: [PATCH 071/130] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=99=BE=E5=BA=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E5=A4=A9=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/dashboards_controller.rb           |  57 ++++-
 app/jobs/daily_platform_statistics_job.rb     |  44 ++++
 app/models/daily_platform_statistic.rb        |  24 ++
 app/services/baidu/tongji_service.rb          | 221 ++++++++++++++++++
 .../admins/dashboards/_baidu_tongji.html.erb  |  50 ++++
 .../dashboards/_baidu_tongji_api.html.erb     |  67 ++++++
 app/views/admins/dashboards/index.html.erb    |  30 +++
 config/routes.rb                              |   2 +
 config/sidekiq_cron.yml                       |   7 +-
 ...314370_create_daily_platform_statistics.rb |  18 ++
 spec/models/daily_platform_statistic_spec.rb  |   5 +
 11 files changed, 522 insertions(+), 3 deletions(-)
 create mode 100644 app/jobs/daily_platform_statistics_job.rb
 create mode 100644 app/models/daily_platform_statistic.rb
 create mode 100644 app/services/baidu/tongji_service.rb
 create mode 100644 app/views/admins/dashboards/_baidu_tongji.html.erb
 create mode 100644 app/views/admins/dashboards/_baidu_tongji_api.html.erb
 create mode 100644 db/migrate/202401321314370_create_daily_platform_statistics.rb
 create mode 100644 spec/models/daily_platform_statistic_spec.rb

diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb
index 2c01c8bd..1e13621e 100644
--- a/app/controllers/admins/dashboards_controller.rb
+++ b/app/controllers/admins/dashboards_controller.rb
@@ -28,6 +28,41 @@ class Admins::DashboardsController < Admins::BaseController
     @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
+
+    # 总的平台用户数
+    # 总的平台项目数
+    # 总的平台组织数
+    # 总的平台Issue数、评论数、PR数、Commit数
+    @user_count = User.count
+    @project_count = Project.count
+    @organization_count = Organization.count
+    @issue_count = Issue.count
+    @comment_count = Journal.count
+    @pr_count = PullRequest.count
+    @commit_count = CommitLog.count
+
+    @subject_name = ["用户数", "项目数", "组织数", "Issue数", "Issue评论数", "PR数", "Commit数"]
+    @subject_icon = ["fa-user","fa-git", "fa-sitemap", "fa-warning", "fa-comments", "fa-share-alt", "fa-upload"]
+    @subject_data = [@user_count, @project_count, @organization_count, @issue_count, @comment_count, @pr_count, @commit_count]
+
+
+    tongji_service = Baidu::TongjiService.new
+    @access_token = tongji_service.access_token
+    Rails.logger.info "baidu_tongji_auth access_token ===== #{@access_token}"
+    # @overview_data = tongji_service.api_overview
+    last_date = DailyPlatformStatistic.order(:date).last
+    start_date = last_date.date
+    end_date = Time.now
+    if @access_token.present?
+      @overview_data = tongji_service.overview_batch_add(start_date, end_date)
+      tongji_service.source_from_batch_add(start_date, end_date)
+    end
+
+    @current_week_statistic = DailyPlatformStatistic.where(date: current_week)
+    @pre_week_statistic = DailyPlatformStatistic.where(date: pre_week)
+
+
+
   end
 
   def month_active_user
@@ -42,6 +77,19 @@ class Admins::DashboardsController < Admins::BaseController
     render_ok(data: data)
   end
 
+  def baidu_tongji
+    tongji_service = Baidu::TongjiService.new
+    redirect_to tongji_service.code_url
+  end
+
+  def baidu_tongji_auth
+    if params[:code].present?
+      tongji_service = Baidu::TongjiService.new
+      tongji_service.get_access_token(params[:code])
+    end
+    redirect_to "/admins/"
+  end
+
   def evaluate
     names = []
     data = []
@@ -63,8 +111,12 @@ class Admins::DashboardsController < Admins::BaseController
     Time.now.beginning_of_day..Time.now.end_of_day
   end
 
-  def current_week
+  def pre_7_days
     7.days.ago.end_of_day..Time.now.end_of_day
+    end
+
+  def current_week
+    Time.now.beginning_of_week..Time.now.end_of_day
   end
 
   def current_month
@@ -72,6 +124,7 @@ class Admins::DashboardsController < Admins::BaseController
   end
 
   def pre_week
-    14.days.ago.end_of_day..7.days.ago.end_of_day
+    # 14.days.ago.end_of_day..7.days.ago.end_of_day
+    Time.now.prev_week..Time.now.prev_week.end_of_week
   end
 end
\ No newline at end of file
diff --git a/app/jobs/daily_platform_statistics_job.rb b/app/jobs/daily_platform_statistics_job.rb
new file mode 100644
index 00000000..5610f304
--- /dev/null
+++ b/app/jobs/daily_platform_statistics_job.rb
@@ -0,0 +1,44 @@
+# 按天获取百度统计数据，pv，访问，ip和来源分类占比
+# 其他统计：前一周用户留存率
+class DailyPlatformStatisticsJob < ApplicationJob
+  queue_as :default
+
+  def perform(*args)
+    Rails.logger.info("*********开始统计*********")
+
+    tongji_service = Baidu::TongjiService.new
+    access_token = tongji_service.access_token
+    Rails.logger.info "job baidu_tongji_auth access_token ===== #{access_token}"
+    ActiveJob::Base.logger.info "job baidu_tongji_auth access_token ===== #{access_token}"
+    # 从最后一个记录日期开始，如果遗漏日期数据可以补充数据
+    last_date = DailyPlatformStatistic.order(:date).last
+    start_date = last_date.date
+    end_date = Time.now
+    if access_token.present?
+      tongji_service.overview_batch_add(start_date, end_date)
+
+      # 本周访问来源占比，每天记录一次，如果遗漏日期数据可以补充数据
+      tongji_service.source_from_batch_add(start_date, end_date)
+    end
+    # 周用户留存率
+    pre_week_user_ids = User.where(created_on: pre_week).pluck(:id).uniq
+    weekly_keep_user_count = User.where(id: pre_week_user_ids).where(last_login_on: current_week).count
+    weekly_keep_rate = format("%.2f", pre_week_user_ids.size > 0 ? weekly_keep_user_count.to_f / pre_week_user_ids.size : 0)
+
+    job_date = 1.days.ago
+    daily_statistic = DailyPlatformStatistic.find_or_initialize_by(date: job_date)
+    daily_statistic.weekly_keep_rate = weekly_keep_rate
+    daily_statistic.save
+  end
+
+  private
+
+  def current_week
+    Time.now.beginning_of_week..Time.now.end_of_day
+  end
+
+  def pre_week
+    # 7.days.ago.beginning_of_week..7.days.ago.beginning_of_week.end_of_week
+    Time.now.prev_week..Time.now.prev_week.end_of_week
+  end
+end
diff --git a/app/models/daily_platform_statistic.rb b/app/models/daily_platform_statistic.rb
new file mode 100644
index 00000000..a904d9b1
--- /dev/null
+++ b/app/models/daily_platform_statistic.rb
@@ -0,0 +1,24 @@
+# == Schema Information
+#
+# Table name: daily_platform_statistics
+#
+#  id               :integer          not null, primary key
+#  date             :date
+#  pv               :integer          default("0")
+#  visitor          :integer          default("0")
+#  ip               :integer          default("0")
+#  weekly_keep_rate :float(24)        default("0")
+#  source_through   :float(24)        default("0")
+#  source_link      :float(24)        default("0")
+#  source_search    :float(24)        default("0")
+#  source_custom    :float(24)        default("0")
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#
+# Indexes
+#
+#  index_daily_platform_statistics_on_date  (date) UNIQUE
+#
+
+class DailyPlatformStatistic < ApplicationRecord
+end
diff --git a/app/services/baidu/tongji_service.rb b/app/services/baidu/tongji_service.rb
new file mode 100644
index 00000000..8a611cd0
--- /dev/null
+++ b/app/services/baidu/tongji_service.rb
@@ -0,0 +1,221 @@
+module Baidu
+  class TongjiService < ApplicationService
+    attr_reader :client_id, :client_secret, :site_id
+    # login、code、password、password_confirmation
+    def initialize
+      @client_id      = "6dMO2kqKUaMZkBrMaUMxQSNAT49v0Mjq"
+      @client_secret  = "qvWqF33AOmGs1tPCgsROvis9EQCuNmd3"
+      @site_id = 18657013
+    end
+
+    def call
+
+    end
+
+
+    def init_overview_data_by(start_date = nil, end_date = nil)
+      start_date = Time.now.prev_year.beginning_of_year if start_date.nil?
+      end_date = Time.now
+      Rails.logger.info("*********开始百度统计-概览:#{start_date}-#{end_date}*********")
+      sql_connection = ActiveRecord::Base.connection
+      sql_connection.begin_db_transaction
+
+      # 如果存在数据 先清空
+      # sql_connection.execute("delete from daily_platform_statistics where date between '#{start_date}' and '#{end_date}'")
+      multiple_days_data = overview_multiple_days_data(start_date, end_date)
+      if multiple_days_data.present?
+        sql = "replace into daily_platform_statistics (date,pv,visitor,ip,created_at,updated_at) values #{multiple_days_data.join(",")}"
+        sql_connection.execute(sql)
+      end
+      sql_connection.commit_db_transaction
+      Rails.logger.info("*********结束百度统计-概览:#{start_date}-#{end_date}*********")
+    end
+
+    def init_source_from_data_by(start_date = nil, end_date = nil)
+      start_date = Time.now.prev_year.beginning_of_year if start_date.nil?
+      end_date = Time.now
+      Rails.logger.info("*********开始百度统计-来源:#{start_date}-#{end_date}*********")
+      source_from_batch_add(start_date, end_date)
+      Rails.logger.info("*********结束百度统计-来源:#{start_date}-#{end_date}*********")
+    end
+
+    # 按日期获取来源数据
+    def source_from_batch_add(start_date,end_date)
+      # 补充更新开始时间的当天数据
+      source_from_by_date(start_date)
+      diff_days(start_date, end_date).times.each do |t|
+        new_start_date = start_date + (t + 1).days
+        source_from_by_date(new_start_date)
+      end
+      # 补充更新最后时间一天数据
+      source_from_by_date(end_date)
+    end
+
+    # 按天获取来源数据
+    def source_from_by_date(start_date)
+      return [] unless access_token.present? && start_date.present?
+      source_from_data = api("source/all/a", start_date, start_date, "pv_count,visitor_count,ip_count")
+      source_from = []
+      source_from_data['items'][1].each_with_index do |source, index|
+        source_from.push(((source[0].to_f / source_from_data['sum'][0][0].to_f) * 100).round(2))
+      end
+      daily_statistic = DailyPlatformStatistic.find_or_initialize_by(date: start_date)
+      daily_statistic.source_through = source_from[0]
+      daily_statistic.source_link = source_from[1]
+      daily_statistic.source_search = source_from[2]
+      daily_statistic.source_custom = source_from[3]
+      daily_statistic.save
+    end
+
+    def diff_days(start_date, end_date)
+      (end_date.beginning_of_day.to_i - start_date.beginning_of_day.to_i) / (24 * 3600)
+    end
+
+    def overview_batch_add(start_date, end_date)
+      return [] unless access_token.present? && start_date.present? && end_date.present?
+      start_date = Time.now - 1.days if start_date.strftime("%Y%m%d") == end_date.strftime("%Y%m%d")
+      overview_data = api("overview/getTimeTrendRpt", start_date, end_date, "pv_count,visitor_count,ip_count")
+      overview_data['items'][0].each_with_index do |date, index|
+        pv = overview_data['items'][1][index][0]
+        visitor = overview_data['items'][1][index][1]
+        ip = overview_data['items'][1][index][2]
+        job_date = date[0].to_s.gsub("/", "-")
+        daily_statistic = DailyPlatformStatistic.find_or_initialize_by(date: job_date)
+        daily_statistic.date = job_date
+        daily_statistic.pv = pv
+        daily_statistic.visitor = visitor
+        daily_statistic.ip = ip
+        daily_statistic.save
+      end
+      overview_data
+    end
+
+    def overview_multiple_days_data(start_date, end_date)
+      return [] unless access_token.present? && start_date.present? && end_date.present?
+      overview_data = api("overview/getTimeTrendRpt", start_date, end_date, "pv_count,visitor_count,ip_count")
+      data = []
+      created_at = Time.now.strftime("%Y-%m-%d 00:00:00")
+      overview_data['items'][0].each_with_index do |date, index|
+        pv = overview_data['items'][1][index][0]
+        visitor = overview_data['items'][1][index][1]
+        ip = overview_data['items'][1][index][2]
+        data.push("('#{date[0].to_s.gsub("/", "-")}', #{pv.to_s.gsub("--","0")}, #{visitor.to_s.gsub("--","0")}, #{ip.to_s.gsub("--","0")},\"#{created_at}\",\"#{created_at}\")")
+      end
+      data
+    end
+
+    def code_url
+      "http://openapi.baidu.com/oauth/2.0/authorize?response_type=code&client_id=#{client_id}&redirect_uri=oob&scope=basic&display=popup"
+    end
+
+    def oauth_url(code)
+      "http://openapi.baidu.com/oauth/2.0/token?grant_type=authorization_code&code=#{code}&client_id=#{client_id}&client_secret=#{client_secret}&redirect_uri=oob"
+    end
+
+    def get_access_token(code)
+      uri = URI.parse(oauth_url(code))
+      response = Net::HTTP.get_response(uri)
+      Rails.logger.info "baidu_tongji_auth response.body ===== #{response.body}"
+      if response.code.to_i == 200
+        data = JSON.parse(response.body)
+        access_token = data['access_token']
+        refresh_token = data['refresh_token']
+        expires_in = data['expires_in']
+        if access_token.present?
+          Rails.cache.write("baidu_tongji_auth/access_token", access_token, expires_in: expires_in)
+          Rails.cache.write("baidu_tongji_auth/refresh_token", refresh_token, expires_in: 1.year)
+        end
+      end
+    end
+
+    def refresh_access_token
+      url = "http://openapi.baidu.com/oauth/2.0/token?grant_type=refresh_token&refresh_token=#{refresh_token}&client_id=#{client_id}&client_secret=#{client_secret}"
+      uri = URI.parse(url)
+      response = Net::HTTP.get_response(uri)
+      Rails.logger.info "baidu_tongji_auth response.body ===== #{response.body}"
+      if response.code.to_i == 200
+        data = JSON.parse(response.body)
+        access_token = data['access_token']
+        refresh_token = data['refresh_token']
+        expires_in = data['expires_in']
+        if access_token.present?
+          Rails.cache.write("baidu_tongji_auth/access_token", access_token, expires_in: expires_in)
+          Rails.cache.write("baidu_tongji_auth/refresh_token", refresh_token, expires_in: 1.year)
+        end
+      end
+    end
+
+    def access_token
+      access_token = Rails.cache.read("baidu_tongji_auth/access_token")
+      if access_token.blank?
+        refresh_access_token
+        access_token = Rails.cache.read("baidu_tongji_auth/access_token")
+      end
+      access_token
+    end
+
+    def refresh_token
+      refresh_token = Rails.cache.read("baidu_tongji_auth/refresh_token")
+      # 如果刷新token失效，access_token也重置
+      if refresh_token.blank?
+        Rails.cache.delete("baidu_tongji_auth/access_token")
+      end
+      refresh_token
+    end
+
+    # 网站概况(趋势数据)
+    def api_overview
+      start_date = Time.now.beginning_of_week
+      end_date = Time.now
+      start_date = Time.now - 1.days if start_date.strftime("%Y%m%d") == end_date.strftime("%Y%m%d")
+      api("overview/getTimeTrendRpt", start_date, end_date, "pv_count,visitor_count,ip_count")
+    end
+
+    # 网站概况(来源网站、搜索词、入口页面、受访页面)
+    def api_overview_getCommonTrackRpt
+      start_date = Time.now.beginning_of_week
+      end_date = Time.now
+      api("overview/getCommonTrackRpt", start_date, end_date, "pv_count")
+    end
+
+    # 全部来源
+    def source_from
+      start_date = Time.now.beginning_of_week
+      end_date = Time.now
+      api("source/all/a", start_date, end_date, "pv_count,visitor_count,ip_count")
+    end
+
+    def api(api_method, start_date, end_date, metrics = nil)
+      start_date_fmt = start_date.strftime("%Y%m%d")
+      end_date_fmt = end_date.strftime("%Y%m%d")
+      api_url = "https://openapi.baidu.com/rest/2.0/tongji/report/getData?access_token=#{access_token}&site_id=#{site_id}&method=#{api_method}&start_date=#{start_date_fmt}&end_date=#{end_date_fmt}&metrics=#{metrics}"
+      data = url_http_post(api_url, {})
+      data['result']
+    end
+
+    def url_http_post(api_url, params)
+      Rails.logger.info "api_url==#{api_url}"
+      uri = URI.parse(api_url)
+      http = Net::HTTP.new uri.host, uri.port
+      http.open_timeout = 60
+      http.read_timeout = 60
+      if uri.scheme == 'https'
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http.use_ssl = true
+      end
+      begin
+        request = Net::HTTP::Post.new(uri)
+        request.set_form_data(params) if params.present?
+        request['Content-Type'] = 'application/json;charset=utf-8'
+        # request['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'
+        response = http.start { |http| http.request(request) }
+        Rails.logger.info "api response.body==#{response.body}"
+        JSON.parse response.body
+      rescue => err
+        Rails.logger.error("#############api_url:#{api_url},error:#{err.message.size}")
+        # Rails.logger.error("#############api_url:#{api_url},error:#{err.message}")
+        return {}
+      end
+    end
+  end
+end
diff --git a/app/views/admins/dashboards/_baidu_tongji.html.erb b/app/views/admins/dashboards/_baidu_tongji.html.erb
new file mode 100644
index 00000000..c59e1aca
--- /dev/null
+++ b/app/views/admins/dashboards/_baidu_tongji.html.erb
@@ -0,0 +1,50 @@
+<div>
+  数据来源百度统计，本周 [<%= @current_week_statistic.first&.date %> / <%= @current_week_statistic.last&.date %>]
+</div>
+<table class="table table-hover text-center subject-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="20%">日期</th>
+    <th width="15%">访问量</th>
+    <th width="15%">访客数</th>
+    <th width="15%">IP数</th>
+    <th width="15%">直接访问占比</th>
+    <th width="15%">外部链接占比</th>
+    <th width="15%">搜索引擎占比</th>
+    <th width="20%">自定义</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% @current_week_statistic.each_with_index do |week, index| %>
+    <tr class="">
+      <td><%= week.date %> </td>
+      <td><%= week.pv %></td>
+      <td><%= week.visitor %></td>
+      <td><%= week.ip %></td>
+      <td><%= week.source_through %>%</td>
+      <td><%= week.source_link %>%</td>
+      <td><%= week.source_search %>%</td>
+      <td><%= week.source_custom.to_f %>%</td>
+      </td>
+    </tr>
+  <% end %>
+<!--  <tr class="">-->
+<!--    <td><span style="color: #ff8200">合计</span></td>-->
+<!--    <td><span style="color: #ff8200"><%#= @current_week_statistic.sum(:pv) %></span></td>-->
+<!--    <td><span style="color: #ff8200"><%#= @current_week_statistic.sum(:visitor) %></span></td>-->
+<!--    <td><span style="color: #ff8200"><%#= @current_week_statistic.sum(:ip) %></span></td>-->
+<!--    </td>-->
+<!--  </tr>-->
+  </tbody>
+</table>
+
+
+<% unless @access_token.present? && @overview_data.present? %>
+  <div>
+    <a href="/admins/baidu_tongji" target="_blank">1.百度统计需人工授权,点击去授权</a>
+  </div>
+  <div>
+    <a href="/admins/baidu_tongji_auth" onclick="this.href = '/admins/baidu_tongji_auth?code=' + document.getElementById('auth_code').value">2.获取百度统计授权码</a>
+    <input name="code" id="auth_code" style="width: 380px" placeholder="请输入1.百度统计返回的code后，点击2.获取百度统计Token"/>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admins/dashboards/_baidu_tongji_api.html.erb b/app/views/admins/dashboards/_baidu_tongji_api.html.erb
new file mode 100644
index 00000000..3a18dc40
--- /dev/null
+++ b/app/views/admins/dashboards/_baidu_tongji_api.html.erb
@@ -0,0 +1,67 @@
+<% if @access_token.present? && @overview_data.present? %>
+  <div>
+    数据来源百度统计，本周 <%= @overview_data['timeSpan'] %>
+  </div>
+  <table class="table table-hover text-center subject-list-table">
+    <thead class="thead-light">
+    <tr>
+      <th width="20%">日期</th>
+      <th width="15%">访问量</th>
+      <th width="15%">访客数</th>
+      <th width="15%">IP数</th>
+    </tr>
+    </thead>
+    <tbody>
+    <% pv_count = [] %>
+    <% visitor_count = [] %>
+    <% ip_count = [] %>
+    <% @overview_data['items'][0].each_with_index do |date, index| %>
+      <% pv = @overview_data['items'][1][index][0] %>
+      <% visitor = @overview_data['items'][1][index][1] %>
+      <% ip = @overview_data['items'][1][index][2] %>
+      <tr class="">
+        <td><%= date[0] %> </td>
+        <td><%= pv %></td>
+        <td><%= visitor %></td>
+        <td><%= ip %></td>
+        </td>
+      </tr>
+      <% pv_count.push(pv) %>
+      <% visitor_count.push(visitor) %>
+      <% ip_count.push(ip) %>
+    <% end %>
+    <tr class="">
+      <td><span style="color: #ff8200">合计</span></td>
+      <td><span style="color: #ff8200"><%= pv_count %></span></td>
+      <td><span style="color: #ff8200"><%= visitor_count %></span></td>
+      <td><span style="color: #ff8200"><%= ip_count %></span></td>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+  <table class="table table-hover text-center subject-list-table">
+    <thead class="thead-light">
+    <tr>
+      <th width="15%">直接访问占比</th>
+      <th width="15%">外部链接占比</th>
+      <th width="15%">搜索引擎占比</th>
+      <th width="20%">自定义</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr class="">
+      <% @source_from_data['items'][1].each_with_index do |source, index| %>
+        <td><%= ((source[0].to_f / @source_from_data['sum'][0][0].to_f) * 100).round(2).to_s %>%</td>
+      <% end %>
+    </tr>
+    </tbody>
+  </table>
+<% else %>
+  <div>
+    <a href="/admins/baidu_tongji" target="_blank">1.百度统计需人工授权,点击去授权</a>
+  </div>
+  <div>
+    <a href="/admins/baidu_tongji_auth" onclick="this.href = '/admins/baidu_tongji_auth?code=' + document.getElementById('auth_code').value">2.获取百度统计授权码</a>
+    <input name="code" id="auth_code" style="width: 380px" placeholder="请输入1.百度统计返回的code后，点击2.获取百度统计Token"/>
+  </div>
+<% 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 2d86b4b6..35593f16 100644
--- a/app/views/admins/dashboards/index.html.erb
+++ b/app/views/admins/dashboards/index.html.erb
@@ -1,6 +1,35 @@
 <% define_admin_breadcrumbs do %>
   <% 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">
+        <%@subject_name.each_with_index do |subject, index| %>
+          <div class="col-xl-3 col-lg-6" style="padding-bottom: 15px;">
+            <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-uppercase11 text-muted mb-0"><%=subject %></h5>
+                    <span class="h2 font-weight-bold mb-0"><%= @subject_data[index] %></span>
+                  </div>
+                  <div class="col-auto">
+                    <div class="icon icon-shape rounded-circle shadow">
+                      <i class="fa <%=@subject_icon[index] %>"></i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        <% end %>
+
+      </div>
+    </div>
+  </div>
+</div>
 
 <div class="box admin-list-container project-language-list-container">
   <table class="table table-hover text-center subject-list-table">
@@ -53,6 +82,7 @@
     </tr>
     </tbody>
   </table>
+  <%= render partial: 'admins/dashboards/baidu_tongji' %>
 </div>
 <div id="project-language-modals">
 </div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 7694a77c..6138028d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -795,6 +795,8 @@ Rails.application.routes.draw do
   namespace :admins do
     mount Sidekiq::Web => '/sidekiq'
     get '/', to: 'dashboards#index'
+    get '/baidu_tongji', to: 'dashboards#baidu_tongji'
+    get '/baidu_tongji_auth', to: 'dashboards#baidu_tongji_auth'
     namespace :topic do
       resources :activity_forums
       resources :banners
diff --git a/config/sidekiq_cron.yml b/config/sidekiq_cron.yml
index 0ec8f997..21b8f05f 100644
--- a/config/sidekiq_cron.yml
+++ b/config/sidekiq_cron.yml
@@ -11,4 +11,9 @@ delay_expired_issue:
 create_daily_project_statistics:
   cron: "0 1 * * *"
   class: "DailyProjectStatisticsJob"
-  queue: cache
\ No newline at end of file
+  queue: cache
+
+daily_platform_statistics:
+  cron: "0 1 * * *"
+  class: "DailyPlatformStatisticsJob"
+  queue: default
\ No newline at end of file
diff --git a/db/migrate/202401321314370_create_daily_platform_statistics.rb b/db/migrate/202401321314370_create_daily_platform_statistics.rb
new file mode 100644
index 00000000..d658979c
--- /dev/null
+++ b/db/migrate/202401321314370_create_daily_platform_statistics.rb
@@ -0,0 +1,18 @@
+class CreateDailyPlatformStatistics < ActiveRecord::Migration[5.2]
+  def change
+    create_table :daily_platform_statistics do |t|
+      t.date :date
+      t.index :date, unique: true
+      t.bigint :pv, default: 0
+      t.bigint :visitor, default: 0
+      t.bigint :ip, default: 0
+      t.float :weekly_keep_rate, default: 0
+      t.float :source_through, default: 0
+      t.float :source_link, default: 0
+      t.float :source_search, default: 0
+      t.float :source_custom, default: 0
+
+      t.timestamps
+    end
+  end
+end
diff --git a/spec/models/daily_platform_statistic_spec.rb b/spec/models/daily_platform_statistic_spec.rb
new file mode 100644
index 00000000..0f6d5fcd
--- /dev/null
+++ b/spec/models/daily_platform_statistic_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe DailyPlatformStatistic, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 7d813c0ebe7f0d2a7f2db4d5ad36f659d29f5890 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 15 Jan 2024 16:41:54 +0800
Subject: [PATCH 072/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BC=93=E5=AD=98=E5=8A=A0=E5=85=A5=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?issue=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb                              | 13 ++++++++++++-
 app/services/cache/v2/project_common_service.rb  | 16 +++++++++++++++-
 .../cache/v2/project_date_rank_service.rb        |  6 +++++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index f96bac8f..b580d699 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -99,9 +99,20 @@ class Issue < ApplicationRecord
   scope :closed, ->{where(status_id: 5)}
   scope :opened, ->{where.not(status_id: 5)}
   after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
-  after_save :change_versions_count, :send_update_message_to_notice_system, :associate_attachment_container
+  after_save :incre_or_decre_closed_issues_count, :change_versions_count, :send_update_message_to_notice_system, :associate_attachment_container
   after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic
 
+  def incre_or_decre_closed_issues_count
+    if previous_changes[:status_id].present? 
+      if previous_changes[:status_id][1] == 5
+        CacheAsyncSetJob.perform_later("project_common_service", {closed_issues: 1}, self.project_id)
+      end
+      if previous_changes[:status_id][0] == 5
+        CacheAsyncSetJob.perform_later("project_common_service", {closed_issues: -1}, self.project_id)
+      end
+    end
+  end
+
   def incre_project_common
     CacheAsyncSetJob.perform_later("project_common_service", {issues: 1}, self.project_id)
   end
diff --git a/app/services/cache/v2/project_common_service.rb b/app/services/cache/v2/project_common_service.rb
index 0d167c2a..1e85f3e0 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, :commits
+  attr_reader :project_id, :owner_id, :name, :identifier, :description, :visits, :watchers, :praises, :forks, :issues, :closed_issues, :pullrequests, :commits
   attr_accessor :project
 
   def initialize(project_id, params={})
@@ -13,6 +13,7 @@ class Cache::V2::ProjectCommonService < ApplicationService
     @praises = params[:praises]
     @forks = params[:forks]
     @issues = params[:issues]
+    @closed_issues = params[:closed_issues]
     @pullrequests = params[:pullrequests]
     @commits = params[:commits]
   end
@@ -78,6 +79,10 @@ class Cache::V2::ProjectCommonService < ApplicationService
     "issues"
   end
 
+  def closed_issues_key 
+    "closed_issues"
+  end
+
   def pullrequests_key 
     "pullrequests"
   end
@@ -151,6 +156,10 @@ class Cache::V2::ProjectCommonService < ApplicationService
         Cache::V2::ProjectRankService.call(@project_id, {issues: @issues})
         Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {issues: @issues})
       end
+      if @closed_issues.present? 
+        $redis_cache.hincrby(project_common_key, closed_issues_key, @closed_issues)
+        Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {closed_issues: @closed_issues})
+      end
       if @pullrequests.present?
         $redis_cache.hincrby(project_common_key, pullrequests_key, @pullrequests) 
         Cache::V2::ProjectRankService.call(@project_id, {pullrequests: @pullrequests})
@@ -202,6 +211,10 @@ class Cache::V2::ProjectCommonService < ApplicationService
     $redis_cache.hset(project_common_key, issues_key, Issue.issue_issue.where(project_id: @project_id).count)
   end
 
+  def reset_project_closed_issues 
+    $redis_cache.hset(project_common_key, closed_issues_key, Issue.issue_issue.closed.where(project_id: @project_id).count)
+  end
+
   def reset_project_pullrequests
     $redis_cache.hset(project_common_key, pullrequests_key, PullRequest.where(project_id: @project_id).count)
   end
@@ -224,6 +237,7 @@ class Cache::V2::ProjectCommonService < ApplicationService
     reset_project_praises
     reset_project_forks
     reset_project_issues
+    reset_project_closed_issues
     reset_project_pullrequests
     reset_project_commits
 
diff --git a/app/services/cache/v2/project_date_rank_service.rb b/app/services/cache/v2/project_date_rank_service.rb
index 9df69bbb..bf661f0a 100644
--- a/app/services/cache/v2/project_date_rank_service.rb
+++ b/app/services/cache/v2/project_date_rank_service.rb
@@ -1,6 +1,6 @@
 # 项目日活跃度计算存储
 class Cache::V2::ProjectDateRankService < ApplicationService 
-  attr_reader :project_id, :rank_date, :visits, :praises, :forks, :issues, :pullrequests, :commits
+  attr_reader :project_id, :rank_date, :visits, :praises, :forks, :issues, :closed_issues, :pullrequests, :commits
   attr_accessor :project_common
 
   def initialize(project_id, rank_date=Date.today, params={})
@@ -11,6 +11,7 @@ class Cache::V2::ProjectDateRankService < ApplicationService
     @praises = params[:praises]
     @forks = params[:forks]
     @issues = params[:issues]
+    @closed_issues = params[:closed_issues]
     @pullrequests = params[:pullrequests]
     @commits = params[:commits]
   end
@@ -57,6 +58,9 @@ class Cache::V2::ProjectDateRankService < ApplicationService
       $redis_cache.zincrby(project_rank_key, @issues.to_i * 5, @project_id) 
       $redis_cache.hincrby(project_rank_statistic_key, "issues", @issues.to_i) 
     end
+    if @closed_issues.present? 
+      $redis_cache.hincrby(project_rank_statistic_key, "closed_issues", @closed_issues.to_i) 
+    end
     if @pullrequests.present?
       $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) 
       $redis_cache.hincrby(project_rank_statistic_key, "pullrequests", @pullrequests.to_i) 

From 1c8811fda63db7176746e3af6f4815c08c5a6125 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 16 Jan 2024 10:19:02 +0800
Subject: [PATCH 073/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=96=91=E4=BF=AE=E6=8E=92=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/issues_rank_controller.rb          | 29 +++++++++++++++
 app/jobs/daily_project_statistics_job.rb      |  2 +
 app/models/daily_project_statistic.rb         | 26 +++++++------
 app/views/admins/issues_rank/index.html.erb   | 37 +++++++++++++++++++
 app/views/admins/issues_rank/index.js.erb     |  1 +
 .../issues_rank/shared/_data_list.html.erb    | 26 +++++++++++++
 app/views/admins/shared/_sidebar.html.erb     |  1 +
 config/routes.rb                              |  1 +
 ...osed_issues_to_daily_project_statistics.rb |  5 +++
 9 files changed, 116 insertions(+), 12 deletions(-)
 create mode 100644 app/controllers/admins/issues_rank_controller.rb
 create mode 100644 app/views/admins/issues_rank/index.html.erb
 create mode 100644 app/views/admins/issues_rank/index.js.erb
 create mode 100644 app/views/admins/issues_rank/shared/_data_list.html.erb
 create mode 100644 db/migrate/202401321314371_add_closed_issues_to_daily_project_statistics.rb

diff --git a/app/controllers/admins/issues_rank_controller.rb b/app/controllers/admins/issues_rank_controller.rb
new file mode 100644
index 00000000..530678ad
--- /dev/null
+++ b/app/controllers/admins/issues_rank_controller.rb
@@ -0,0 +1,29 @@
+class Admins::IssuesRankController < Admins::BaseController
+
+  def index 
+    @statistics = DailyProjectStatistic.where('date >= ? AND date <= ?', begin_date, end_date)
+    @statistics = @statistics.group(:project_id).joins(:project).select("project_id,
+                                                                         sum(issues) as issues,
+                                                                         sum(closed_issues) as closed_issues,
+                                                                         projects.issues_count as issues_count")
+    @statistics = @statistics.order("#{sort_by} #{sort_direction}").limit(50)
+  end
+
+  private 
+  def begin_date 
+    params.fetch(:begin_date, (Date.today-7.days).to_s)
+  end
+
+  def end_date 
+    params.fetch(:end_date, Date.today.to_s)
+  end
+
+  def sort_by
+    DailyProjectStatistic.column_names.include?(params.fetch(:sort_by, "issues")) ? params.fetch(:sort_by, "issues") : "issues"
+  end
+
+  def sort_direction
+    %w(desc asc).include?(params.fetch(:sort_direction, "desc")) ? params.fetch(:sort_direction, "desc") : "desc"
+  end
+
+end
\ No newline at end of file
diff --git a/app/jobs/daily_project_statistics_job.rb b/app/jobs/daily_project_statistics_job.rb
index ad606f13..3672d192 100644
--- a/app/jobs/daily_project_statistics_job.rb
+++ b/app/jobs/daily_project_statistics_job.rb
@@ -13,6 +13,7 @@ class DailyProjectStatisticsJob < ApplicationJob
       praises = result["praises"].to_i
       forks = result["forks"].to_i 
       issues = result["issues"].to_i 
+      closed_issues = result["closed_issues"].to_i
       pullrequests = result["pullrequests"].to_i 
       commits = result["commits"].to_i 
       score = visits *1 + watchers *5 + praises * 5 + forks * 10 + issues *5 + pullrequests * 10 + commits * 5 
@@ -25,6 +26,7 @@ class DailyProjectStatisticsJob < ApplicationJob
         praises: praises,
         forks: forks, 
         issues: issues,
+        closed_issues: closed_issues,
         pullrequests: pullrequests,
         commits: commits
       )
diff --git a/app/models/daily_project_statistic.rb b/app/models/daily_project_statistic.rb
index f7fc0aad..ffe51bdb 100644
--- a/app/models/daily_project_statistic.rb
+++ b/app/models/daily_project_statistic.rb
@@ -2,18 +2,20 @@
 #
 # Table name: daily_project_statistics
 #
-#  id           :integer          not null, primary key
-#  project_id   :integer
-#  date         :string(255)
-#  visits       :integer          default("0")
-#  watchers     :integer          default("0")
-#  praises      :integer          default("0")
-#  forks        :integer          default("0")
-#  issues       :integer          default("0")
-#  pullrequests :integer          default("0")
-#  commits      :integer          default("0")
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  id            :integer          not null, primary key
+#  project_id    :integer
+#  date          :date
+#  score         :integer          default("0")
+#  visits        :integer          default("0")
+#  watchers      :integer          default("0")
+#  praises       :integer          default("0")
+#  forks         :integer          default("0")
+#  issues        :integer          default("0")
+#  pullrequests  :integer          default("0")
+#  commits       :integer          default("0")
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  closed_issues :integer          default("0")
 #
 # Indexes
 #
diff --git a/app/views/admins/issues_rank/index.html.erb b/app/views/admins/issues_rank/index.html.erb
new file mode 100644
index 00000000..b5207696
--- /dev/null
+++ b/app/views/admins/issues_rank/index.html.erb
@@ -0,0 +1,37 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('项目排行榜', admins_path) %>
+<% end %>
+
+
+<div class="box search-form-container user-list-form">
+  <%= form_tag(admins_issues_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'issue-rank-date-form') do %>
+    <div class="input-group">
+      <span class="input-group-text">开始日期</span>
+      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.today - 7.days).to_s%>" aria-label="选择日期">
+    </div>
+    <div class="input-group">
+      <span class="input-group-text">截止日期</span>
+      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.today.to_s%>" aria-label="选择日期">
+    </div>
+  <% end %>
+</div>
+
+<div class="box admin-list-container issue-rank-list-container">
+  <%= render partial: 'admins/issues_rank/shared/data_list', locals: { statistics: @statistics } %>
+</div>
+<script>
+  $(".datetimepicker").on('change', function() {
+    $("#issue-rank-date-form").submit()
+  });
+  $(".datetimepicker").on('change', function() {
+    $("#issue-rank-date-form").submit()
+  });
+  $('.datetimepicker').datetimepicker({
+    language: 'zh-CN', // 中文语言包
+    autoclose: 1, // 选中日期后自动关闭
+    format: 'yyyy-mm-dd', // 日期格式
+    minView: "month", // 最小日期显示单元，这里最小显示月份界面，即可以选择到日
+    todayBtn: 1, // 显示今天按钮
+    todayHighlight: 1, // 显示今天高亮
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/admins/issues_rank/index.js.erb b/app/views/admins/issues_rank/index.js.erb
new file mode 100644
index 00000000..189206df
--- /dev/null
+++ b/app/views/admins/issues_rank/index.js.erb
@@ -0,0 +1 @@
+$('.issue-rank-list-container').html("<%= j( render partial: 'admins/issues_rank/shared/data_list', locals: { statistics: @statistics } ) %>");
\ No newline at end of file
diff --git a/app/views/admins/issues_rank/shared/_data_list.html.erb b/app/views/admins/issues_rank/shared/_data_list.html.erb
new file mode 100644
index 00000000..8e906834
--- /dev/null
+++ b/app/views/admins/issues_rank/shared/_data_list.html.erb
@@ -0,0 +1,26 @@
+<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%">关闭疑修数</th>
+      <th width="20%">当前疑修数量</th>
+    </tr>
+    </thead>
+    <tbody>
+      <% statistics.each_with_index do |item, index| %>
+        <tr class="">
+          <td><%= index + 1%></td>
+          <td>
+            <a target="_blank" href="<%= "/#{item&.project&.owner&.login}/#{item&.project&.identifier}"%>">
+              <%= "#{item&.project&.owner&.real_name}/#{item&.project&.name}" %>
+            </a>
+          </td>
+          <td><%= item&.issues %></td>
+          <td><%= item&.closed_issues %></td>
+          <td><%= item&.issues_count %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
\ 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 4db54507..ac09e373 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -81,6 +81,7 @@
       <%= sidebar_item_group('#rank-submenu', '活跃度排行', icon: 'calendar') do %>
         <li><%= sidebar_item(admins_users_rank_index_path, '用户活跃度排行', icon: 'user', controller: 'admins-users_rank') %></li>
         <li><%= sidebar_item(admins_projects_rank_index_path, '项目活跃度排行', icon: 'database', controller: 'admins-projects_rank') %></li>
+        <li><%= sidebar_item(admins_issues_rank_index_path, '疑修活跃度排行', icon: 'database', controller: 'admins-issues_rank') %></li>
       <% end %>
     </li>
 
diff --git a/config/routes.rb b/config/routes.rb
index 6138028d..a165a3d1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -822,6 +822,7 @@ Rails.application.routes.draw do
     resources :identity_verifications
     resources :site_pages
     resources :page_themes
+    resources :issues_rank, only: [:index]
     resources :projects_rank, only: [:index]
     resources :sites
     resources :edu_settings
diff --git a/db/migrate/202401321314371_add_closed_issues_to_daily_project_statistics.rb b/db/migrate/202401321314371_add_closed_issues_to_daily_project_statistics.rb
new file mode 100644
index 00000000..2b38b18b
--- /dev/null
+++ b/db/migrate/202401321314371_add_closed_issues_to_daily_project_statistics.rb
@@ -0,0 +1,5 @@
+class AddClosedIssuesToDailyProjectStatistics < ActiveRecord::Migration[5.2]
+  def change
+    add_column :daily_project_statistics, :closed_issues, :integer, default: 0
+  end
+end

From ed81ce592748f038e4ad0c806709b6897834aac6 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 16 Jan 2024 16:27:18 +0800
Subject: [PATCH 074/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=B4=BB?=
 =?UTF-8?q?=E8=B7=83=E5=BA=A6=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4=E5=8C=BA?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/issues_rank_controller.rb        | 4 ++--
 app/controllers/admins/projects_rank_controller.rb      | 4 ++--
 app/views/admins/issues_rank/index.html.erb             | 4 ++--
 app/views/admins/issues_rank/shared/_data_list.html.erb | 2 +-
 app/views/admins/projects_rank/index.html.erb           | 4 ++--
 app/views/admins/shared/_sidebar.html.erb               | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/admins/issues_rank_controller.rb b/app/controllers/admins/issues_rank_controller.rb
index 530678ad..79450fbf 100644
--- a/app/controllers/admins/issues_rank_controller.rb
+++ b/app/controllers/admins/issues_rank_controller.rb
@@ -11,11 +11,11 @@ class Admins::IssuesRankController < Admins::BaseController
 
   private 
   def begin_date 
-    params.fetch(:begin_date, (Date.today-7.days).to_s)
+    params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
   end
 
   def end_date 
-    params.fetch(:end_date, Date.today.to_s)
+    params.fetch(:end_date, Date.yesterday.to_s)
   end
 
   def sort_by
diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb
index e4d8046e..8db0961b 100644
--- a/app/controllers/admins/projects_rank_controller.rb
+++ b/app/controllers/admins/projects_rank_controller.rb
@@ -17,11 +17,11 @@ class Admins::ProjectsRankController < Admins::BaseController
   private 
 
   def begin_date 
-    params.fetch(:begin_date, (Date.today-7.days).to_s)
+    params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
   end
 
   def end_date 
-    params.fetch(:end_date, Date.today.to_s)
+    params.fetch(:end_date, Date.yesterday.to_s)
   end
 
   def sort_by
diff --git a/app/views/admins/issues_rank/index.html.erb b/app/views/admins/issues_rank/index.html.erb
index b5207696..4fc56ada 100644
--- a/app/views/admins/issues_rank/index.html.erb
+++ b/app/views/admins/issues_rank/index.html.erb
@@ -7,11 +7,11 @@
   <%= form_tag(admins_issues_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'issue-rank-date-form') do %>
     <div class="input-group">
       <span class="input-group-text">开始日期</span>
-      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.today - 7.days).to_s%>" aria-label="选择日期">
+      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.yesterday - 7.days).to_s%>" aria-label="选择日期">
     </div>
     <div class="input-group">
       <span class="input-group-text">截止日期</span>
-      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.today.to_s%>" aria-label="选择日期">
+      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.yesterday.to_s%>" aria-label="选择日期">
     </div>
   <% end %>
 </div>
diff --git a/app/views/admins/issues_rank/shared/_data_list.html.erb b/app/views/admins/issues_rank/shared/_data_list.html.erb
index 8e906834..9512028c 100644
--- a/app/views/admins/issues_rank/shared/_data_list.html.erb
+++ b/app/views/admins/issues_rank/shared/_data_list.html.erb
@@ -19,7 +19,7 @@
           </td>
           <td><%= item&.issues %></td>
           <td><%= item&.closed_issues %></td>
-          <td><%= item&.issues_count %></td>
+          <td><%= item&.project&.issues&.issue_issue.count %></td>
         </tr>
       <% end %>
     </tbody>
diff --git a/app/views/admins/projects_rank/index.html.erb b/app/views/admins/projects_rank/index.html.erb
index e8f334f0..2e33a533 100644
--- a/app/views/admins/projects_rank/index.html.erb
+++ b/app/views/admins/projects_rank/index.html.erb
@@ -7,11 +7,11 @@
   <%= form_tag(admins_projects_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-rank-date-form') do %>
     <div class="input-group">
       <span class="input-group-text">开始日期</span>
-      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.today - 7.days).to_s%>" aria-label="选择日期">
+      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.yesterday - 7.days).to_s%>" aria-label="选择日期">
     </div>
     <div class="input-group">
       <span class="input-group-text">截止日期</span>
-      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.today.to_s%>" aria-label="选择日期">
+      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.yesterday.to_s%>" aria-label="选择日期">
     </div>
   <% end %>
   <%= link_to '导出', "/项目活跃度排行.xls", class: 'btn btn-primary mr-3' %>    
diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index ac09e373..f9bf9ae4 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -81,7 +81,7 @@
       <%= sidebar_item_group('#rank-submenu', '活跃度排行', icon: 'calendar') do %>
         <li><%= sidebar_item(admins_users_rank_index_path, '用户活跃度排行', icon: 'user', controller: 'admins-users_rank') %></li>
         <li><%= sidebar_item(admins_projects_rank_index_path, '项目活跃度排行', icon: 'database', controller: 'admins-projects_rank') %></li>
-        <li><%= sidebar_item(admins_issues_rank_index_path, '疑修活跃度排行', icon: 'database', controller: 'admins-issues_rank') %></li>
+        <li><%= sidebar_item(admins_issues_rank_index_path, '疑修活跃度排行', icon: 'calendar', controller: 'admins-issues_rank') %></li>
       <% end %>
     </li>
 

From 539bf58e0df6498f2ec5304dbdd03f65b8ff90ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 17 Jan 2024 15:17:47 +0800
Subject: [PATCH 075/130] update identity_verifications/edit

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

diff --git a/app/views/admins/identity_verifications/edit.html.erb b/app/views/admins/identity_verifications/edit.html.erb
index 580c86f3..28289e74 100644
--- a/app/views/admins/identity_verifications/edit.html.erb
+++ b/app/views/admins/identity_verifications/edit.html.erb
@@ -106,7 +106,7 @@
         </div>
         </br>
         <div class="form-row">
-          <%= f.input :description, as: :text,label: '拒绝理由：（拒绝时请填写拒绝理由，可以为空）', wrapper_html: { class: 'col-md-12' }, input_html: { maxlength: 100, size: 40, class: 'col-md-11' , value: @identity_verification.description } %>
+          <%= f.input :description, as: :text,label: '拒绝理由：（拒绝时请填写拒绝理由，不可以为空）', wrapper_html: { class: 'col-md-12' }, input_html: { maxlength: 100, size: 40, class: 'col-md-11' , value: @identity_verification.description } %>
         </div>
         <div class="form-row mt-4">
           <%= f.button :submit, value: '保存', class: 'btn-primary mr-3 px-4' %>

From afe4a66c2b71f603205a69f893bc1d954413d0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= <chenjing19930415@163.com>
Date: Wed, 17 Jan 2024 15:34:08 +0800
Subject: [PATCH 076/130] update identity_verifications_controller update

---
 .../admins/identity_verifications_controller.rb          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admins/identity_verifications_controller.rb b/app/controllers/admins/identity_verifications_controller.rb
index 26dc35d3..1db1a988 100644
--- a/app/controllers/admins/identity_verifications_controller.rb
+++ b/app/controllers/admins/identity_verifications_controller.rb
@@ -14,13 +14,14 @@ class Admins::IdentityVerificationsController < Admins::BaseController
     end
 
     def update
-        if @identity_verification.update(update_params)
+        if update_params[:state] == "已拒绝" && update_params[:description].blank?
+            flash[:danger] = '拒绝理由不能为空'
+            render 'edit'
+        else
             UserAction.create(action_id: @identity_verification.id, action_type: "UpdateIdentityVerifications", user_id: current_user.id, :ip => request.remote_ip, data_bank: @identity_verification.attributes.to_json)
+            @identity_verification.update(update_params)
             redirect_to admins_identity_verifications_path
             flash[:success] = "更新成功"
-        else  
-            redirect_to admins_identity_verifications_path
-            flash[:danger] = "更新失败"
         end
     end
 

From 65abdda8f9d2f6d2305ba1b8a1cb995b29a0c8f7 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 17 Jan 2024 16:37:55 +0800
Subject: [PATCH 077/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/admins/issues_rank/index.html.erb b/app/views/admins/issues_rank/index.html.erb
index 4fc56ada..45ef1e6d 100644
--- a/app/views/admins/issues_rank/index.html.erb
+++ b/app/views/admins/issues_rank/index.html.erb
@@ -1,5 +1,5 @@
 <% define_admin_breadcrumbs do %>
-  <% add_admin_breadcrumb('项目排行榜', admins_path) %>
+  <% add_admin_breadcrumb('疑修排行榜', admins_path) %>
 <% end %>
 
 

From f468f0cf672b8946386d60cdd13501cb5e4b4d94 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 17 Jan 2024 17:39:51 +0800
Subject: [PATCH 078/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1issue=E6=95=B0=E9=87=8F=E4=B8=8D=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1pr=E5=85=B3=E8=81=94=E7=9A=84issue=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index b580d699..6904aaf4 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -102,8 +102,12 @@ class Issue < ApplicationRecord
   after_save :incre_or_decre_closed_issues_count, :change_versions_count, :send_update_message_to_notice_system, :associate_attachment_container
   after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic
 
+  def is_issuely_issue?
+    self.issue_classify.nil? || self.issue_classify == 'issue'
+  end
+
   def incre_or_decre_closed_issues_count
-    if previous_changes[:status_id].present? 
+    if previous_changes[:status_id].present? && is_issuely_issue
       if previous_changes[:status_id][1] == 5
         CacheAsyncSetJob.perform_later("project_common_service", {closed_issues: 1}, self.project_id)
       end
@@ -114,27 +118,27 @@ class Issue < ApplicationRecord
   end
 
   def incre_project_common
-    CacheAsyncSetJob.perform_later("project_common_service", {issues: 1}, self.project_id)
+    CacheAsyncSetJob.perform_later("project_common_service", {issues: 1}, self.project_id) if is_issuely_issue
   end
 
   def decre_project_common
-    CacheAsyncSetJob.perform_later("project_common_service", {issues: -1}, self.project_id)
+    CacheAsyncSetJob.perform_later("project_common_service", {issues: -1}, self.project_id) if is_issuely_issue
   end
 
   def incre_user_statistic 
-    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: 1}, self.author_id)
+    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: 1}, self.author_id) if is_issuely_issue
   end
 
   def decre_user_statistic
-    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: -1}, self.author_id)
+    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: -1}, self.author_id) if is_issuely_issue
   end
 
   def incre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: 1})
+    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: 1}) if is_issuely_issue
   end
 
   def decre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: -1})
+    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: -1}) if is_issuely_issue
   end
 
   def get_assign_user

From 354242a290e1e8d46ff0d22b4a515d08e5950752 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 18 Jan 2024 09:58:30 +0800
Subject: [PATCH 079/130] =?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/models/issue.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 6904aaf4..26c170e5 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -107,7 +107,7 @@ class Issue < ApplicationRecord
   end
 
   def incre_or_decre_closed_issues_count
-    if previous_changes[:status_id].present? && is_issuely_issue
+    if previous_changes[:status_id].present? && is_issuely_issue?
       if previous_changes[:status_id][1] == 5
         CacheAsyncSetJob.perform_later("project_common_service", {closed_issues: 1}, self.project_id)
       end
@@ -118,27 +118,27 @@ class Issue < ApplicationRecord
   end
 
   def incre_project_common
-    CacheAsyncSetJob.perform_later("project_common_service", {issues: 1}, self.project_id) if is_issuely_issue
+    CacheAsyncSetJob.perform_later("project_common_service", {issues: 1}, self.project_id) if is_issuely_issue?
   end
 
   def decre_project_common
-    CacheAsyncSetJob.perform_later("project_common_service", {issues: -1}, self.project_id) if is_issuely_issue
+    CacheAsyncSetJob.perform_later("project_common_service", {issues: -1}, self.project_id) if is_issuely_issue?
   end
 
   def incre_user_statistic 
-    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: 1}, self.author_id) if is_issuely_issue
+    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: 1}, self.author_id) if is_issuely_issue?
   end
 
   def decre_user_statistic
-    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: -1}, self.author_id) if is_issuely_issue
+    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: -1}, self.author_id) if is_issuely_issue?
   end
 
   def incre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: 1}) if is_issuely_issue
+    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: 1}) if is_issuely_issue?
   end
 
   def decre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: -1}) if is_issuely_issue
+    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: -1}) if is_issuely_issue?
   end
 
   def get_assign_user

From e4faee134a726dfaf2c798e07955ddddb2bbd278 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 22 Jan 2024 11:39:16 +0800
Subject: [PATCH 080/130] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=99=BE=E5=BA=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E5=A4=A9=E5=AD=98=E5=82=A8,refresh=5Faccess=5Ftoken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/services/baidu/tongji_service.rb b/app/services/baidu/tongji_service.rb
index 8a611cd0..a2a4f28f 100644
--- a/app/services/baidu/tongji_service.rb
+++ b/app/services/baidu/tongji_service.rb
@@ -147,7 +147,7 @@ module Baidu
 
     def access_token
       access_token = Rails.cache.read("baidu_tongji_auth/access_token")
-      if access_token.blank?
+      if access_token.blank? && refresh_token.present?
         refresh_access_token
         access_token = Rails.cache.read("baidu_tongji_auth/access_token")
       end

From 9ef255f3b638568e2f9552c1318dc8523029d441 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 22 Jan 2024 12:07:46 +0800
Subject: [PATCH 081/130] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=99=BE=E5=BA=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=80=BB=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/admins/dashboards/index.html.erb b/app/views/admins/dashboards/index.html.erb
index 35593f16..5441a180 100644
--- a/app/views/admins/dashboards/index.html.erb
+++ b/app/views/admins/dashboards/index.html.erb
@@ -1,6 +1,8 @@
 <% define_admin_breadcrumbs do %>
   <% add_admin_breadcrumb('概览', admins_path) %>
 <% end %>
+
+<% cache "/admin/dashboards/#{Time.now.strftime('%Y-%m-%d')}", :expires_in => 1.days do %>
 <div class="header bg-gradient-primary pb-8 pt-md-8">
   <div class="container-fluid">
     <div class="header-body">
@@ -30,6 +32,7 @@
     </div>
   </div>
 </div>
+<%end %>
 
 <div class="box admin-list-container project-language-list-container">
   <table class="table table-hover text-center subject-list-table">

From f98c0447158699f1cce390d3c42ac2f4f7df3b3e Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 22 Jan 2024 12:57:04 +0800
Subject: [PATCH 082/130] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=A6=82=E8=A7=88?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E5=91=A8=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/dashboards_controller.rb           | 57 ++++++++++++++-----
 .../admins/dashboards/_baidu_tongji.html.erb  | 32 ++++++++---
 2 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb
index 1e13621e..6940ed1c 100644
--- a/app/controllers/admins/dashboards_controller.rb
+++ b/app/controllers/admins/dashboards_controller.rb
@@ -21,25 +21,49 @@ class Admins::DashboardsController < Admins::BaseController
     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
-
+    @weekly_active_project_count = Rails.cache.fetch("dashboardscontroller:weekly_active_project_count", expires_in: 10.minutes) do
+      Project.where(updated_on: current_week).or(Project.where(id: weekly_project_ids)).count
+    end
+    @month_active_project_count = Rails.cache.fetch("dashboardscontroller:month_active_project_count", expires_in: 1.hours) do
+      Project.where(updated_on: current_month).or(Project.where(id: month_project_ids)).count
+    end
     # 新增项目数
-    @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
+    @day_new_project_count = Rails.cache.fetch("dashboardscontroller:day_new_project_count", expires_in: 10.minutes) do
+      Project.where(created_on: today).count
+    end
+    @weekly_new_project_count = Rails.cache.fetch("dashboardscontroller:weekly_new_project_count", expires_in: 10.minutes) do
+      Project.where(created_on: current_week).count
+    end
+    @month_new_project_count = Rails.cache.fetch("dashboardscontroller:month_new_project_count", expires_in: 1.hours) do
+      Project.where(created_on: current_month).count
+    end
+
 
     # 总的平台用户数
     # 总的平台项目数
     # 总的平台组织数
     # 总的平台Issue数、评论数、PR数、Commit数
-    @user_count = User.count
-    @project_count = Project.count
-    @organization_count = Organization.count
-    @issue_count = Issue.count
-    @comment_count = Journal.count
-    @pr_count = PullRequest.count
-    @commit_count = CommitLog.count
+    @user_count = Rails.cache.fetch("dashboardscontroller:platform:user_count", expires_in: 1.days) do
+      User.count
+    end
+    @project_count = Rails.cache.fetch("dashboardscontroller:platform:project_count", expires_in: 1.days) do
+      Project.count
+    end
+    @organization_count = Rails.cache.fetch("dashboardscontroller:platform:organization_count", expires_in: 1.days) do
+      Organization.count
+    end
+    @issue_count = Rails.cache.fetch("dashboardscontroller:platform:issue_count", expires_in: 1.days) do
+      Issue.count
+    end
+    @comment_count = Rails.cache.fetch("dashboardscontroller:platform:comment_count", expires_in: 1.days) do
+      Journal.count
+    end
+    @pr_count = Rails.cache.fetch("dashboardscontroller:platform:pr_count", expires_in: 1.days) do
+      PullRequest.count
+    end
+    @commit_count = Rails.cache.fetch("dashboardscontroller:platform:commit_count", expires_in: 1.days) do
+      CommitLog.count
+    end
 
     @subject_name = ["用户数", "项目数", "组织数", "Issue数", "Issue评论数", "PR数", "Commit数"]
     @subject_icon = ["fa-user","fa-git", "fa-sitemap", "fa-warning", "fa-comments", "fa-share-alt", "fa-upload"]
@@ -54,8 +78,11 @@ class Admins::DashboardsController < Admins::BaseController
     start_date = last_date.date
     end_date = Time.now
     if @access_token.present?
-      @overview_data = tongji_service.overview_batch_add(start_date, end_date)
-      tongji_service.source_from_batch_add(start_date, end_date)
+      @overview_data = Rails.cache.fetch("dashboardscontroller:baidu_tongji:overview_data", expires_in: 10.minutes) do
+        tongji_service.source_from_batch_add(start_date, end_date)
+        @overview_data = tongji_service.overview_batch_add(start_date, end_date)
+        @overview_data
+      end
     end
 
     @current_week_statistic = DailyPlatformStatistic.where(date: current_week)
diff --git a/app/views/admins/dashboards/_baidu_tongji.html.erb b/app/views/admins/dashboards/_baidu_tongji.html.erb
index c59e1aca..ca697332 100644
--- a/app/views/admins/dashboards/_baidu_tongji.html.erb
+++ b/app/views/admins/dashboards/_baidu_tongji.html.erb
@@ -15,6 +15,19 @@
   </tr>
   </thead>
   <tbody>
+  <% if @current_week_statistic.size ==1 && @pre_week_statistic.present? %>
+    <tr class="">
+      <td>上周合计</td>
+      <td><%= @pre_week_statistic.map(&:pv).sum %></td>
+      <td><%= @pre_week_statistic.map(&:visitor).sum %></td>
+      <td><%= @pre_week_statistic.map(&:ip).sum %></td>
+      <td><%= (@pre_week_statistic.map(&:source_through).sum.to_f / 7).round(2) %></td>
+      <td><%= (@pre_week_statistic.map(&:source_link).sum.to_f / 7).round(2) %></td>
+      <td><%= (@pre_week_statistic.map(&:source_search).sum.to_f / 7).round(2) %></td>
+      <td><%= ((@pre_week_statistic.map(&:source_custom) - [nil]).sum.to_f / 7).round(2)  %></td>
+      </td>
+    </tr>
+  <% end %>
   <% @current_week_statistic.each_with_index do |week, index| %>
     <tr class="">
       <td><%= week.date %> </td>
@@ -28,13 +41,18 @@
       </td>
     </tr>
   <% end %>
-<!--  <tr class="">-->
-<!--    <td><span style="color: #ff8200">合计</span></td>-->
-<!--    <td><span style="color: #ff8200"><%#= @current_week_statistic.sum(:pv) %></span></td>-->
-<!--    <td><span style="color: #ff8200"><%#= @current_week_statistic.sum(:visitor) %></span></td>-->
-<!--    <td><span style="color: #ff8200"><%#= @current_week_statistic.sum(:ip) %></span></td>-->
-<!--    </td>-->
-<!--  </tr>-->
+  <tr class="">
+    <% current_week_size = @current_week_statistic.size %>
+    <td><span style="color: #ff8200">本周合计</span></td>
+    <td><span style="color: #ff8200"><%= @current_week_statistic.map(&:pv).sum %></span></td>
+    <td><span style="color: #ff8200"><%= @current_week_statistic.map(&:visitor).sum %></span></td>
+    <td><span style="color: #ff8200"><%= @current_week_statistic.map(&:ip).sum %></span></td>
+    <td><span style="color: #ff8200"><%= (@current_week_statistic.map(&:source_through).sum.to_f / current_week_size).round(2) %>%</span></td>
+    <td><span style="color: #ff8200"><%= (@current_week_statistic.map(&:source_link).sum.to_f / current_week_size).round(2)  %>%</span></td>
+    <td><span style="color: #ff8200"><%= (@current_week_statistic.map(&:source_search).sum.to_f / current_week_size).round(2)  %>%</span></td>
+    <td><span style="color: #ff8200"><%= ((@current_week_statistic.map(&:source_custom) - [nil]).sum.to_f / current_week_size).round(2)  %>%</span></td>
+    </td>
+  </tr>
   </tbody>
 </table>
 

From 90ea1804e9bcdf60dd42079fbc28cc3c7569fae0 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 22 Jan 2024 13:02:48 +0800
Subject: [PATCH 083/130] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=A6=82=E8=A7=88?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E5=91=A8=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E7=99=BE=E5=88=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admins/dashboards/_baidu_tongji.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/admins/dashboards/_baidu_tongji.html.erb b/app/views/admins/dashboards/_baidu_tongji.html.erb
index ca697332..75fd1cde 100644
--- a/app/views/admins/dashboards/_baidu_tongji.html.erb
+++ b/app/views/admins/dashboards/_baidu_tongji.html.erb
@@ -21,10 +21,10 @@
       <td><%= @pre_week_statistic.map(&:pv).sum %></td>
       <td><%= @pre_week_statistic.map(&:visitor).sum %></td>
       <td><%= @pre_week_statistic.map(&:ip).sum %></td>
-      <td><%= (@pre_week_statistic.map(&:source_through).sum.to_f / 7).round(2) %></td>
-      <td><%= (@pre_week_statistic.map(&:source_link).sum.to_f / 7).round(2) %></td>
-      <td><%= (@pre_week_statistic.map(&:source_search).sum.to_f / 7).round(2) %></td>
-      <td><%= ((@pre_week_statistic.map(&:source_custom) - [nil]).sum.to_f / 7).round(2)  %></td>
+      <td><%= (@pre_week_statistic.map(&:source_through).sum.to_f / 7).round(2) %>%</td>
+      <td><%= (@pre_week_statistic.map(&:source_link).sum.to_f / 7).round(2) %>%</td>
+      <td><%= (@pre_week_statistic.map(&:source_search).sum.to_f / 7).round(2) %>%</td>
+      <td><%= ((@pre_week_statistic.map(&:source_custom) - [nil]).sum.to_f / 7).round(2)  %>%</td>
       </td>
     </tr>
   <% end %>

From 299978833da731f4d371de0d971a891177353b24 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 25 Jan 2024 16:09:52 +0800
Subject: [PATCH 084/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=87=8C?=
 =?UTF-8?q?=E7=A8=8B=E7=A2=91=E8=BF=87=E6=9C=9F=E7=9B=B8=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delay_expired_issue_and_milestone_job.rb  | 16 +++++
 app/jobs/delay_expired_issue_job.rb           | 10 ---
 app/jobs/send_template_message_job.rb         | 14 ++++
 app/models/message_template.rb                |  2 +
 .../project_milestone_early_expired.rb        | 70 +++++++++++++++++++
 .../project_milestone_expired.rb              | 70 +++++++++++++++++++
 app/models/user_template_message_setting.rb   |  4 ++
 app/models/version.rb                         |  2 +
 config/sidekiq_cron.yml                       |  2 +-
 9 files changed, 179 insertions(+), 11 deletions(-)
 create mode 100644 app/jobs/delay_expired_issue_and_milestone_job.rb
 delete mode 100644 app/jobs/delay_expired_issue_job.rb
 create mode 100644 app/models/message_template/project_milestone_early_expired.rb
 create mode 100644 app/models/message_template/project_milestone_expired.rb

diff --git a/app/jobs/delay_expired_issue_and_milestone_job.rb b/app/jobs/delay_expired_issue_and_milestone_job.rb
new file mode 100644
index 00000000..4bba7aaf
--- /dev/null
+++ b/app/jobs/delay_expired_issue_and_milestone_job.rb
@@ -0,0 +1,16 @@
+class DelayExpiredIssueAndMilestoneJob < ApplicationJob
+  queue_as :message
+
+  def perform
+    Issue.where(due_date: Date.today + 1.days).find_each do |issue|
+      SendTemplateMessageJob.perform_later('IssueExpire', issue.id) if Site.has_notice_menu?
+    end
+    Version.where(effective_date: Date.today + 1.days).find_each do |version| 
+      SendTemplateMessageJob.perform_later('ProjectMilestoneEarlyExpired', version.id) if Site.has_notice_menu?
+    end
+    Version.where(effective_date: Date.today - 1.days).find_each do |version|
+      SendTemplateMessageJob.perform_later('ProjectMilestoneExpired', version.id) if Site.has_notice_menu?
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/app/jobs/delay_expired_issue_job.rb b/app/jobs/delay_expired_issue_job.rb
deleted file mode 100644
index ed390e15..00000000
--- a/app/jobs/delay_expired_issue_job.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class DelayExpiredIssueJob < ApplicationJob
-  queue_as :message
-
-  def perform
-    Issue.where(due_date: Date.today + 1.days).find_each do |issue|
-      SendTemplateMessageJob.perform_later('IssueExpire', issue.id) if Site.has_notice_menu?
-    end
-  end
-
-end
\ No newline at end of file
diff --git a/app/jobs/send_template_message_job.rb b/app/jobs/send_template_message_job.rb
index 05572d45..82f41cad 100644
--- a/app/jobs/send_template_message_job.rb
+++ b/app/jobs/send_template_message_job.rb
@@ -221,6 +221,20 @@ class SendTemplateMessageJob < ApplicationJob
         receivers_email_string, email_title, email_content = MessageTemplate::ProjectMilestone.get_email_message_content(receiver, operator, milestone)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
       end
+    when 'ProjectMilestoneExpired'
+      milestone_id = args[0]
+      milestone = Version.find_by_id(milestone_id)
+      return unless milestone.present? && milestone&.project.present?
+      receivers = User.where(id: milestone.user_id)
+      receivers_string, content, notification_url = MessageTemplate::ProjectMilestoneExpired.get_message_content(receivers, milestone)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {milestone_id: milestone_id, operator_id: operator_id})
+    when 'ProjectMilestoneEarlyExpired'
+      milestone_id = args[0]
+      milestone = Version.find_by_id(milestone_id)
+      return unless milestone.present? && milestone&.project.present?
+      receivers = User.where(id: milestone.user_id)
+      receivers_string, content, notification_url = MessageTemplate::ProjectMilestoneEarlyExpired.get_message_content(receivers, milestone)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {milestone_id: milestone_id, operator_id: operator_id})
     when 'ProjectPraised'
       operator_id, project_id = args[0], args[1]
       operator = User.find_by_id(operator_id)
diff --git a/app/models/message_template.rb b/app/models/message_template.rb
index 7ab7fdad..75d64fa9 100644
--- a/app/models/message_template.rb
+++ b/app/models/message_template.rb
@@ -52,6 +52,8 @@ class MessageTemplate < ApplicationRecord
     self.create(type: 'MessageTemplate::ProjectMilestone', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 创建了一个里程碑：<b>{name}</b>', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 新建了一个里程碑")
     email_html = File.read("#{email_template_html_dir}/project_milestone_completed.html")
     self.create(type: 'MessageTemplate::ProjectMilestoneCompleted', sys_notice: '在 <b>{nickname}/{repository}</b> 仓库，里程碑 <b>{name}</b> 的完成度已达到100%', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}', email: email_html, email_title: "#{PLATFORM}: 仓库 {nickname}/{repository} 有里程碑已完成")
+    self.create(type: 'MessageTemplate::ProjectMilestoneEarlyExpired', sys_notice: '您创建的里程碑 <b>{name}</b> 已临近截止日期，请尽快处理.', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}')
+    self.create(type: 'MessageTemplate::ProjectMilestoneExpired', sys_notice: '您创建的里程碑 <b>{name}</b> 已逾期，请及时更新进度或联系项目团队.', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}')
     self.create(type: 'MessageTemplate::ProjectPraised', sys_notice: '<b>{nickname1}</b> 点赞了你管理的仓库 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{login}')
     self.create(type: 'MessageTemplate::ProjectOpenDevOps', sys_notice: '您的仓库 <b>{repository}</b> 已成功开通引擎服务，可通过简单的节点编排完成自动化集成与部署。欢迎体验！', notification_url: '{baseurl}/{owner}/{identifier}/devops')
     email_html = File.read("#{email_template_html_dir}/project_pull_request.html")
diff --git a/app/models/message_template/project_milestone_early_expired.rb b/app/models/message_template/project_milestone_early_expired.rb
new file mode 100644
index 00000000..5539fc36
--- /dev/null
+++ b/app/models/message_template/project_milestone_early_expired.rb
@@ -0,0 +1,70 @@
+# == 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::ProjectMilestoneEarlyExpired < MessageTemplate
+
+  # MessageTemplate::ProjectMilestoneEarlyExpired.get_message_content(User.where(login: 'yystopf'), Version.find(7))
+  def self.get_message_content(receivers, milestone)
+    receivers.each do |receiver|
+      if receiver.user_template_message_setting.present? 
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::MilestoneEarlyExpired"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::MilestoneEarlyExpired"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
+      end
+    end
+    return '', '', '' if receivers.blank?
+    project = milestone&.project 
+    owner = project&.owner 
+    content = sys_notice.gsub('{nickname}', owner&.real_name).gsub('{repository}', project&.name).gsub('{name}', milestone&.name)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', milestone&.id.to_s)
+    
+    return receivers_string(receivers), content, url
+  rescue => e
+    Rails.logger.info("MessageTemplate::MilestoneEarlyExpired.get_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+
+  def self.get_email_message_content(receiver, milestone)
+    if receiver.user_template_message_setting.present? 
+      send_setting = receiver.user_template_message_setting.email_body["ManageProject::MilestoneEarlyExpired"]
+      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::MilestoneEarlyExpired"] : send_setting
+      return '', '', '' unless send_setting
+      project = milestone&.project 
+      owner = project&.owner 
+      title = email_title
+      title.gsub!('{nickname}', owner&.real_name)
+      title.gsub!('{repository}', project&.name)
+  
+      content = email 
+      content.gsub!('{receiver}', receiver&.real_name)
+      content.gsub!('{baseurl}', base_url)
+      content.gsub!('{nickname}', owner&.real_name)
+      content.gsub!('{repository}', project&.name)
+      content.gsub!('{login}', owner&.login)
+      content.gsub!('{identifier}', project&.identifier)
+      content.gsub!('{id}', milestone&.id.to_s)
+      content.gsub!('{name}', milestone&.name)
+      content.gsub!('{platform}', PLATFORM)
+      
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+   
+  rescue => e
+    Rails.logger.info("MessageTemplate::MilestoneEarlyExpired.get_email_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+end
diff --git a/app/models/message_template/project_milestone_expired.rb b/app/models/message_template/project_milestone_expired.rb
new file mode 100644
index 00000000..de6b8c10
--- /dev/null
+++ b/app/models/message_template/project_milestone_expired.rb
@@ -0,0 +1,70 @@
+# == 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::ProjectMilestoneExpired < MessageTemplate
+
+  # MessageTemplate::ProjectMilestoneExpired.get_message_content(User.where(login: 'yystopf'), Version.find(7))
+  def self.get_message_content(receivers, milestone)
+    receivers.each do |receiver|
+      if receiver.user_template_message_setting.present? 
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::MilestoneExpired"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::MilestoneExpired"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
+      end
+    end
+    return '', '', '' if receivers.blank?
+    project = milestone&.project 
+    owner = project&.owner 
+    content = sys_notice.gsub('{nickname}', owner&.real_name).gsub('{repository}', project&.name).gsub('{name}', milestone&.name)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', milestone&.id.to_s)
+    
+    return receivers_string(receivers), content, url
+  rescue => e
+    Rails.logger.info("MessageTemplate::ProjectMilestoneExpired.get_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+
+  def self.get_email_message_content(receiver, milestone)
+    if receiver.user_template_message_setting.present? 
+      send_setting = receiver.user_template_message_setting.email_body["ManageProject::MilestoneExpired"]
+      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::MilestoneExpired"] : send_setting
+      return '', '', '' unless send_setting
+      project = milestone&.project 
+      owner = project&.owner 
+      title = email_title
+      title.gsub!('{nickname}', owner&.real_name)
+      title.gsub!('{repository}', project&.name)
+  
+      content = email 
+      content.gsub!('{receiver}', receiver&.real_name)
+      content.gsub!('{baseurl}', base_url)
+      content.gsub!('{nickname}', owner&.real_name)
+      content.gsub!('{repository}', project&.name)
+      content.gsub!('{login}', owner&.login)
+      content.gsub!('{identifier}', project&.identifier)
+      content.gsub!('{id}', milestone&.id.to_s)
+      content.gsub!('{name}', milestone&.name)
+      content.gsub!('{platform}', PLATFORM)
+      
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+   
+  rescue => e
+    Rails.logger.info("MessageTemplate::ProjectMilestoneExpired.get_email_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+end
diff --git a/app/models/user_template_message_setting.rb b/app/models/user_template_message_setting.rb
index 49db51d4..7e855b76 100644
--- a/app/models/user_template_message_setting.rb
+++ b/app/models/user_template_message_setting.rb
@@ -44,6 +44,8 @@ class UserTemplateMessageSetting < ApplicationRecord
       "ManageProject::Forked": true,
       "ManageProject::Milestone": true,
       "ManageProject::MilestoneCompleted": true,
+      "ManageProject::MilestoneExpired": true,
+      "ManageProject::MilestoneEarlyExpired": true,
     }.stringify_keys!
   end
 
@@ -65,6 +67,8 @@ class UserTemplateMessageSetting < ApplicationRecord
       "ManageProject::Forked": false,
       "ManageProject::Milestone": false,
       "ManageProject::MilestoneCompleted": false,
+      "ManageProject::MilestoneExpired": false,
+      "ManageProject::MilestoneEarlyExpired": false,
     }.stringify_keys!
   end
 
diff --git a/app/models/version.rb b/app/models/version.rb
index 82474f55..5787116d 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -68,5 +68,7 @@ class Version < ApplicationRecord
 
   def send_update_message_to_notice_system
     SendTemplateMessageJob.perform_later('ProjectMilestoneCompleted', self.id) if Site.has_notice_menu? && self.issue_percent == 1.0
+    SendTemplateMessageJob.perform_later('ProjectMilestoneEarlyExpired', self.id) if Site.has_notice_menu? && self.effective_date == Date.today + 1.days 
+    SendTemplateMessageJob.perform_later('ProjectMilestoneExpired', self.id) if Site.has_notice_menu? && self.effective_date == Date.today - 1.days 
   end
 end
diff --git a/config/sidekiq_cron.yml b/config/sidekiq_cron.yml
index 448e9c94..c31ce257 100644
--- a/config/sidekiq_cron.yml
+++ b/config/sidekiq_cron.yml
@@ -5,5 +5,5 @@ sync_gitea_repo_update_time:
 
 delay_expired_issue:
   cron: "0 0 * * *"
-  class: "DelayExpiredIssueJob"
+  class: "DelayExpiredIssueAndMilestoneJob"
   queue: message

From df0ef313f6c9e19373512d3a734f8b96fb4d3af9 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 26 Jan 2024 16:15:14 +0800
Subject: [PATCH 085/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=97=A0=E6=96=87=E4=BB=B6=E8=B7=B3=E8=BD=AC404?=
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 f80e00b6..c13d784e 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -61,6 +61,7 @@ class RepositoriesController < ApplicationController
       @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
       @path = GiteaService.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
     end
+    return render_not_found if @entries.blank?
   end
 
   def top_counts

From d2663eb7b7e1a7c1422407ba1441a171ccc03cb8 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 29 Jan 2024 16:05:04 +0800
Subject: [PATCH 086/130] =?UTF-8?q?fixed=20=E7=BB=84=E7=BB=87=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=95=B0=E5=8F=96=E7=BB=84=E7=BB=87=E5=86=85=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=92=8C=E7=BB=84=E7=BB=87=E6=89=80=E6=9C=89=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=88=90=E5=91=98=E7=BB=84=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization_users_controller.rb          | 23 +++++++++++++++----
 .../organization_users/_detail.json.jbuilder  |  8 +++----
 .../organization_users/index.json.jbuilder    |  8 +++----
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/controllers/organizations/organization_users_controller.rb b/app/controllers/organizations/organization_users_controller.rb
index d9035dc1..98f2e165 100644
--- a/app/controllers/organizations/organization_users_controller.rb
+++ b/app/controllers/organizations/organization_users_controller.rb
@@ -4,17 +4,30 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
   before_action :check_user_can_edit_org, only: [:destroy]
 
   def index
-    @organization_users = @organization.organization_users.includes(:user)
+    # @organization_users = @organization.organization_users.includes(:user)
+    # 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)
+
+    organization_user_ids = @organization.organization_users.pluck(:user_id).uniq
+    project_member_user_ids = @organization.projects.joins(:members).pluck("members.user_id").uniq
+    users = User.where(id: organization_user_ids + project_member_user_ids)
     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")
+      user_ids = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users").pluck(:id)
 
-      @organization_users = @organization_users.where(user_id: users).distinct
+      users = users.where(id: user_ids)
     end
-
-    @organization_users = kaminari_paginate(@organization_users)
+    @users = kaminari_paginate(users)
   end
 
   def pm_check_user
diff --git a/app/views/organizations/organization_users/_detail.json.jbuilder b/app/views/organizations/organization_users/_detail.json.jbuilder
index c7572971..b456b35c 100644
--- a/app/views/organizations/organization_users/_detail.json.jbuilder
+++ b/app/views/organizations/organization_users/_detail.json.jbuilder
@@ -1,7 +1,7 @@
-json.id org_user.id
+json.id user&.id
 json.user do
-  json.partial! "organizations/user_detail", user: org_user.user
+  json.partial! "organizations/user_detail", user: user
 end
 
-json.team_names org_user.teams.pluck(:nickname)
-json.created_at org_user.created_at.strftime("%Y-%m-%d")
+json.team_names user.teams.where("teams.organization_id=?", organization.id).pluck(:nickname)
+json.created_at user.created_on.strftime("%Y-%m-%d")
diff --git a/app/views/organizations/organization_users/index.json.jbuilder b/app/views/organizations/organization_users/index.json.jbuilder
index 9f1f278b..9241af18 100644
--- a/app/views/organizations/organization_users/index.json.jbuilder
+++ b/app/views/organizations/organization_users/index.json.jbuilder
@@ -1,5 +1,5 @@
-json.total_count @organization_users.total_count
-json.organization_users @organization_users do |org_user|
-  next if org_user.user.blank?
-  json.partial! "detail", org_user: org_user, organization: @organization
+json.total_count @users.total_count
+json.organization_users @users do |user|
+  next if user.blank?
+  json.partial! "detail", user: user, organization: @organization
 end

From 6ff89d7929775775ada9f560116ba6cc2e86175a Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 29 Jan 2024 16:05:22 +0800
Subject: [PATCH 087/130] =?UTF-8?q?fixed=20=E5=8F=96=E6=B6=88=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0=E6=88=90=E5=91=98=E6=97=B6=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E5=8A=A0=E8=BF=9B=E7=BB=84=E7=BB=87=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/concerns/project_operable.rb | 252 ++++++++++++------------
 1 file changed, 126 insertions(+), 126 deletions(-)

diff --git a/app/models/concerns/project_operable.rb b/app/models/concerns/project_operable.rb
index 9a5efd12..dbe78a1b 100644
--- a/app/models/concerns/project_operable.rb
+++ b/app/models/concerns/project_operable.rb
@@ -21,67 +21,67 @@ module ProjectOperable
   end
 
   def add_member!(user_id, role_name='Developer')
-    if self.owner.is_a?(Organization) 
-      case role_name 
-      when 'Manager'
-        # 构建相应的团队
-        team = self.owner.teams.admin.take
-        if team.nil? 
-          team = Team.build(self.user_id, 'admin', '管理员', '', 'admin', false, false)
-          gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
-          team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
-        end
-
-        # 设置项目在团队中的访问权限
-        team_project = TeamProject.build(self.user_id, team.id, self.id)
-        tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil 
-
-        # 新增对应的团队成员
-        team_user = TeamUser.build(self.user_id, user_id, team.id)
-        $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
-
-        # 确保组织成员中有该用户
-        OrganizationUser.build(self.user_id, user_id)
-      when 'Developer'
-        # 构建相应的团队
-        team = self.owner.teams.write.take
-        if team.nil? 
-          team = Team.build(self.user_id, 'developer', '开发者', '', 'write', false, false)
-          gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
-          team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
-        end
-
-        # 设置项目在团队中的访问权限
-        team_project = TeamProject.build(self.user_id, team.id, self.id)
-        tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil 
-
-        # 新增对应的团队成员
-        team_user = TeamUser.build(self.user_id, user_id, team.id)
-        $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
-
-        # 确保组织成员中有该用户
-        OrganizationUser.build(self.user_id, user_id)
-      when 'Reporter'
-        # 构建相应的团队
-        team = self.owner.teams.read.take
-        if team.nil? 
-          team = Team.build(self.user_id, 'reporter', '报告者', '', 'read', false, false)
-          gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
-          team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
-        end
-
-        # 设置项目在团队中的访问权限
-        team_project = TeamProject.build(self.user_id, team.id, self.id)
-        tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil 
-
-        # 新增对应的团队成员
-        team_user = TeamUser.build(self.user_id, user_id, team.id)
-        $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
-
-        # 确保组织成员中有该用户
-        OrganizationUser.build(self.user_id, user_id)
-      end
-    end
+    # if self.owner.is_a?(Organization)
+    #   case role_name
+    #   when 'Manager'
+    #     # 构建相应的团队
+    #     team = self.owner.teams.admin.take
+    #     if team.nil?
+    #       team = Team.build(self.user_id, 'admin', '管理员', '', 'admin', false, false)
+    #       gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
+    #       team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
+    #     end
+    #
+    #     # 设置项目在团队中的访问权限
+    #     team_project = TeamProject.build(self.user_id, team.id, self.id)
+    #     tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil
+    #
+    #     # 新增对应的团队成员
+    #     team_user = TeamUser.build(self.user_id, user_id, team.id)
+    #     $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
+    #
+    #     # 确保组织成员中有该用户
+    #     OrganizationUser.build(self.user_id, user_id)
+    #   when 'Developer'
+    #     # 构建相应的团队
+    #     team = self.owner.teams.write.take
+    #     if team.nil?
+    #       team = Team.build(self.user_id, 'developer', '开发者', '', 'write', false, false)
+    #       gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
+    #       team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
+    #     end
+    #
+    #     # 设置项目在团队中的访问权限
+    #     team_project = TeamProject.build(self.user_id, team.id, self.id)
+    #     tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil
+    #
+    #     # 新增对应的团队成员
+    #     team_user = TeamUser.build(self.user_id, user_id, team.id)
+    #     $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
+    #
+    #     # 确保组织成员中有该用户
+    #     OrganizationUser.build(self.user_id, user_id)
+    #   when 'Reporter'
+    #     # 构建相应的团队
+    #     team = self.owner.teams.read.take
+    #     if team.nil?
+    #       team = Team.build(self.user_id, 'reporter', '报告者', '', 'read', false, false)
+    #       gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
+    #       team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
+    #     end
+    #
+    #     # 设置项目在团队中的访问权限
+    #     team_project = TeamProject.build(self.user_id, team.id, self.id)
+    #     tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil
+    #
+    #     # 新增对应的团队成员
+    #     team_user = TeamUser.build(self.user_id, user_id, team.id)
+    #     $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
+    #
+    #     # 确保组织成员中有该用户
+    #     OrganizationUser.build(self.user_id, user_id)
+    #   end
+    # end
     member = members.create!(user_id: user_id, team_user_id: team_user&.id)
     set_developer_role(member, role_name)
   end
@@ -116,71 +116,71 @@ module ProjectOperable
   def change_member_role!(user_id, role)
     member = self.member(user_id)
     # 所有者为组织，并且该用户属于组织成员
-    if self.owner.is_a?(Organization) && member.team_user.present?
-      case role&.name
-      when 'Manager'
-        # 构建相应的团队
-        team = self.owner.teams.admin.take
-        if team.nil? 
-          team = Team.build(self.user_id, 'admin', '管理员', '', 'admin', false, false)
-          gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
-          team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
-        end
-
-        # 设置项目在团队中的访问权限
-        team_project = TeamProject.build(self.user_id, team.id, self.id)
-        tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil 
-
-        # 更改对应的团队成员
-        team_user = member.team_user
-        $gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的
-        $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
-        team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id)
-
-        # 确保组织成员中有该用户
-        OrganizationUser.build(self.user_id, user_id)
-      when 'Developer'
-        # 构建相应的团队
-        team = self.owner.teams.write.take
-        if team.nil? 
-          team = Team.build(self.user_id, 'developer', '开发者', '', 'write', false, false)
-          gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
-          team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
-        end
-        # 设置项目在团队中的访问权限
-        team_project = TeamProject.build(self.user_id, team.id, self.id)
-        $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil 
-
-        # 更改对应的团队成员
-        team_user = member.team_user
-        $gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的
-        $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
-        team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id)
-
-        OrganizationUser.build(self.user_id, user_id)
-      when 'Reporter'
-        # 构建相应的团队
-        team = self.owner.teams.read.take
-        if team.nil? 
-          team = Team.build(self.user_id, 'reporter', '报告者', '', 'read', false, false)
-          gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
-          team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
-        end
-
-        # 设置项目在团队中的访问权限
-        team_project = TeamProject.build(self.user_id, team.id, self.id)
-        tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil 
-
-        # 更改对应的团队成员
-        team_user = member.team_user
-        $gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的
-        $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
-        team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id)
-
-        # 确保组织成员中有该用户
-        OrganizationUser.build(self.user_id, user_id)
-      end
-    end
+    # if self.owner.is_a?(Organization) && member.team_user.present?
+    #   case role&.name
+    #   when 'Manager'
+    #     # 构建相应的团队
+    #     team = self.owner.teams.admin.take
+    #     if team.nil?
+    #       team = Team.build(self.user_id, 'admin', '管理员', '', 'admin', false, false)
+    #       gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
+    #       team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
+    #     end
+    #
+    #     # 设置项目在团队中的访问权限
+    #     team_project = TeamProject.build(self.user_id, team.id, self.id)
+    #     tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil
+    #
+    #     # 更改对应的团队成员
+    #     team_user = member.team_user
+    #     $gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的
+    #     $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
+    #     team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id)
+    #
+    #     # 确保组织成员中有该用户
+    #     OrganizationUser.build(self.user_id, user_id)
+    #   when 'Developer'
+    #     # 构建相应的团队
+    #     team = self.owner.teams.write.take
+    #     if team.nil?
+    #       team = Team.build(self.user_id, 'developer', '开发者', '', 'write', false, false)
+    #       gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
+    #       team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
+    #     end
+    #     # 设置项目在团队中的访问权限
+    #     team_project = TeamProject.build(self.user_id, team.id, self.id)
+    #     $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil
+    #
+    #     # 更改对应的团队成员
+    #     team_user = member.team_user
+    #     $gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的
+    #     $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
+    #     team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id)
+    #
+    #     OrganizationUser.build(self.user_id, user_id)
+    #   when 'Reporter'
+    #     # 构建相应的团队
+    #     team = self.owner.teams.read.take
+    #     if team.nil?
+    #       team = Team.build(self.user_id, 'reporter', '报告者', '', 'read', false, false)
+    #       gteam = $gitea_client.post_orgs_teams_by_org(self.owner.login, {body: team.to_gitea_hash.to_json}) rescue nil
+    #       team.update_attributes!({gtid: gteam["id"]}) unless gteam.nil?
+    #     end
+    #
+    #     # 设置项目在团队中的访问权限
+    #     team_project = TeamProject.build(self.user_id, team.id, self.id)
+    #     tp_result = $gitea_client.put_teams_repos_by_id_org_repo(team.gtid, self.owner.login, self.identifier) rescue nil
+    #
+    #     # 更改对应的团队成员
+    #     team_user = member.team_user
+    #     $gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的
+    #     $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
+    #     team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id)
+    #
+    #     # 确保组织成员中有该用户
+    #     OrganizationUser.build(self.user_id, user_id)
+    #   end
+    # end
     member.member_roles.last.update_attributes!(role: role)
   end
 

From c957617263a53ff92b6796ef06fe0bc582b023d2 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 29 Jan 2024 16:54:52 +0800
Subject: [PATCH 088/130] =?UTF-8?q?fixed=20=E5=8F=96=E6=B6=88=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0=E6=88=90=E5=91=98=E6=97=B6=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E5=8A=A0=E8=BF=9B=E7=BB=84=E7=BB=87=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?,=E4=BB=85=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/models/concerns/project_operable.rb b/app/models/concerns/project_operable.rb
index dbe78a1b..34386aae 100644
--- a/app/models/concerns/project_operable.rb
+++ b/app/models/concerns/project_operable.rb
@@ -82,7 +82,8 @@ module ProjectOperable
     #     OrganizationUser.build(self.user_id, user_id)
     #   end
     # end
-    member = members.create!(user_id: user_id, team_user_id: team_user&.id)
+    # member = members.create!(user_id: user_id, team_user_id: team_user&.id)
+    member = members.create!(user_id: user_id)
     set_developer_role(member, role_name)
   end
 

From 627332e93a4c13f5ad1c7be43cae7c7546eb73af Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 29 Jan 2024 17:32:46 +0800
Subject: [PATCH 089/130] =?UTF-8?q?fixed=20=E7=BB=84=E7=BB=87=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=95=B0=E5=8F=96=E7=BB=84=E7=BB=87=E5=86=85=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=92=8C=E7=BB=84=E7=BB=87=E6=89=80=E6=9C=89=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=88=90=E5=91=98=E7=BB=84=E5=90=88,=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization_users/_detail.json.jbuilder             | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/organizations/organization_users/_detail.json.jbuilder b/app/views/organizations/organization_users/_detail.json.jbuilder
index b456b35c..78040e90 100644
--- a/app/views/organizations/organization_users/_detail.json.jbuilder
+++ b/app/views/organizations/organization_users/_detail.json.jbuilder
@@ -4,4 +4,11 @@ json.user do
 end
 
 json.team_names user.teams.where("teams.organization_id=?", organization.id).pluck(:nickname)
-json.created_at user.created_on.strftime("%Y-%m-%d")
+join_date =  if user.organization_users.find_by(:organization_id => organization.id).present?
+               user.organization_users.find_by(:organization_id => organization.id).created_at.strftime("%Y-%m-%d")
+             elsif user.members.joins(:project).find_by(project: organization.projects).present?
+               user.members.joins(:project).find_by(project: organization.projects).created_at.strftime("%Y-%m-%d")
+             else
+               user.created_on.strftime("%Y-%m-%d")
+             end
+json.created_at join_date

From 036acfc43da4115e0b1805ab9e3fe729799b75be Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 29 Jan 2024 17:35:08 +0800
Subject: [PATCH 090/130] =?UTF-8?q?fixed=20=E7=BB=84=E7=BB=87=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=95=B0=E5=8F=96=E7=BB=84=E7=BB=87=E5=86=85=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=92=8C=E7=BB=84=E7=BB=87=E6=89=80=E6=9C=89=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=88=90=E5=91=98=E7=BB=84=E5=90=88,=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/organization_users/_detail.json.jbuilder      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/organizations/organization_users/_detail.json.jbuilder b/app/views/organizations/organization_users/_detail.json.jbuilder
index 78040e90..7590da02 100644
--- a/app/views/organizations/organization_users/_detail.json.jbuilder
+++ b/app/views/organizations/organization_users/_detail.json.jbuilder
@@ -7,7 +7,7 @@ json.team_names user.teams.where("teams.organization_id=?", organization.id).plu
 join_date =  if user.organization_users.find_by(:organization_id => organization.id).present?
                user.organization_users.find_by(:organization_id => organization.id).created_at.strftime("%Y-%m-%d")
              elsif user.members.joins(:project).find_by(project: organization.projects).present?
-               user.members.joins(:project).find_by(project: organization.projects).created_at.strftime("%Y-%m-%d")
+               user.members.joins(:project).find_by(project: organization.projects).created_on.strftime("%Y-%m-%d")
              else
                user.created_on.strftime("%Y-%m-%d")
              end

From 8ca9ced36039e4fa1dd8ed4ec4e8fc84d350c6d0 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Tue, 30 Jan 2024 08:27:49 +0800
Subject: [PATCH 091/130] =?UTF-8?q?fixed=20=E7=BB=84=E7=BB=87=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=95=B0=E5=8F=96=E7=BB=84=E7=BB=87=E5=86=85=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=92=8C=E7=BB=84=E7=BB=87=E6=89=80=E6=9C=89=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=88=90=E5=91=98=E7=BB=84=E5=90=88,=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8A=A0=E5=85=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/organizations/organization_users_controller.rb b/app/controllers/organizations/organization_users_controller.rb
index 98f2e165..171e9dca 100644
--- a/app/controllers/organizations/organization_users_controller.rb
+++ b/app/controllers/organizations/organization_users_controller.rb
@@ -18,7 +18,8 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
 
     organization_user_ids = @organization.organization_users.pluck(:user_id).uniq
     project_member_user_ids = @organization.projects.joins(:members).pluck("members.user_id").uniq
-    users = User.where(id: organization_user_ids + project_member_user_ids)
+    ids = organization_user_ids + project_member_user_ids
+    users = User.where(id: ids).reorder(Arel.sql("FIELD(users.id,#{ids.join(',')})"))
     if params[:search].present?
       search = params[:search].to_s.downcase
       user_condition_users = User.like(search).to_sql

From a0265d480887b15ff13d4e6f7a70e5c11a7634be Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 30 Nov 2023 10:36:55 +0800
Subject: [PATCH 092/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Atree?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84=E4=BD=93=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=94=9F=E6=88=90token=E9=9C=80=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Escopes=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/gitea/user/generate_token_service.rb | 2 +-
 app/views/api/v1/projects/git/trees.json.jbuilder | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/services/gitea/user/generate_token_service.rb b/app/services/gitea/user/generate_token_service.rb
index 946bd68c..e2dd6b0f 100644
--- a/app/services/gitea/user/generate_token_service.rb
+++ b/app/services/gitea/user/generate_token_service.rb
@@ -29,7 +29,7 @@ class Gitea::User::GenerateTokenService < Gitea::ClientService
   end
 
   def request_params
-    { name: "#{@username}-#{token_name}" }
+    { name: "#{@username}-#{token_name}", scopes: ["all"] }
   end
 
   def token_name
diff --git a/app/views/api/v1/projects/git/trees.json.jbuilder b/app/views/api/v1/projects/git/trees.json.jbuilder
index 0eb08f04..b560fff2 100644
--- a/app/views/api/v1/projects/git/trees.json.jbuilder
+++ b/app/views/api/v1/projects/git/trees.json.jbuilder
@@ -1,6 +1,6 @@
-json.total_count @result_object['total_count']
-json.sha @result_object['sha']
-json.entries @result_object['tree'].each do |entry|
+json.total_count @result_object[:data]['total_count'].to_i
+json.sha @result_object[:data]['sha']
+json.entries @result_object[:data]['tree'].each do |entry|
   json.name entry['path']
   json.mode entry['mode']
   json.type entry['type'] === 'blob' ? 'file' : 'dir'

From 026d58c3474324d7e2aeef8949b44e94e15955e0 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 30 Nov 2023 17:02:27 +0800
Subject: [PATCH 093/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Acompare?=
 =?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/services/api/v1/projects/compare_service.rb | 2 +-
 app/views/api/v1/projects/compare.json.jbuilder | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/services/api/v1/projects/compare_service.rb b/app/services/api/v1/projects/compare_service.rb
index 23a24830..9e646326 100644
--- a/app/services/api/v1/projects/compare_service.rb
+++ b/app/services/api/v1/projects/compare_service.rb
@@ -29,6 +29,6 @@ class Api::V1::Projects::CompareService < ApplicationService
   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
+    @gitea_data = $gitea_hat_client.get_repos_compare_by_owner_repo_baseref_headref(owner, repo, to, from, {query: request_params}) rescue nil
   end
 end
\ 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
index 2d20c51e..f45bceb8 100644
--- a/app/views/api/v1/projects/compare.json.jbuilder
+++ b/app/views/api/v1/projects/compare.json.jbuilder
@@ -14,5 +14,9 @@ json.commits @result_object['Commits'] do |commit|
   json.parent_shas commit['Sha']['ParentShas']
 end
 json.diff do 
-  json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object['Diff']
+  if @result_object['Diff'].present? 
+    json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object['Diff']
+  else 
+    json.nil! 
+  end
 end
\ No newline at end of file

From 096941ea9eb99077f314b4d7c6651439cc7ec4fb Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 5 Dec 2023 09:51:22 +0800
Subject: [PATCH 094/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AEgitea=20token=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 70de1fc6..c81b4143 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -457,7 +457,7 @@ class User < Owner
         $gitea_client.delete_users_tokens_by_username_token(self.login, e["name"], {query: {sudo: self.login} })
       }
     end
-    new_result = $gitea_client.post_users_tokens_by_username(self.login, { query: {sudo: self.login}, body:{ name: self.login} })
+    new_result = $gitea_client.post_users_tokens_by_username(self.login, { query: {sudo: self.login}, body:{ name: self.login, scopes: ["all"]} })
     if new_result["sha1"].present?
       update(gitea_token: new_result["sha1"])
     end

From c94bffd8449f16daee591f6d76ff32cc154e07cc Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 5 Dec 2023 10:21:08 +0800
Subject: [PATCH 095/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AEgitea=20token=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 c81b4143..957f80a3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -457,7 +457,7 @@ class User < Owner
         $gitea_client.delete_users_tokens_by_username_token(self.login, e["name"], {query: {sudo: self.login} })
       }
     end
-    new_result = $gitea_client.post_users_tokens_by_username(self.login, { query: {sudo: self.login}, body:{ name: self.login, scopes: ["all"]} })
+    new_result = $gitea_client.post_users_tokens_by_username(self.login, { query: {sudo: self.login}, body:{ name: "#{self.login}-#{SecureRandom.hex(6)}", scopes: ["all"]}.to_json })
     if new_result["sha1"].present?
       update(gitea_token: new_result["sha1"])
     end

From d8eeb8f1b75916e1d6b17ad8c16f0cc50623dd2d Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 26 Dec 2023 08:41:39 +0800
Subject: [PATCH 096/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=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

新增：删除者信息
---
 .../api/v1/projects/branches_controller.rb    | 11 ++++-
 .../api/v1/projects/branches/list_service.rb  |  1 -
 .../v1/projects/branches/restore_service.rb   | 47 +++++++++++++++++++
 .../_simple_gitea_detail.json.jbuilder        | 12 ++++-
 config/routes/api.rb                          |  1 +
 5 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 app/services/api/v1/projects/branches/restore_service.rb

diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb
index 40f44fea..06d426b3 100644
--- a/app/controllers/api/v1/projects/branches_controller.rb
+++ b/app/controllers/api/v1/projects/branches_controller.rb
@@ -9,7 +9,7 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
     @result_object = Api::V1::Projects::Branches::AllListService.call(@project, current_user&.gitea_token)
   end
 
-  before_action :require_operate_above, only: [:create, :destroy] 
+  before_action :require_operate_above, only: [:create, :destroy, :restore] 
 
   def create 
     @result_object = Api::V1::Projects::Branches::CreateService.call(@project, branch_params, current_user&.gitea_token)
@@ -33,6 +33,15 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
     end
   end
 
+  def restore 
+    @result_object = Api::V1::Projects::Branches::RestoreService.call(@project, params[:branch_id], params[:branch_name], current_user&.gitea_token)
+    if @result_object
+      return render_ok 
+    else 
+      return render_error('恢复分支失败!')
+    end
+  end
+  
   before_action :require_manager_above, only: [:update_default_branch] 
 
   def update_default_branch 
diff --git a/app/services/api/v1/projects/branches/list_service.rb b/app/services/api/v1/projects/branches/list_service.rb
index 590c4884..b049bb2a 100644
--- a/app/services/api/v1/projects/branches/list_service.rb
+++ b/app/services/api/v1/projects/branches/list_service.rb
@@ -18,7 +18,6 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
     load_default_branch
 
     @gitea_data[:default_branch] = @gitea_repo_data["default_branch"]
-
     @gitea_data
   end
 
diff --git a/app/services/api/v1/projects/branches/restore_service.rb b/app/services/api/v1/projects/branches/restore_service.rb
new file mode 100644
index 00000000..fbd6220e
--- /dev/null
+++ b/app/services/api/v1/projects/branches/restore_service.rb
@@ -0,0 +1,47 @@
+class Api::V1::Projects::Branches::RestoreService < ApplicationService
+   
+  include ActiveModel::Model
+
+  attr_accessor :project, :token, :owner, :repo, :branch_id, :branch_name 
+  attr_accessor :gitea_data
+
+  validates :branch_id, :branch_name, presence: true 
+
+  def initialize(project, branch_id, branch_name, token= nil)
+    @project = project 
+    @owner = project&.owner&.login 
+    @repo = project&.identifier
+    @branch_id = branch_id
+    @branch_name = branch_name
+    @token = token 
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid? 
+    excute_data_to_gitea
+
+    true
+  end
+
+  private 
+  def request_params 
+    {
+      access_token: token 
+    }
+  end
+
+  def request_body 
+    {
+      branch_id: branch_id,
+      name: branch_name,
+    }
+  end
+
+  def excute_data_to_gitea
+    begin
+      @gitea_data = $gitea_hat_client.post_repos_branches_restore_by_owner_repo(owner, repo, {query: request_params, body: request_body.to_json})
+   rescue => e
+     raise Error, '恢复分支失败!'
+    end
+  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 c9235bdb..ff0f0618 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
@@ -23,4 +23,14 @@ json.commit_time branch['commit']['timestamp']
 json.default_branch default_branch || nil
 json.http_url render_http_url(@project)
 json.zip_url render_zip_url(@owner, @project.repository, branch['name'])
-json.tar_url render_tar_url(@owner, @project.repository, branch['name'])
\ No newline at end of file
+json.tar_url render_tar_url(@owner, @project.repository, branch['name'])
+json.branch_id branch['id']
+json.is_deleted branch['is_deleted']
+json.deleted_unix branch['deleted_unix']
+json.deleted_by do 
+  if branch['is_deleted']
+    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(branch['deleted_by']), name: branch['deleted_by']['name'] }
+  else
+    json.nil!
+  end
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index f3fa24de..1133c8b3 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -80,6 +80,7 @@ defaults format: :json do
             resources :branches, param: :name, only:[:index, :create, :destroy] do 
               collection do 
                 get :all
+                post :restore
                 patch :update_default_branch
               end
             end

From a644a6549387a4b59585c5f4bf03bf0fec5de28e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 3 Jan 2024 16:34:01 +0800
Subject: [PATCH 097/130] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9Agitea=20clie?=
 =?UTF-8?q?nt=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Gemfile b/Gemfile
index 3f165215..891c636c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,4 +143,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.4.3'
+gem 'gitea-client', '~> 1.4.4'

From feec49d4bd71b6bee552796f33342ea0348ab150 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 5 Jan 2024 13:56:09 +0800
Subject: [PATCH 098/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=A0=E9=99=A4=E5=88=86=E6=94=AF=E4=B8=8E=E6=99=AE?=
 =?UTF-8?q?=E9=80=9A=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/projects/branches_controller.rb | 2 +-
 app/services/api/v1/projects/branches/list_service.rb  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb
index 06d426b3..89ebb582 100644
--- a/app/controllers/api/v1/projects/branches_controller.rb
+++ b/app/controllers/api/v1/projects/branches_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
   before_action :require_public_and_member_above, only: [:index, :all] 
 
   def index 
-    @result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], page: page, limit: limit}, current_user&.gitea_token)
+    @result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], state: params[:state], page: page, limit: limit}, current_user&.gitea_token)
   end
 
   def all 
diff --git a/app/services/api/v1/projects/branches/list_service.rb b/app/services/api/v1/projects/branches/list_service.rb
index b049bb2a..6980b71e 100644
--- a/app/services/api/v1/projects/branches/list_service.rb
+++ b/app/services/api/v1/projects/branches/list_service.rb
@@ -1,6 +1,6 @@
 class Api::V1::Projects::Branches::ListService < ApplicationService 
 
-  attr_accessor :project, :token, :owner, :repo, :name, :page, :limit
+  attr_accessor :project, :token, :owner, :repo, :name, :state, :page, :limit
   attr_accessor :gitea_data, :gitea_repo_data
 
   def initialize(project, params, token=nil)
@@ -9,6 +9,7 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
     @repo = project&.identifier 
     @token = token 
     @name = params[:name] 
+    @state = params[:state]
     @page = params[:page] 
     @limit = params[:limit]
   end
@@ -29,7 +30,8 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
       limit: limit
     }
     params.merge!({name: name}) if name.present? 
-
+    params.merge!({state: state}) if state.present?
+    
     params
   end
 

From 6a4f63d8ea532640c63978dacbb06013e41aa60e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 30 Jan 2024 14:49:54 +0800
Subject: [PATCH 099/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  2 +-
 .../api/v1/projects/commits_controller.rb     |  6 ++-
 .../api/v1/projects/commits/recent_service.rb | 37 +++++++++++++++++++
 .../v1/projects/commits/recent.json.jbuilder  | 13 +++++++
 config/routes/api.rb                          |  6 ++-
 5 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 app/services/api/v1/projects/commits/recent_service.rb
 create mode 100644 app/views/api/v1/projects/commits/recent.json.jbuilder

diff --git a/Gemfile b/Gemfile
index 891c636c..c73a6642 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,4 +143,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.4.4'
+gem 'gitea-client', '~> 1.4.5'
diff --git a/app/controllers/api/v1/projects/commits_controller.rb b/app/controllers/api/v1/projects/commits_controller.rb
index a1545ae6..9fd8de1c 100644
--- a/app/controllers/api/v1/projects/commits_controller.rb
+++ b/app/controllers/api/v1/projects/commits_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::Projects::CommitsController < Api::V1::BaseController 
-  before_action :require_public_and_member_above, only: [:index, :diff]
+  before_action :require_public_and_member_above, only: [:index, :diff, :recent]
 
   def index 
     @result_object = Api::V1::Projects::Commits::ListService.call(@project, {page: page, limit: limit, sha: params[:sha]}, current_user&.gitea_token)
@@ -9,4 +9,8 @@ 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)
   end
+
+  def recent
+    @result_object = Api::V1::Projects::Commits::RecentService.call(@project, {page: page, limit: limit}, current_user&.gitea_token)
+  end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/commits/recent_service.rb b/app/services/api/v1/projects/commits/recent_service.rb
new file mode 100644
index 00000000..fa4f65b4
--- /dev/null
+++ b/app/services/api/v1/projects/commits/recent_service.rb
@@ -0,0 +1,37 @@
+class Api::V1::Projects::Commits::RecentService < ApplicationService
+  
+  attr_reader :project, :page, :limit, :owner, :repo, :token 
+  attr_accessor :gitea_data 
+
+  def initialize(project, params, token=nil)
+    @project = project 
+    @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 
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_hat_client.get_repos_recent_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/recent.json.jbuilder b/app/views/api/v1/projects/commits/recent.json.jbuilder
new file mode 100644
index 00000000..2834b10d
--- /dev/null
+++ b/app/views/api/v1/projects/commits/recent.json.jbuilder
@@ -0,0 +1,13 @@
+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']}
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 1133c8b3..f487f8b4 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -90,7 +90,11 @@ defaults format: :json do
             delete 'tags/*name', to: "tags#destroy", via: :all
             get 'tags/*name', to: "tags#show", via: :all
 
-            resources :commits, only: [:index]
+            resources :commits, only: [:index] do 
+              collection do 
+                get :recent
+              end
+            end
             resources :code_stats, only: [:index]
             resources :contributors, only: [:index] do 
               collection do 

From 447429a663ecb427c167e873f53c1f3354ed2eef Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 31 Jan 2024 16:47:00 +0800
Subject: [PATCH 100/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E9=A1=B9=E7=9B=AEauto=5Finit=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb      | 2 +-
 app/controllers/repositories_controller.rb  | 3 ++-
 app/forms/projects/create_form.rb           | 8 ++++++--
 app/services/projects/create_service.rb     | 3 ++-
 app/services/repositories/create_service.rb | 6 +++---
 app/views/repositories/detail.json.jbuilder | 1 +
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ca6b3836..7a69c52e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -283,7 +283,7 @@ class ProjectsController < ApplicationController
   private
   def project_params
     params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier,
-                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
+                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private, :auto_init)
   end
 
   def mirror_params
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index c13d784e..98ff42a7 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -60,8 +60,9 @@ class RepositoriesController < ApplicationController
       @entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
       @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
       @path = GiteaService.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
+      @repo_detail = $gitea_client.get_repos_by_owner_repo(@owner.login, @project.identifier)
+      return render_not_found if @entries.blank? && !@repo_detail["empty"]
     end
-    return render_not_found if @entries.blank?
   end
 
   def top_counts
diff --git a/app/forms/projects/create_form.rb b/app/forms/projects/create_form.rb
index 6b86362c..308e0aa6 100644
--- a/app/forms/projects/create_form.rb
+++ b/app/forms/projects/create_form.rb
@@ -1,6 +1,6 @@
 class Projects::CreateForm < BaseForm
   attr_accessor :user_id, :name, :description, :repository_name, :project_category_id,
-                :project_language_id, :ignore_id, :license_id, :private, :owner
+                :project_language_id, :ignore_id, :license_id, :private, :owner, :auto_init
   
   validates :user_id, :name, :repository_name, presence: true
   validates :repository_name, format: { with: CustomRegexp::REPOSITORY_NAME_REGEX, multiline: true, message: "项目标识只能包含数字,字母,下划线(_),中划线(-),英文句号(.),必须以数字和字母开头，不能以下划线/中划线/英文句号开头和结尾" }
@@ -9,7 +9,7 @@ class Projects::CreateForm < BaseForm
   validates :repository_name, length: { maximum: 100 }
   validates :description, length: { maximum: 200 }
 
-  validate :check_ignore, :check_license, :check_owner, :check_max_repo_creation
+  validate :check_ignore, :check_license, :check_auto_init, :check_owner, :check_max_repo_creation
   validate do
     check_project_category(project_category_id)
     check_project_language(project_language_id)
@@ -25,6 +25,10 @@ class Projects::CreateForm < BaseForm
     raise "ignore_id值无效." if ignore_id && Ignore.find_by(id: ignore_id).blank?
   end
 
+  def check_auto_init 
+    raise "auto_init值无效." if ignore_id && license_id && !auto_init
+  end
+
   def check_owner
     @project_owner = Owner.find_by(id: user_id)
     raise "user_id值无效." if user_id && @project_owner.blank?
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index ff36dfe5..408e6621 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -61,7 +61,8 @@ class Projects::CreateService < ApplicationService
     {
       hidden: !repo_is_public,
       user_id: params[:user_id],
-      identifier: params[:repository_name]
+      identifier: params[:repository_name],
+      auto_init: params[:auto_init]
     }
   end
 
diff --git a/app/services/repositories/create_service.rb b/app/services/repositories/create_service.rb
index e7ff8bd1..9fba6122 100644
--- a/app/services/repositories/create_service.rb
+++ b/app/services/repositories/create_service.rb
@@ -67,7 +67,7 @@ class Repositories::CreateService < ApplicationService
   end
 
   def repository_params
-    params.merge(project_id: project.id)
+    params.merge(project_id: project.id).except(:auto_init)
   end
 
   def gitea_repository_params
@@ -75,7 +75,7 @@ class Repositories::CreateService < ApplicationService
       name: params[:identifier],
       private: params[:hidden],
       # readme: "ReadMe",
-      "auto_init": true,
+      auto_init: params[:auto_init],
       # "description": "string",
       # "gitignores": "string",
       # "issue_labels": "string",
@@ -89,7 +89,7 @@ class Repositories::CreateService < ApplicationService
     license = project.license
     hash = hash.merge(license: license.name) if license
     hash = hash.merge(gitignores: ignore.name) if ignore
-    hash = hash.merge(auto_init: true) if ignore || license
+    hash = hash.merge(auto_init: true) if ignore && license
     hash
   end
 end
diff --git a/app/views/repositories/detail.json.jbuilder b/app/views/repositories/detail.json.jbuilder
index 1164f403..0ef93055 100644
--- a/app/views/repositories/detail.json.jbuilder
+++ b/app/views/repositories/detail.json.jbuilder
@@ -1,3 +1,4 @@
+json.empty @result[:repo]["empty"]
 json.content @project.content
 json.website @project.website
 json.lesson_url @project.lesson_url

From 8760a8234fbf1d688b5fc5ff8bd2d6ba6fb7493e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 1 Mar 2024 10:36:57 +0800
Subject: [PATCH 101/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=93=E5=8C=BA=E6=96=87=E7=AB=A0=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=AE=80=E8=A6=81=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/getway/cms/get_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/getway/cms/get_service.rb b/app/services/getway/cms/get_service.rb
index 6b7050e8..76c5f27e 100644
--- a/app/services/getway/cms/get_service.rb
+++ b/app/services/getway/cms/get_service.rb
@@ -16,6 +16,6 @@ class Getway::Cms::GetService < Getway::ClientService
   end
 
   def url 
-    "/cms/doc/open/#{doc_id}".freeze
+    "/cms/doc/open/baseInfo/#{doc_id}".freeze
   end
 end
\ No newline at end of file

From 6e41605cbc251f1428dea4f32bb155ff9a776eda Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 1 Mar 2024 15:17:20 +0800
Subject: [PATCH 102/130] =?UTF-8?q?fixed=20=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=8F=82=E6=95=B0sha?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/interactors/gitea/delete_file_interactor.rb b/app/interactors/gitea/delete_file_interactor.rb
index 03ddf423..f94b8a20 100644
--- a/app/interactors/gitea/delete_file_interactor.rb
+++ b/app/interactors/gitea/delete_file_interactor.rb
@@ -45,6 +45,7 @@ module Gitea
       else
         Rails.logger.error("Gitea::Repository::Entries::DeleteService error[#{response.status}]======#{response.body}")
         @error = "删除失败，请确认该分支是否是保护分支。"
+        @error = "删除失败，参数sha不匹配。" if response.body.to_s.include?("sha does not match")
       end
     end
 

From f35dddbbf7ec4cd93a7fc54cff8041b9a3b9a0c6 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 1 Mar 2024 17:36:58 +0800
Subject: [PATCH 103/130] fix

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

diff --git a/app/forms/projects/create_form.rb b/app/forms/projects/create_form.rb
index 6ff8b43a..fd0128c3 100644
--- a/app/forms/projects/create_form.rb
+++ b/app/forms/projects/create_form.rb
@@ -1,6 +1,6 @@
 class Projects::CreateForm < BaseForm
   attr_accessor :user_id, :name, :description, :repository_name, :project_category_id,
-                :project_language_id, :ignore_id, :license_id, :private, :owner, :auto_init
+                :project_language_id, :ignore_id, :license_id, :private, :owner, :auto_init,
                 :blockchain, :blockchain_token_all, :blockchain_init_token
   
   validates :user_id, :name, :repository_name, presence: true

From 8eefb8ca07ae273680b2f15a3aec415925526b24 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 5 Mar 2024 09:43:34 +0800
Subject: [PATCH 104/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  2 +-
 .../v1/projects/actions/actions_controller.rb | 31 ++++++++++++++
 .../v1/projects/actions/base_controller.rb    |  4 ++
 .../v1/projects/actions/runs_controller.rb    | 12 ++++++
 .../projects/actions/runs/job_show_service.rb | 42 +++++++++++++++++++
 .../v1/projects/actions/runs/list_service.rb  | 36 ++++++++++++++++
 .../actions/actions/index.json.jbuilder       |  4 ++
 .../projects/actions/runs/index.json.jbuilder | 19 +++++++++
 .../actions/runs/job_show.json.jbuilder       | 16 +++++++
 config/routes/api.rb                          |  9 ++++
 10 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/api/v1/projects/actions/actions_controller.rb
 create mode 100644 app/controllers/api/v1/projects/actions/base_controller.rb
 create mode 100644 app/controllers/api/v1/projects/actions/runs_controller.rb
 create mode 100644 app/services/api/v1/projects/actions/runs/job_show_service.rb
 create mode 100644 app/services/api/v1/projects/actions/runs/list_service.rb
 create mode 100644 app/views/api/v1/projects/actions/actions/index.json.jbuilder
 create mode 100644 app/views/api/v1/projects/actions/runs/index.json.jbuilder
 create mode 100644 app/views/api/v1/projects/actions/runs/job_show.json.jbuilder

diff --git a/Gemfile b/Gemfile
index c73a6642..dd2bcd98 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,4 +143,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.4.5'
+gem 'gitea-client', '~> 1.4.6'
diff --git a/app/controllers/api/v1/projects/actions/actions_controller.rb b/app/controllers/api/v1/projects/actions/actions_controller.rb
new file mode 100644
index 00000000..3825b468
--- /dev/null
+++ b/app/controllers/api/v1/projects/actions/actions_controller.rb
@@ -0,0 +1,31 @@
+class Api::V1::Projects::Actions::ActionsController < Api::V1::Projects::Actions::BaseController
+
+  def index 
+    begin 
+      gitea_result = $gitea_hat_client.get_repos_actions_by_owner_repo(@project&.owner&.login, @project&.identifier)
+      @data = gitea_result[:data]["Workflows"]
+    rescue 
+      @data = []
+    end
+  end
+
+  def disable 
+    return render_error("请输入正确的流水线文件！") if params[:workflow].blank?
+    gitea_result = $gitea_hat_client.post_repos_actions_disable(@project&.owner&.login, @project&.identifier, {query: {workflow: params[:workflow]}}) rescue nil
+    if gitea_result 
+      render_ok 
+    else 
+      render_error("禁用流水线失败")
+    end
+  end 
+
+  def enable 
+    return render_error("请输入正确的流水线文件！") if params[:workflow].blank?
+    gitea_result = $gitea_hat_client.post_repos_actions_enable(@project&.owner&.login, @project&.identifier, {query: {workflow: params[:workflow]}}) rescue nil
+    if gitea_result 
+      render_ok 
+    else 
+      render_error("取消禁用流水线失败")
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/actions/base_controller.rb b/app/controllers/api/v1/projects/actions/base_controller.rb
new file mode 100644
index 00000000..d76b446a
--- /dev/null
+++ b/app/controllers/api/v1/projects/actions/base_controller.rb
@@ -0,0 +1,4 @@
+class Api::V1::Projects::Actions::BaseController < Api::V1::BaseController
+  before_action :require_public_and_member_above
+
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/projects/actions/runs_controller.rb b/app/controllers/api/v1/projects/actions/runs_controller.rb
new file mode 100644
index 00000000..fbb3e440
--- /dev/null
+++ b/app/controllers/api/v1/projects/actions/runs_controller.rb
@@ -0,0 +1,12 @@
+class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::BaseController
+
+  def index 
+    @result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, params[:workflow], current_user&.gitea_token)
+  end
+
+  def job_show 
+    @result_object = Api::V1::Projects::Actions::Runs::JobShowService.call(@project, params[:run_id], params[:job], params[:log_cursors], current_user&.gitea_token)
+    puts @result_object
+  end
+
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/actions/runs/job_show_service.rb b/app/services/api/v1/projects/actions/runs/job_show_service.rb
new file mode 100644
index 00000000..e80e882b
--- /dev/null
+++ b/app/services/api/v1/projects/actions/runs/job_show_service.rb
@@ -0,0 +1,42 @@
+class Api::V1::Projects::Actions::Runs::JobShowService < ApplicationService 
+  include ActiveModel::Model
+
+  attr_reader :project, :token, :owner, :repo, :run, :job, :log_cursors
+  attr_accessor :gitea_data 
+
+  validates :run, :job, :log_cursors, presence: true 
+
+  def initialize(project, run, job, log_cursors, token = nil)
+    @project = project
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @run = run 
+    @job = job 
+    @log_cursors = log_cursors
+    @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
+    }
+  end
+
+  def request_body
+    {
+      logCursors: log_cursors
+    }
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_hat_client.post_repos_actions_runs_jobs_by_owner_repo_run_job(owner, repo, run, job, {query: request_params, body: request_body.to_json})
+  end
+end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/actions/runs/list_service.rb b/app/services/api/v1/projects/actions/runs/list_service.rb
new file mode 100644
index 00000000..62dbc05a
--- /dev/null
+++ b/app/services/api/v1/projects/actions/runs/list_service.rb
@@ -0,0 +1,36 @@
+class Api::V1::Projects::Actions::Runs::ListService < ApplicationService
+  include ActiveModel::Model
+
+  attr_reader :project, :token, :owner, :repo, :workflow
+  attr_accessor :gitea_data 
+
+  validates :workflow, presence: true 
+
+  def initialize(project, workflow, token =nil)
+    @project = project
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @workflow = workflow
+    @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,
+      workflow: workflow
+    }
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_hat_client.get_repos_actions_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/actions/actions/index.json.jbuilder b/app/views/api/v1/projects/actions/actions/index.json.jbuilder
new file mode 100644
index 00000000..530cfc6a
--- /dev/null
+++ b/app/views/api/v1/projects/actions/actions/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.total_count @data.size 
+json.files @data.each do |file|
+  json.name file["Name"]
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/actions/runs/index.json.jbuilder b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
new file mode 100644
index 00000000..e21d86dc
--- /dev/null
+++ b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
@@ -0,0 +1,19 @@
+json.total_data @result_object[:total_data].to_i
+json.runs @result_object[:data]["Runs"].each do |run| 
+  json.workflow run["WorkflowID"]
+  json.index run["Index"]
+  json.title run["Title"]
+  json.trigger_user do 
+    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(run['TriggerUser']), name: run['TriggerUser']['Name'] }
+  end
+
+  if run["Ref"].starts_with?("refs/tags")
+    json.ref run["Ref"].gsub!("/refs/tags/", "")
+  else 
+    json.ref run["Ref"].gsub!("refs/heads/", "")
+  end
+
+  json.status run["Status"]
+  json.time_ago time_from_now(run["Stopped"])
+  json.holding_time run["Stopped"]-run["Started"]
+end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/actions/runs/job_show.json.jbuilder b/app/views/api/v1/projects/actions/runs/job_show.json.jbuilder
new file mode 100644
index 00000000..bf5ce048
--- /dev/null
+++ b/app/views/api/v1/projects/actions/runs/job_show.json.jbuilder
@@ -0,0 +1,16 @@
+json.state do 
+  json.run do 
+    json.title @result_object["state"]["run"]["title"]
+    json.status @result_object["state"]["run"]["status"]
+    json.done @result_object["state"]["run"]["done"]
+    json.jobs @result_object["state"]["run"]["jobs"]
+    json.current_job do 
+      json.title @result_object["state"]["currentJob"]["title"]
+      json.detail @result_object["state"]["currentJob"]["detail"]
+      json.steps @result_object["state"]["currentJob"]["steps"]
+    end
+  end
+end
+json.logs do 
+  json.steps_log @result_object["logs"]["stepsLog"]
+end
\ No newline at end of file
diff --git a/config/routes/api.rb b/config/routes/api.rb
index f487f8b4..20390a50 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -60,6 +60,15 @@ defaults format: :json do
 
           # projects文件夹下的
           scope module: :projects do 
+            resources :actions, module: 'actions' do
+              collection do 
+                post :disable
+                post :enable
+                resources :runs, only: [:index] do 
+                  post '/jobs/:job', to: 'runs#job_show'
+                end 
+              end
+            end
             resources :pulls, module: 'pulls' do 
               resources :versions, only: [:index] do 
                 member do 

From 2d9b97ee78693feff7a84d0dc587de054d958462 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 5 Mar 2024 10:26:36 +0800
Subject: [PATCH 105/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1/projects/actions/runs_controller.rb       |  2 +-
 .../api/v1/projects/actions/runs/list_service.rb     | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/projects/actions/runs_controller.rb b/app/controllers/api/v1/projects/actions/runs_controller.rb
index fbb3e440..b9eb9ff0 100644
--- a/app/controllers/api/v1/projects/actions/runs_controller.rb
+++ b/app/controllers/api/v1/projects/actions/runs_controller.rb
@@ -1,7 +1,7 @@
 class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::BaseController
 
   def index 
-    @result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, params[:workflow], current_user&.gitea_token)
+    @result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, {workflow: params[:workflow], page: page, limit: limit}, current_user&.gitea_token)
   end
 
   def job_show 
diff --git a/app/services/api/v1/projects/actions/runs/list_service.rb b/app/services/api/v1/projects/actions/runs/list_service.rb
index 62dbc05a..5889518c 100644
--- a/app/services/api/v1/projects/actions/runs/list_service.rb
+++ b/app/services/api/v1/projects/actions/runs/list_service.rb
@@ -1,16 +1,18 @@
 class Api::V1::Projects::Actions::Runs::ListService < ApplicationService
   include ActiveModel::Model
 
-  attr_reader :project, :token, :owner, :repo, :workflow
+  attr_reader :project, :token, :owner, :repo, :workflow, :page, :limit
   attr_accessor :gitea_data 
 
   validates :workflow, presence: true 
 
-  def initialize(project, workflow, token =nil)
+  def initialize(project, params, token =nil)
     @project = project
     @owner = project&.owner.login 
     @repo = project&.identifier
-    @workflow = workflow
+    @workflow = params[:workflow]
+    @page = params[:page] || 1
+    @limit = params[:limit] || 15
     @token = token
   end
 
@@ -25,7 +27,9 @@ class Api::V1::Projects::Actions::Runs::ListService < ApplicationService
   def request_params
     {
       access_token: token,
-      workflow: workflow
+      workflow: workflow,
+      page: page,
+      limit: limit
     }
   end
 

From dd96e1e2da15820c870379eaa509277f6b08aebb Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 6 Mar 2024 10:46:54 +0800
Subject: [PATCH 106/130] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v1/projects/actions/runs_controller.rb    |  2 +-
 .../projects/actions/runs/index.json.jbuilder | 34 +++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/controllers/api/v1/projects/actions/runs_controller.rb b/app/controllers/api/v1/projects/actions/runs_controller.rb
index b9eb9ff0..05918dbe 100644
--- a/app/controllers/api/v1/projects/actions/runs_controller.rb
+++ b/app/controllers/api/v1/projects/actions/runs_controller.rb
@@ -2,11 +2,11 @@ class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::B
 
   def index 
     @result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, {workflow: params[:workflow], page: page, limit: limit}, current_user&.gitea_token)
+    puts @result_object
   end
 
   def job_show 
     @result_object = Api::V1::Projects::Actions::Runs::JobShowService.call(@project, params[:run_id], params[:job], params[:log_cursors], current_user&.gitea_token)
-    puts @result_object
   end
 
 end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/actions/runs/index.json.jbuilder b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
index e21d86dc..ae8041ce 100644
--- a/app/views/api/v1/projects/actions/runs/index.json.jbuilder
+++ b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
@@ -1,19 +1,23 @@
 json.total_data @result_object[:total_data].to_i
-json.runs @result_object[:data]["Runs"].each do |run| 
-  json.workflow run["WorkflowID"]
-  json.index run["Index"]
-  json.title run["Title"]
-  json.trigger_user do 
-    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(run['TriggerUser']), name: run['TriggerUser']['Name'] }
-  end
+if @result_object[:data]["Runs"].present?
+  json.runs @result_object[:data]["Runs"].each do |run| 
+    json.workflow run["WorkflowID"]
+    json.index run["Index"]
+    json.title run["Title"]
+    json.trigger_user do 
+      json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(run['TriggerUser']), name: run['TriggerUser']['Name'] }
+    end
 
-  if run["Ref"].starts_with?("refs/tags")
-    json.ref run["Ref"].gsub!("/refs/tags/", "")
-  else 
-    json.ref run["Ref"].gsub!("refs/heads/", "")
-  end
+    if run["Ref"].starts_with?("refs/tags")
+      json.ref run["Ref"].gsub!("/refs/tags/", "")
+    else 
+      json.ref run["Ref"].gsub!("refs/heads/", "")
+    end
 
-  json.status run["Status"]
-  json.time_ago time_from_now(run["Stopped"])
-  json.holding_time run["Stopped"]-run["Started"]
+    json.status run["Status"]
+    json.time_ago time_from_now(run["Stopped"])
+    json.holding_time run["Stopped"]-run["Started"]
+  end
+else
+  json.runs [] 
 end
\ No newline at end of file

From 0e31daf9a871a9f44efd6d45e597812a47e41855 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 6 Mar 2024 16:27:43 +0800
Subject: [PATCH 107/130] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8Dauto=5Finit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb      | 2 +-
 app/forms/projects/create_form.rb           | 4 ++--
 app/services/projects/create_service.rb     | 3 +--
 app/services/repositories/create_service.rb | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7a69c52e..ca6b3836 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -283,7 +283,7 @@ class ProjectsController < ApplicationController
   private
   def project_params
     params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier,
-                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private, :auto_init)
+                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
   end
 
   def mirror_params
diff --git a/app/forms/projects/create_form.rb b/app/forms/projects/create_form.rb
index 308e0aa6..81bb1d79 100644
--- a/app/forms/projects/create_form.rb
+++ b/app/forms/projects/create_form.rb
@@ -1,6 +1,6 @@
 class Projects::CreateForm < BaseForm
   attr_accessor :user_id, :name, :description, :repository_name, :project_category_id,
-                :project_language_id, :ignore_id, :license_id, :private, :owner, :auto_init
+                :project_language_id, :ignore_id, :license_id, :private, :owner
   
   validates :user_id, :name, :repository_name, presence: true
   validates :repository_name, format: { with: CustomRegexp::REPOSITORY_NAME_REGEX, multiline: true, message: "项目标识只能包含数字,字母,下划线(_),中划线(-),英文句号(.),必须以数字和字母开头，不能以下划线/中划线/英文句号开头和结尾" }
@@ -9,7 +9,7 @@ class Projects::CreateForm < BaseForm
   validates :repository_name, length: { maximum: 100 }
   validates :description, length: { maximum: 200 }
 
-  validate :check_ignore, :check_license, :check_auto_init, :check_owner, :check_max_repo_creation
+  validate :check_ignore, :check_license, :check_owner, :check_max_repo_creation
   validate do
     check_project_category(project_category_id)
     check_project_language(project_language_id)
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 408e6621..ff36dfe5 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -61,8 +61,7 @@ class Projects::CreateService < ApplicationService
     {
       hidden: !repo_is_public,
       user_id: params[:user_id],
-      identifier: params[:repository_name],
-      auto_init: params[:auto_init]
+      identifier: params[:repository_name]
     }
   end
 
diff --git a/app/services/repositories/create_service.rb b/app/services/repositories/create_service.rb
index 9fba6122..4583838f 100644
--- a/app/services/repositories/create_service.rb
+++ b/app/services/repositories/create_service.rb
@@ -75,7 +75,7 @@ class Repositories::CreateService < ApplicationService
       name: params[:identifier],
       private: params[:hidden],
       # readme: "ReadMe",
-      auto_init: params[:auto_init],
+      "auto_init": true,
       # "description": "string",
       # "gitignores": "string",
       # "issue_labels": "string",
@@ -89,7 +89,7 @@ class Repositories::CreateService < ApplicationService
     license = project.license
     hash = hash.merge(license: license.name) if license
     hash = hash.merge(gitignores: ignore.name) if ignore
-    hash = hash.merge(auto_init: true) if ignore && license
+    hash = hash.merge(auto_init: true) if ignore || license
     hash
   end
 end

From 847e501dee046d47155be46751b9088644089218 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 7 Mar 2024 11:18:39 +0800
Subject: [PATCH 108/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=A8=A1=E5=9D=97=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/projects_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ca6b3836..a944e7c9 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -146,6 +146,11 @@ class ProjectsController < ApplicationController
           default_branch: @project.default_branch
         }
         Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+      elsif project_params.has_key?("has_actions")
+        gitea_params = {
+          has_actions: project_params[:has_actions]
+        }
+        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
       else
         validate_params = project_params.slice(:name, :description, 
           :project_category_id, :project_language_id, :private, :identifier)
@@ -283,7 +288,7 @@ class ProjectsController < ApplicationController
   private
   def project_params
     params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier,
-                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
+                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private, :has_actions)
   end
 
   def mirror_params

From 69754d5c1193c811f3fe8aadc7bb29a4ed724a6b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 7 Mar 2024 15:40:40 +0800
Subject: [PATCH 109/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/api/v1/projects/actions/runs/index.json.jbuilder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/api/v1/projects/actions/runs/index.json.jbuilder b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
index ae8041ce..e108f269 100644
--- a/app/views/api/v1/projects/actions/runs/index.json.jbuilder
+++ b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
@@ -15,8 +15,8 @@ if @result_object[:data]["Runs"].present?
     end
 
     json.status run["Status"]
-    json.time_ago time_from_now(run["Stopped"])
-    json.holding_time run["Stopped"]-run["Started"]
+    json.time_ago time_from_now(run["Updated"])
+    json.holding_time run["Updated"]-run["Started"]
   end
 else
   json.runs [] 

From a8997ae160c87fca3cf069c7a59083d1369dfd37 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 7 Mar 2024 15:49:14 +0800
Subject: [PATCH 110/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/api/v1/projects/actions/runs/index.json.jbuilder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/api/v1/projects/actions/runs/index.json.jbuilder b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
index e108f269..69d1b21d 100644
--- a/app/views/api/v1/projects/actions/runs/index.json.jbuilder
+++ b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
@@ -15,8 +15,8 @@ if @result_object[:data]["Runs"].present?
     end
 
     json.status run["Status"]
-    json.time_ago time_from_now(run["Updated"])
-    json.holding_time run["Updated"]-run["Started"]
+    json.time_ago time_from_now(run["Started"])
+    json.holding_time run["Status"] == 6 ? Time.now.to_i - run["Started"] : run["Stopped"] - run["Started"]
   end
 else
   json.runs [] 

From 48c5aa732f568fd8709762b20948620e1e4128b5 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 7 Mar 2024 16:00:09 +0800
Subject: [PATCH 111/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/api/v1/projects/actions/runs/index.json.jbuilder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/api/v1/projects/actions/runs/index.json.jbuilder b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
index 69d1b21d..9122ef9c 100644
--- a/app/views/api/v1/projects/actions/runs/index.json.jbuilder
+++ b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
@@ -15,8 +15,8 @@ if @result_object[:data]["Runs"].present?
     end
 
     json.status run["Status"]
-    json.time_ago time_from_now(run["Started"])
-    json.holding_time run["Status"] == 6 ? Time.now.to_i - run["Started"] : run["Stopped"] - run["Started"]
+    json.time_ago time_from_now(run["Created"])
+    json.holding_time run["Status"] == 6 ? Time.now.to_i - run["Created"] : run["Stopped"] - run["Created"]
   end
 else
   json.runs [] 

From 1e70d93a8366ee9f90ced19757b7f884499a682e Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 11 Mar 2024 09:22:07 +0800
Subject: [PATCH 112/130] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/organization.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/models/organization.rb b/app/models/organization.rb
index 237efbfe..f978611b 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -182,14 +182,6 @@ class Organization < Owner
     organization_users.count
   end
 
-  def teams_count
-    teams.count
-  end
-
-  def organization_users_count
-    organization_users.count
-  end
-
   def real_name
     name = lastname + firstname
     name = name.blank? ? (nickname.blank? ? login : nickname) : name
@@ -217,4 +209,11 @@ class Organization < Owner
     enabling_cla == true
   end
 
+  def num_users
+    organization_user_ids = self.organization_users.pluck(:user_id).uniq
+    project_member_user_ids = self.projects.joins(:members).pluck("members.user_id").uniq
+    ids = organization_user_ids + project_member_user_ids
+    ids.uniq.size
+  end
+
 end

From 780ba6c10354a351436d62f1a41f1a5e88ab8c51 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 11 Mar 2024 09:39:18 +0800
Subject: [PATCH 113/130] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/template_message_settings/_detail.json.jbuilder | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/template_message_settings/_detail.json.jbuilder b/app/views/template_message_settings/_detail.json.jbuilder
index d85a4c4e..5f6a0bf6 100644
--- a/app/views/template_message_settings/_detail.json.jbuilder
+++ b/app/views/template_message_settings/_detail.json.jbuilder
@@ -3,6 +3,7 @@ json.type_name type.constantize.type_name
 json.total_settings_count count
 json.settings do
   json.array! type.constantize.openning.limit(100).each do |setting|
-    json.(setting, :name, :key, :notification_disabled, :email_disabled)
+    json.(setting, :name, :key, :email_disabled)
+    json.notification_disabled false
   end
 end
\ No newline at end of file

From f3f63e3dd364ea8bb21f2b18933688028048bda8 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 12 Mar 2024 15:20:56 +0800
Subject: [PATCH 114/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=87=8C?=
 =?UTF-8?q?=E7=A8=8B=E7=A2=91=E6=8F=90=E9=86=92=E9=85=8D=E7=BD=AE=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message_template/project_milestone_early_expired.rb   | 8 ++++----
 app/models/template_message_setting/create_or_assign.rb   | 1 +
 app/models/user_template_message_setting.rb               | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/models/message_template/project_milestone_early_expired.rb b/app/models/message_template/project_milestone_early_expired.rb
index 5539fc36..3db1e190 100644
--- a/app/models/message_template/project_milestone_early_expired.rb
+++ b/app/models/message_template/project_milestone_early_expired.rb
@@ -19,8 +19,8 @@ class MessageTemplate::ProjectMilestoneEarlyExpired < MessageTemplate
   def self.get_message_content(receivers, milestone)
     receivers.each do |receiver|
       if receiver.user_template_message_setting.present? 
-        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::MilestoneEarlyExpired"]
-        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::MilestoneEarlyExpired"] : send_setting
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::MilestoneExpired"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::MilestoneExpired"] : send_setting
         receivers = receivers.where.not(id: receiver.id) unless send_setting
       end
     end
@@ -38,8 +38,8 @@ class MessageTemplate::ProjectMilestoneEarlyExpired < MessageTemplate
 
   def self.get_email_message_content(receiver, milestone)
     if receiver.user_template_message_setting.present? 
-      send_setting = receiver.user_template_message_setting.email_body["ManageProject::MilestoneEarlyExpired"]
-      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::MilestoneEarlyExpired"] : send_setting
+      send_setting = receiver.user_template_message_setting.email_body["ManageProject::MilestoneExpired"]
+      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::MilestoneExpired"] : send_setting
       return '', '', '' unless send_setting
       project = milestone&.project 
       owner = project&.owner 
diff --git a/app/models/template_message_setting/create_or_assign.rb b/app/models/template_message_setting/create_or_assign.rb
index 4c392b4b..2397ce5b 100644
--- a/app/models/template_message_setting/create_or_assign.rb
+++ b/app/models/template_message_setting/create_or_assign.rb
@@ -28,5 +28,6 @@ class TemplateMessageSetting::CreateOrAssign < TemplateMessageSetting
     self.find_or_create_by(name: "疑修状态变更", key: "IssueChanged")
     self.find_or_create_by(name: "合并请求状态变更", key: "PullRequestChanged")
     self.find_or_create_by(name: "疑修截止日期到达最后一天", key: "IssueExpire", notification_disabled: false)
+    self.find_or_create_by(name: "里程碑逾期提醒", key: "MilestoneExpired", notification_disabled: false, email_disabled: true)
   end
 end
diff --git a/app/models/user_template_message_setting.rb b/app/models/user_template_message_setting.rb
index 7e855b76..befd2be8 100644
--- a/app/models/user_template_message_setting.rb
+++ b/app/models/user_template_message_setting.rb
@@ -36,6 +36,7 @@ class UserTemplateMessageSetting < ApplicationRecord
       "CreateOrAssign::IssueChanged": true,
       "CreateOrAssign::PullRequestChanged": true,
       "CreateOrAssign::IssueExpire": true,
+      "CreateOrAssign::MilestoneExpired": true,
       "ManageProject::Issue": true,
       "ManageProject::PullRequest": true,
       "ManageProject::Member": true,
@@ -59,6 +60,7 @@ class UserTemplateMessageSetting < ApplicationRecord
       "CreateOrAssign::IssueChanged": false,
       "CreateOrAssign::PullRequestChanged": false,
       "CreateOrAssign::IssueExpire": false,
+      "CreateOrAssign::MilestoneExpired": false,
       "ManageProject::Issue": false,
       "ManageProject::PullRequest": false,
       "ManageProject::Member": false,

From 370a565a7c2ea1f8c3dcbcfae6b186b02d3468ed Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 13 Mar 2024 15:10:05 +0800
Subject: [PATCH 115/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Areadme=20hre?=
 =?UTF-8?q?f=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 0f3f27ac..abd45cd1 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -122,20 +122,26 @@ module RepositoriesHelper
     s_regex_1 = /\[.*?\]\((.*?)\)/
     src_regex = /src=\"(.*?)\"/
     src_regex_1 = /src=\'(.*?)\'/
+    href_regex = /href=\"(.*?)\"/
+    href_regex_1 = /href=\'(.*?)\'/
     ss_c = content.to_s.scan(s_regex_c)
     ss = content.to_s.scan(s_regex)
     ss_1 = content.to_s.scan(s_regex_1)
     ss_src = content.to_s.scan(src_regex)
     ss_src_1 = content.to_s.scan(src_regex_1)
-    total_sources = {ss_c: ss_c,ss: ss, ss_1: ss_1, ss_src: ss_src, ss_src_1: ss_src_1} 
+    ss_href = content.to_s.scan(href_regex)
+    ss_href_1 = content.to_s.scan(href_regex_1)
+    total_sources = {ss_c: ss_c,ss: ss, ss_1: ss_1, ss_src: ss_src, ss_src_1: ss_src_1, ss_href: ss_href, ss_href_1: ss_href_1} 
     # total_sources.uniq! 
     total_sources.except(:ss, :ss_c).each do |k, sources|
       sources.each do |s| 
         begin
           s_content = s[0]
+          puts s_content
           # 链接直接跳过不做替换
           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]
+          puts ext
           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]
@@ -146,6 +152,10 @@ module RepositoriesHelper
               content = content.gsub("src=\"#{s[0]}\"", "src=\"#{s_content}\"")
             when 'ss_src_1'
               content = content.gsub("src=\'#{s[0]}\'", "src=\'#{s_content}\'")
+            when 'ss_href'
+              content = content.gsub("href=\"#{s[0]}\"", "href=\"#{s_content}\"")
+            when 'ss_href_1'
+              content = content.gsub("href=\'#{s[0]}\'", "href=\'#{s_content}\'")
             else 
               content = content.gsub("(#{s[0]})", "(#{s_content})")
             end
@@ -158,6 +168,10 @@ module RepositoriesHelper
               content = content.gsub("src=\"#{s[0]}\"", "src=\"/#{s_content}\"")
             when 'ss_src_1'
               content = content.gsub("src=\'#{s[0]}\'", "src=\'/#{s_content}\'")
+            when 'ss_href'
+              content = content.gsub("href=\"#{s[0]}\"", "href=\"#{s_content}\"")
+            when 'ss_href_1'
+              content = content.gsub("href=\'#{s[0]}\'", "href=\'#{s_content}\'")
             else 
               content = content.gsub("(#{s[0]})", "(/#{s_content})")
             end

From 7d769ad118bca9f285b1c81ff92ec4c02f6c55dc Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 13 Mar 2024 16:10:43 +0800
Subject: [PATCH 116/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Areadme=20hre?=
 =?UTF-8?q?f=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index abd45cd1..24d1555c 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -137,11 +137,9 @@ module RepositoriesHelper
       sources.each do |s| 
         begin
           s_content = s[0]
-          puts s_content
           # 链接直接跳过不做替换
           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]
-          puts ext
           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]
@@ -162,7 +160,7 @@ module RepositoriesHelper
           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]
+            s_content = s_content.split("#{Rails.root}")[1]
             case k.to_s
             when 'ss_src'
               content = content.gsub("src=\"#{s[0]}\"", "src=\"/#{s_content}\"")

From c1fbea8453953a1e3849eea5138959bbe4b56940 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 14 Mar 2024 14:14:50 +0800
Subject: [PATCH 117/130] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E7=AD=BE=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/api/v1/projects/branches/delete_service.rb | 2 +-
 app/services/api/v1/projects/tags/delete_service.rb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/api/v1/projects/branches/delete_service.rb b/app/services/api/v1/projects/branches/delete_service.rb
index 28836c79..34107927 100644
--- a/app/services/api/v1/projects/branches/delete_service.rb
+++ b/app/services/api/v1/projects/branches/delete_service.rb
@@ -32,7 +32,7 @@ class Api::V1::Projects::Branches::DeleteService < ApplicationService
 
   def excute_data_to_gitea 
     begin
-      @gitea_data = $gitea_client.delete_repos_branches_by_owner_repo_branch(owner, repo, branch_name, {query: request_params}) 
+      @gitea_data = $gitea_client.delete_repos_branches_by_owner_repo_branch(owner, repo, CGI.escape(branch_name), {query: request_params}) 
     rescue => e
       raise Error, '保护分支无法删除！' if e.to_s.include?("branch protected")
       raise Error, '删除分支失败！'
diff --git a/app/services/api/v1/projects/tags/delete_service.rb b/app/services/api/v1/projects/tags/delete_service.rb
index d0d317aa..8f898bf1 100644
--- a/app/services/api/v1/projects/tags/delete_service.rb
+++ b/app/services/api/v1/projects/tags/delete_service.rb
@@ -32,7 +32,7 @@ class Api::V1::Projects::Tags::DeleteService < ApplicationService
 
   def excute_data_to_gitea 
     begin 
-      @gitea_data = $gitea_client.delete_repos_tags_by_owner_repo_tag(owner, repo, tag_name, {query: request_params})
+      @gitea_data = $gitea_client.delete_repos_tags_by_owner_repo_tag(owner, repo, CGI.escape(tag_name), {query: request_params})
     rescue => e
       raise Error, '请先删除发行版！' if e.to_s.include?("409")
       raise Error, '删除标签失败！'

From a0f1679f03e944f91db7229c3ade01adb903da8d Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Sat, 16 Mar 2024 16:03:31 +0800
Subject: [PATCH 118/130] =?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=E5=90=88=E5=B9=B6=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=96=87=E4=BB=B6=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index f5735d19..40bf61d7 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -179,6 +179,7 @@ class PullRequestsController < ApplicationController
 
   def pr_merge
     return render_forbidden("你没有权限操作.") unless @project.operator?(current_user)
+    return normal_status(-1, "该分支存在冲突，无法自动合并.") unless @pull_request.conflict_files.blank?
 
     if params[:do].blank?
       normal_status(-1, "请选择合并方式")

From c88d0c2712dbf64f03a819c34e96bf872ac7d37a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 18 Mar 2024 16:31:05 +0800
Subject: [PATCH 119/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9C=80?=
 =?UTF-8?q?=E8=BF=91=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E7=8E=B0=E5=9C=A8=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/api/v1/projects/commits/recent.json.jbuilder b/app/views/api/v1/projects/commits/recent.json.jbuilder
index 2834b10d..2f954aad 100644
--- a/app/views/api/v1/projects/commits/recent.json.jbuilder
+++ b/app/views/api/v1/projects/commits/recent.json.jbuilder
@@ -9,5 +9,6 @@ json.commits @result_object[:data].each do |commit|
     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.time_from_now time_from_now(commit['created'])
   json.parent_shas commit['parents'].map{|x|x['sha']}
 end
\ No newline at end of file

From 444c57c2379bc4d54e24ee19e710bb6643fb1bc8 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 19 Mar 2024 10:03:39 +0800
Subject: [PATCH 120/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Amarked.min.j?=
 =?UTF-8?q?s=E6=96=87=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/editormd/lib/marked.min.js | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/public/editormd/lib/marked.min.js b/public/editormd/lib/marked.min.js
index eb14b254..636c21b0 100644
--- a/public/editormd/lib/marked.min.js
+++ b/public/editormd/lib/marked.min.js
@@ -2,21 +2,8 @@
  * marked v0.3.3 - a markdown parser
  * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
  * https://github.com/chjj/marked
-    
-    备注，这个改动没启用，只是做个记录： 
-    br不转成br
-    加了个 if (cap[0] != '</br>' && cap[0] != '<br>') { out+=this.options.sanitize?escape(cap[0]):cap[0]; }
-
-   out+=this.renderer.em(this.output(cap[2]||cap[1]))   -->
-   out+=this.renderer.em(this.output(cap[2]||cap[1]), cap.input)
  */
-// 0.4.0  /^ *(#{1,6}) ——》/^ *(#{1,6})   去掉了一个空格 
-/*if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");*/
-// 说明：左边 --> 右边  左边被替换成了右边的内容
-// b(i[1].replace(/^ *| *\| *$/g,"")) --> i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */)    table没识别的问题
-// header.length===a.align.length --> header.length  table没识别的问题    
-// 2个table： b(a.cells[p],a.header.length) -> a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */)
-// .replace(/(?: *\| *)?\n$/,"")   -->  .replace(/\n$/, "")
-// /^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/  --> /^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/
-!function(e){"use strict";var t={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:d,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ *(#{1,6})*([^\n]+?) *(?:#+ *)?(?:\n+|$)/,nptable:d,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|<![A-Z][\\s\\S]*?>\\n*|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$))",def:/^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,table:d,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,text:/^[^\n]+/};function n(e){this.tokens=[],this.tokens.links={},this.options=e||m.defaults,this.rules=t.normal,this.options.pedantic?this.rules=t.pedantic:this.options.gfm&&(this.options.tables?this.rules=t.tables:this.rules=t.gfm)}t._label=/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,t._title=/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/,t.def=p(t.def).replace("label",t._label).replace("title",t._title).getRegex(),t.bullet=/(?:[*+-]|\d+\.)/,t.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,t.item=p(t.item,"gm").replace(/bull/g,t.bullet).getRegex(),t.list=p(t.list).replace(/bull/g,t.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+t.def.source+")").getRegex(),t._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",t._comment=/<!--(?!-?>)[\s\S]*?-->/,t.html=p(t.html,"i").replace("comment",t._comment).replace("tag",t._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),t.paragraph=p(t.paragraph).replace("hr",t.hr).replace("heading",t.heading).replace("lheading",t.lheading).replace("tag",t._tag).getRegex(),t.blockquote=p(t.blockquote).replace("paragraph",t.paragraph).getRegex(),t.normal=f({},t),t.gfm=f({},t.normal,{fences:/^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/,paragraph:/^/,heading:/^ *(#{1,6})+([^\n]+?) *#* *(?:\n+|$)/}),t.gfm.paragraph=p(t.paragraph).replace("(?!","(?!"+t.gfm.fences.source.replace("\\1","\\2")+"|"+t.list.source.replace("\\1","\\3")+"|").getRegex(),t.tables=f({},t.gfm,{nptable:/^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/}),t.pedantic=f({},t.normal,{html:p("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",t._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/}),n.rules=t,n.lex=function(e,t){return new n(t).lex(e)},n.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},n.prototype.token=function(e,n){var r,s,i,l,o,a,h,p,u,c,g,d,f;for(e=e.replace(/^ +$/gm,"");e;)if((i=this.rules.newline.exec(e))&&(e=e.substring(i[0].length),i[0].length>1&&this.tokens.push({type:"space"})),i=this.rules.code.exec(e))e=e.substring(i[0].length),i=i[0].replace(/^ {4}/gm,""),this.tokens.push({type:"code",text:this.options.pedantic?i:i.replace(/\n+$/,"")});else if(i=this.rules.fences.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"code",lang:i[2],text:i[3]||""});else if(i=this.rules.heading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:i[1].length,text:i[2]});else if(n&&(i=this.rules.nptable.exec(e))&&(a={type:"table",header:i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3]?i[3].replace(/\n$/,"").split("\n"):[]}).header.length){for(e=e.substring(i[0].length),p=0;p<a.align.length;p++)/^ *-+: *$/.test(a.align[p])?a.align[p]="right":/^ *:-+: *$/.test(a.align[p])?a.align[p]="center":/^ *:-+ *$/.test(a.align[p])?a.align[p]="left":a.align[p]=null;for(p=0;p<a.cells.length;p++)a.cells[p]=a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */);this.tokens.push(a)}else if(i=this.rules.hr.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"hr"});else if(i=this.rules.blockquote.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"blockquote_start"}),i=i[0].replace(/^ *> ?/gm,""),this.token(i,n),this.tokens.push({type:"blockquote_end"});else if(i=this.rules.list.exec(e)){for(e=e.substring(i[0].length),g=(l=i[2]).length>1,this.tokens.push({type:"list_start",ordered:g,start:g?+l:""}),r=!1,c=(i=i[0].match(this.rules.item)).length,p=0;p<c;p++)h=(a=i[p]).length,~(a=a.replace(/^ *([*+-]|\d+\.) +/,"")).indexOf("\n ")&&(h-=a.length,a=this.options.pedantic?a.replace(/^ {1,4}/gm,""):a.replace(new RegExp("^ {1,"+h+"}","gm"),"")),this.options.smartLists&&p!==c-1&&(l===(o=t.bullet.exec(i[p+1])[0])||l.length>1&&o.length>1||(e=i.slice(p+1).join("\n")+e,p=c-1)),s=r||/\n\n(?!\s*$)/.test(a),p!==c-1&&(r="\n"===a.charAt(a.length-1),s||(s=r)),f=void 0,(d=/^\[[ xX]\] /.test(a))&&(f=" "!==a[1],a=a.replace(/^\[[ xX]\] +/,"")),this.tokens.push({type:s?"loose_item_start":"list_item_start",task:d,checked:f}),this.token(a,!1),this.tokens.push({type:"list_item_end"});this.tokens.push({type:"list_end"})}else if(i=this.rules.html.exec(e))e=e.substring(i[0].length),this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:!this.options.sanitizer&&("pre"===i[1]||"script"===i[1]||"style"===i[1]),text:i[0]});else if(n&&(i=this.rules.def.exec(e)))e=e.substring(i[0].length),i[3]&&(i[3]=i[3].substring(1,i[3].length-1)),u=i[1].toLowerCase().replace(/\s+/g," "),this.tokens.links[u]||(this.tokens.links[u]={href:i[2],title:i[3]});else if(n&&(i=this.rules.table.exec(e))&&(a={type:"table",header:i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3]?i[3].replace(/\n$/, "").split("\n"):[]}).header.length){for(e=e.substring(i[0].length),p=0;p<a.align.length;p++)/^ *-+: *$/.test(a.align[p])?a.align[p]="right":/^ *:-+: *$/.test(a.align[p])?a.align[p]="center":/^ *:-+ *$/.test(a.align[p])?a.align[p]="left":a.align[p]=null;for(p=0;p<a.cells.length;p++)a.cells[p]=a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */);this.tokens.push(a)}else if(i=this.rules.lheading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:"="===i[2]?1:2,text:i[1]});else if(n&&(i=this.rules.paragraph.exec(e)))e=e.substring(i[0].length),this.tokens.push({type:"paragraph",text:"\n"===i[1].charAt(i[1].length-1)?i[1].slice(0,-1):i[1]});else if(i=this.rules.text.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"text",text:i[0]});else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0));return this.tokens};var r={escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:d,tag:"^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>",link:/^!?\[(label)\]\(href(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,nolink:/^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,strong:/^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)|^__([^\s])__(?!_)|^\*\*([^\s])\*\*(?!\*)/,em:/^_([^\s][\s\S]*?[^\s_])_(?!_)|^_([^\s_][\s\S]*?[^\s])_(?!_)|^\*([^\s][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*][\s\S]*?[^\s])\*(?!\*)|^_([^\s_])_(?!_)|^\*([^\s*])\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`]?)\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:d,text:/^[\s\S]+?(?=[\\<!\[`*]|\b_| {2,}\n|$)/};function s(e,t){if(this.options=t||m.defaults,this.links=e,this.rules=r.normal,this.renderer=this.options.renderer||new i,this.renderer.options=this.options,!this.links)throw new Error("Tokens array requires a `links` property.");this.options.pedantic?this.rules=r.pedantic:this.options.gfm&&(this.options.breaks?this.rules=r.breaks:this.rules=r.gfm)}function i(e){this.options=e||m.defaults}function l(){}function o(e){this.tokens=[],this.token=null,this.options=e||m.defaults,this.options.renderer=this.options.renderer||new i,this.renderer=this.options.renderer,this.renderer.options=this.options}function a(e,t){return e.replace(t?/&/g:/&(?!#?\w+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function h(e){return e.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}function p(e,t){return e=e.source||e,t=t||"",{replace:function(t,n){return n=(n=n.source||n).replace(/(^|[^\[])\^/g,"$1"),e=e.replace(t,n),this},getRegex:function(){return new RegExp(e,t)}}}function u(e,t){return c[" "+e]||(/^[^:]+:\/*[^/]*$/.test(e)?c[" "+e]=e+"/":c[" "+e]=e.replace(/[^/]*$/,"")),e=c[" "+e],"//"===t.slice(0,2)?e.replace(/:[\s\S]*/,":")+t:"/"===t.charAt(0)?e.replace(/(:\/*[^/]*)[\s\S]*/,"$1")+t:e+t}r._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,r._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,r._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,r.autolink=p(r.autolink).replace("scheme",r._scheme).replace("email",r._email).getRegex(),r._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,r.tag=p(r.tag).replace("comment",t._comment).replace("attribute",r._attribute).getRegex(),r._label=/(?:\[[^\[\]]*\]|\\[\[\]]?|`[^`]*`|[^\[\]\\])*?/,r._href=/\s*(<(?:\\[<>]?|[^\s<>\\])*>|(?:\\[()]?|\([^\s\x00-\x1f()\\]*\)|[^\s\x00-\x1f()\\])*?)/,r._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,r.link=p(r.link).replace("label",r._label).replace("href",r._href).replace("title",r._title).getRegex(),r.reflink=p(r.reflink).replace("label",r._label).getRegex(),r.normal=f({},r),r.pedantic=f({},r.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,link:p(/^!?\[(label)\]\((.*?)\)/).replace("label",r._label).getRegex(),reflink:p(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",r._label).getRegex()}),r.gfm=f({},r.normal,{escape:p(r.escape).replace("])","~|])").getRegex(),url:p(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/).replace("email",r._email).getRegex(),_backpedal:/(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:p(r.text).replace("]|","~]|").replace("|","|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&'*+/=?^_`{\\|}~-]+@|").getRegex()}),r.breaks=f({},r.gfm,{br:p(r.br).replace("{2,}","*").getRegex(),text:p(r.gfm.text).replace("{2,}","*").getRegex()}),s.rules=r,s.output=function(e,t,n){return new s(t,n).output(e)},s.prototype.output=function(e){for(var t,n,r,i,l,o="";e;)if(l=this.rules.escape.exec(e))e=e.substring(l[0].length),o+=l[1];else if(l=this.rules.autolink.exec(e))e=e.substring(l[0].length),r="@"===l[2]?"mailto:"+(n=a(this.mangle(l[1]))):n=a(l[1]),o+=this.renderer.link(r,null,n);else if(this.inLink||!(l=this.rules.url.exec(e))){if(l=this.rules.tag.exec(e))!this.inLink&&/^<a /i.test(l[0])?this.inLink=!0:this.inLink&&/^<\/a>/i.test(l[0])&&(this.inLink=!1),e=e.substring(l[0].length),o+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(l[0]):a(l[0]):l[0];else if(l=this.rules.link.exec(e))e=e.substring(l[0].length),this.inLink=!0,r=l[2],this.options.pedantic?(t=/^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(r))?(r=t[1],i=t[3]):i="":i=l[3]?l[3].slice(1,-1):"",r=r.trim().replace(/^<([\s\S]*)>$/,"$1"),o+=this.outputLink(l,{href:s.escapes(r),title:s.escapes(i)}),this.inLink=!1;else if((l=this.rules.reflink.exec(e))||(l=this.rules.nolink.exec(e))){if(e=e.substring(l[0].length),t=(l[2]||l[1]).replace(/\s+/g," "),!(t=this.links[t.toLowerCase()])||!t.href){o+=l[0].charAt(0),e=l[0].substring(1)+e;continue}this.inLink=!0,o+=this.outputLink(l,t),this.inLink=!1}else if(l=this.rules.strong.exec(e))e=e.substring(l[0].length),o+=this.renderer.strong(this.output(l[4]||l[3]||l[2]||l[1]));else if(l=this.rules.em.exec(e))e=e.substring(l[0].length),o+=this.renderer.em(this.output(l[6]||l[5]||l[4]||l[3]||l[2]||l[1]));else if(l=this.rules.code.exec(e))e=e.substring(l[0].length),o+=this.renderer.codespan(a(l[2].trim(),!0));else if(l=this.rules.br.exec(e))e=e.substring(l[0].length),o+=this.renderer.br();else if(l=this.rules.del.exec(e))e=e.substring(l[0].length),o+=this.renderer.del(this.output(l[1]));else if(l=this.rules.text.exec(e))e=e.substring(l[0].length),o+=this.renderer.text(a(this.smartypants(l[0])));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else l[0]=this.rules._backpedal.exec(l[0])[0],e=e.substring(l[0].length),"@"===l[2]?r="mailto:"+(n=a(l[0])):(n=a(l[0]),r="www."===l[1]?"http://"+n:n),o+=this.renderer.link(r,null,n);return o},s.escapes=function(e){return e?e.replace(s.rules._escapes,"$1"):e},s.prototype.outputLink=function(e,t){var n=t.href,r=t.title?a(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,a(e[1]))},s.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},s.prototype.mangle=function(e){if(!this.options.mangle)return e;for(var t,n="",r=e.length,s=0;s<r;s++)t=e.charCodeAt(s),Math.random()>.5&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},i.prototype.code=function(e,t,n){if(this.options.highlight){var r=this.options.highlight(e,t);null!=r&&r!==e&&(n=!0,e=r)}return t?'<pre><code class="'+this.options.langPrefix+a(t,!0)+'">'+(n?e:a(e,!0))+"</code></pre>\n":"<pre><code>"+(n?e:a(e,!0))+"</code></pre>"},i.prototype.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},i.prototype.html=function(e){return e},i.prototype.heading=function(e,t,n){return this.options.headerIds?"<h"+t+' id="'+this.options.headerPrefix+n.toLowerCase().replace(/[^\w]+/g,"-")+'">'+e+"</h"+t+">\n":"<h"+t+">"+e+"</h"+t+">\n"},i.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},i.prototype.list=function(e,t,n){var r=t?"ol":"ul";return"<"+r+(t&&1!==n?' start="'+n+'"':"")+">\n"+e+"</"+r+">\n"},i.prototype.listitem=function(e){return"<li>"+e+"</li>\n"},i.prototype.checkbox=function(e){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox"'+(this.options.xhtml?" /":"")+"> "},i.prototype.paragraph=function(e){return"<p>"+e+"</p>\n"},i.prototype.table=function(e,t){return t&&(t="<tbody>"+t+"</tbody>"),"<table>\n<thead>\n"+e+"</thead>\n"+t+"</table>\n"},i.prototype.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},i.prototype.tablecell=function(e,t){var n=t.header?"th":"td";return(t.align?"<"+n+' align="'+t.align+'">':"<"+n+">")+e+"</"+n+">\n"},i.prototype.strong=function(e){return"<strong>"+e+"</strong>"},i.prototype.em=function(e){return"<em>"+e+"</em>"},i.prototype.codespan=function(e){return"<code>"+e+"</code>"},i.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"},i.prototype.del=function(e){return"<del>"+e+"</del>"},i.prototype.link=function(e,t,n){if(this.options.sanitize){try{var r=decodeURIComponent(h(e)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return n}if(0===r.indexOf("javascript:")||0===r.indexOf("vbscript:")||0===r.indexOf("data:"))return n}this.options.baseUrl&&!g.test(e)&&(e=u(this.options.baseUrl,e));try{e=encodeURI(e).replace(/%25/g,"%")}catch(e){return n}var s='<a href="'+a(e)+'"';return t&&(s+=' title="'+t+'"'),s+=">"+n+"</a>"},i.prototype.image=function(e,t,n){this.options.baseUrl&&!g.test(e)&&(e=u(this.options.baseUrl,e));var r='<img src="'+e+'" alt="'+n+'"';return t&&(r+=' title="'+t+'"'),r+=this.options.xhtml?"/>":">"},i.prototype.text=function(e){return e},l.prototype.strong=l.prototype.em=l.prototype.codespan=l.prototype.del=l.prototype.text=function(e){return e},l.prototype.link=l.prototype.image=function(e,t,n){return""+n},l.prototype.br=function(){return""},o.parse=function(e,t){return new o(t).parse(e)},o.prototype.parse=function(e){this.inline=new s(e.links,this.options),this.inlineText=new s(e.links,f({},this.options,{renderer:new l})),this.tokens=e.reverse();for(var t="";this.next();)t+=this.tok();return t},o.prototype.next=function(){return this.token=this.tokens.pop()},o.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},o.prototype.parseText=function(){for(var e=this.token.text;"text"===this.peek().type;)e+="\n"+this.next().text;return this.inline.output(e)},o.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,h(this.inlineText.output(this.token.text)));case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var e,t,n,r,s="",i="";for(n="",e=0;e<this.token.header.length;e++)n+=this.renderer.tablecell(this.inline.output(this.token.header[e]),{header:!0,align:this.token.align[e]});for(s+=this.renderer.tablerow(n),e=0;e<this.token.cells.length;e++){for(t=this.token.cells[e],n="",r=0;r<t.length;r++)n+=this.renderer.tablecell(this.inline.output(t[r]),{header:!1,align:this.token.align[r]});i+=this.renderer.tablerow(n)}return this.renderer.table(s,i);case"blockquote_start":for(i="";"blockquote_end"!==this.next().type;)i+=this.tok();return this.renderer.blockquote(i);case"list_start":i="";for(var l=this.token.ordered,o=this.token.start;"list_end"!==this.next().type;)i+=this.tok();return this.renderer.list(i,l,o);case"list_item_start":for(i="",this.token.task&&(i+=this.renderer.checkbox(this.token.checked));"list_item_end"!==this.next().type;)i+="text"===this.token.type?this.parseText():this.tok();return this.renderer.listitem(i);case"loose_item_start":for(i="";"list_item_end"!==this.next().type;)i+=this.tok();return this.renderer.listitem(i);case"html":return this.renderer.html(this.token.text);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText())}};var c={},g=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;function d(){}function f(e){for(var t,n,r=1;r<arguments.length;r++)for(n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}function b(e,t){var n=e.replace(/([^\\])\|/g,"$1 |").split(/ +\| */),r=0;if(n.length>t)n.splice(t);else for(;n.length<t;)n.push("");for(;r<n.length;r++)n[r]=n[r].replace(/\\\|/g,"|");return n}function m(e,t,r){if(null==e)throw new Error("marked(): input parameter is undefined or null");/*if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");*/if(r||"function"==typeof t){r||(r=t,t=null);var s,i,l=(t=f({},m.defaults,t||{})).highlight,h=0;try{s=n.lex(e,t)}catch(e){return r(e)}i=s.length;var p=function(e){if(e)return t.highlight=l,r(e);var n;try{n=o.parse(s,t)}catch(t){e=t}return t.highlight=l,e?r(e):r(null,n)};if(!l||l.length<3)return p();if(delete t.highlight,!i)return p();for(;h<s.length;h++)!function(e){"code"!==e.type?--i||p():l(e.text,e.lang,function(t,n){return t?p(t):null==n||n===e.text?--i||p():(e.text=n,e.escaped=!0,void(--i||p()))})}(s[h])}else try{return t&&(t=f({},m.defaults,t)),o.parse(n.lex(e,t),t)}catch(e){if(e.message+="\nPlease report this to https://github.com/markedjs/marked.",(t||m.defaults).silent)return"<p>An error occurred:</p><pre>"+a(e.message+"",!0)+"</pre>";throw e}}d.exec=d,m.options=m.setOptions=function(e){return f(m.defaults,e),m},m.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new i,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,tables:!0,xhtml:!1}},m.defaults=m.getDefaults(),m.Parser=o,m.parser=o.parse,m.Renderer=i,m.TextRenderer=l,m.Lexer=n,m.lexer=n.lex,m.InlineLexer=s,m.inlineLexer=s.output,m.parse=m,"undefined"!=typeof module&&"object"==typeof exports?module.exports=m:"function"==typeof define&&define.amd?define(function(){return m}):e.marked=m}(this||("undefined"!=typeof window?window:global));
-
+(function(){var block={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:noop,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};block.bullet=/(?:[*+-]|\d+\.)/;block.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;block.item=replace(block.item,"gm")(/bull/g,block.bullet)();block.list=replace(block.list)(/bull/g,block.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+block.def.source+")")();block.blockquote=replace(block.blockquote)("def",block.def)();block._tag="(?!(?:"+"a|em|strong|small|s|cite|q|dfn|abbr|data|time|code"+"|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo"+"|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b";block.html=replace(block.html)("comment",/<!--[\s\S]*?-->/)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)(/tag/g,block._tag)();block.paragraph=replace(block.paragraph)("hr",block.hr)("heading",block.heading)("lheading",block.lheading)("blockquote",block.blockquote)("tag","<"+block._tag)("def",block.def)();block.normal=merge({},block);block.gfm=merge({},block.normal,{fences:/^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,paragraph:/^/});block.gfm.paragraph=replace(block.paragraph)("(?!","(?!"+block.gfm.fences.source.replace("\\1","\\2")+"|"+block.list.source.replace("\\1","\\3")+"|")();block.tables=merge({},block.gfm,{nptable:/^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/});function Lexer(options){this.tokens=[];this.tokens.links={};this.options=options||marked.defaults;this.rules=block.normal;if(this.options.gfm){if(this.options.tables){this.rules=block.tables}else{this.rules=block.gfm}}}Lexer.rules=block;Lexer.lex=function(src,options){var lexer=new Lexer(options);return lexer.lex(src)};Lexer.prototype.lex=function(src){src=src.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n");return this.token(src,true)};Lexer.prototype.token=function(src,top,bq){var src=src.replace(/^ +$/gm,""),next,loose,cap,bull,b,item,space,i,l;while(src){if(cap=this.rules.newline.exec(src)){src=src.substring(cap[0].length);if(cap[0].length>1){this.tokens.push({type:"space"})}}if(cap=this.rules.code.exec(src)){src=src.substring(cap[0].length);cap=cap[0].replace(/^ {4}/gm,"");this.tokens.push({type:"code",text:!this.options.pedantic?cap.replace(/\n+$/,""):cap});continue}if(cap=this.rules.fences.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"code",lang:cap[2],text:cap[3]});continue}if(cap=this.rules.heading.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"heading",depth:cap[1].length,text:cap[2]});continue}if(top&&(cap=this.rules.nptable.exec(src))){src=src.substring(cap[0].length);item={type:"table",header:cap[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:cap[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:cap[3].replace(/\n$/,"").split("\n")};for(i=0;i<item.align.length;i++){if(/^ *-+: *$/.test(item.align[i])){item.align[i]="right"}else{if(/^ *:-+: *$/.test(item.align[i])){item.align[i]="center"}else{if(/^ *:-+ *$/.test(item.align[i])){item.align[i]="left"}else{item.align[i]=null}}}}for(i=0;i<item.cells.length;i++){item.cells[i]=item.cells[i].split(/ *\| */)}this.tokens.push(item);continue}if(cap=this.rules.lheading.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"heading",depth:cap[2]==="="?1:2,text:cap[1]});continue}if(cap=this.rules.hr.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"hr"});continue}if(cap=this.rules.blockquote.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"blockquote_start"});cap=cap[0].replace(/^ *> ?/gm,"");this.token(cap,top,true);this.tokens.push({type:"blockquote_end"});continue}if(cap=this.rules.list.exec(src)){src=src.substring(cap[0].length);bull=cap[2];this.tokens.push({type:"list_start",ordered:bull.length>1});cap=cap[0].match(this.rules.item);next=false;l=cap.length;i=0;for(;i<l;i++){item=cap[i];space=item.length;item=item.replace(/^ *([*+-]|\d+\.) +/,"");if(~item.indexOf("\n ")){space-=item.length;item=!this.options.pedantic?item.replace(new RegExp("^ {1,"+space+"}","gm"),""):item.replace(/^ {1,4}/gm,"")}if(this.options.smartLists&&i!==l-1){b=block.bullet.exec(cap[i+1])[0];if(bull!==b&&!(bull.length>1&&b.length>1)){src=cap.slice(i+1).join("\n")+src;i=l-1}}loose=next||/\n\n(?!\s*$)/.test(item);if(i!==l-1){next=item.charAt(item.length-1)==="\n";if(!loose){loose=next}}this.tokens.push({type:loose?"loose_item_start":"list_item_start"});this.token(item,false,bq);
+this.tokens.push({type:"list_item_end"})}this.tokens.push({type:"list_end"});continue}if(cap=this.rules.html.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:cap[1]==="pre"||cap[1]==="script"||cap[1]==="style",text:cap[0]});continue}if((!bq&&top)&&(cap=this.rules.def.exec(src))){src=src.substring(cap[0].length);this.tokens.links[cap[1].toLowerCase()]={href:cap[2],title:cap[3]};continue}if(top&&(cap=this.rules.table.exec(src))){src=src.substring(cap[0].length);item={type:"table",header:cap[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:cap[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:cap[3].replace(/(?: *\| *)?\n$/,"").split("\n")};for(i=0;i<item.align.length;i++){if(/^ *-+: *$/.test(item.align[i])){item.align[i]="right"}else{if(/^ *:-+: *$/.test(item.align[i])){item.align[i]="center"}else{if(/^ *:-+ *$/.test(item.align[i])){item.align[i]="left"}else{item.align[i]=null}}}}for(i=0;i<item.cells.length;i++){item.cells[i]=item.cells[i].replace(/^ *\| *| *\| *$/g,"").split(/ *\| */)}this.tokens.push(item);continue}if(top&&(cap=this.rules.paragraph.exec(src))){src=src.substring(cap[0].length);this.tokens.push({type:"paragraph",text:cap[1].charAt(cap[1].length-1)==="\n"?cap[1].slice(0,-1):cap[1]});continue}if(cap=this.rules.text.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"text",text:cap[0]});continue}if(src){throw new Error("Infinite loop on byte: "+src.charCodeAt(0))}}return this.tokens};var inline={escape:/^\\([\\`*{}\[\]()#+\-.!_>])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:noop,tag:/^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:noop,text:/^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/};inline._inside=/(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;inline._href=/\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;inline.link=replace(inline.link)("inside",inline._inside)("href",inline._href)();inline.reflink=replace(inline.reflink)("inside",inline._inside)();inline.normal=merge({},inline);inline.pedantic=merge({},inline.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/});inline.gfm=merge({},inline.normal,{escape:replace(inline.escape)("])","~|])")(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:replace(inline.text)("]|","~]|")("|","|https?://|")()});inline.breaks=merge({},inline.gfm,{br:replace(inline.br)("{2,}","*")(),text:replace(inline.gfm.text)("{2,}","*")()});function InlineLexer(links,options){this.options=options||marked.defaults;this.links=links;this.rules=inline.normal;this.renderer=this.options.renderer||new Renderer;this.renderer.options=this.options;if(!this.links){throw new Error("Tokens array requires a `links` property.")}if(this.options.gfm){if(this.options.breaks){this.rules=inline.breaks}else{this.rules=inline.gfm}}else{if(this.options.pedantic){this.rules=inline.pedantic}}}InlineLexer.rules=inline;InlineLexer.output=function(src,links,options){var inline=new InlineLexer(links,options);return inline.output(src)};InlineLexer.prototype.output=function(src){var out="",link,text,href,cap;while(src){if(cap=this.rules.escape.exec(src)){src=src.substring(cap[0].length);out+=cap[1];continue}if(cap=this.rules.autolink.exec(src)){src=src.substring(cap[0].length);if(cap[2]==="@"){text=cap[1].charAt(6)===":"?this.mangle(cap[1].substring(7)):this.mangle(cap[1]);href=this.mangle("mailto:")+text}else{text=escape(cap[1]);href=text}out+=this.renderer.link(href,null,text);continue}if(!this.inLink&&(cap=this.rules.url.exec(src))){src=src.substring(cap[0].length);text=escape(cap[1]);href=text;out+=this.renderer.link(href,null,text);continue}if(cap=this.rules.tag.exec(src)){if(!this.inLink&&/^<a /i.test(cap[0])){this.inLink=true}else{if(this.inLink&&/^<\/a>/i.test(cap[0])){this.inLink=false}}src=src.substring(cap[0].length);out+=this.options.sanitize?escape(cap[0]):cap[0];continue}if(cap=this.rules.link.exec(src)){src=src.substring(cap[0].length);this.inLink=true;out+=this.outputLink(cap,{href:cap[2],title:cap[3]});this.inLink=false;continue}if((cap=this.rules.reflink.exec(src))||(cap=this.rules.nolink.exec(src))){src=src.substring(cap[0].length);link=(cap[2]||cap[1]).replace(/\s+/g," ");link=this.links[link.toLowerCase()];if(!link||!link.href){out+=cap[0].charAt(0);src=cap[0].substring(1)+src;continue}this.inLink=true;out+=this.outputLink(cap,link);this.inLink=false;continue}if(cap=this.rules.strong.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.strong(this.output(cap[2]||cap[1]));continue}if(cap=this.rules.em.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.em(this.output(cap[2]||cap[1]));continue
+}if(cap=this.rules.code.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.codespan(escape(cap[2],true));continue}if(cap=this.rules.br.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.br();continue}if(cap=this.rules.del.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.del(this.output(cap[1]));continue}if(cap=this.rules.text.exec(src)){src=src.substring(cap[0].length);out+=escape(this.smartypants(cap[0]));continue}if(src){throw new Error("Infinite loop on byte: "+src.charCodeAt(0))}}return out};InlineLexer.prototype.outputLink=function(cap,link){var href=escape(link.href),title=link.title?escape(link.title):null;return cap[0].charAt(0)!=="!"?this.renderer.link(href,title,this.output(cap[1])):this.renderer.image(href,title,escape(cap[1]))};InlineLexer.prototype.smartypants=function(text){if(!this.options.smartypants){return text}return text.replace(/--/g,"\u2014").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1\u2018").replace(/'/g,"\u2019").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1\u201c").replace(/"/g,"\u201d").replace(/\.{3}/g,"\u2026")};InlineLexer.prototype.mangle=function(text){var out="",l=text.length,i=0,ch;for(;i<l;i++){ch=text.charCodeAt(i);if(Math.random()>0.5){ch="x"+ch.toString(16)}out+="&#"+ch+";"}return out};function Renderer(options){this.options=options||{}}Renderer.prototype.code=function(code,lang,escaped){if(this.options.highlight){var out=this.options.highlight(code,lang);if(out!=null&&out!==code){escaped=true;code=out}}if(!lang){return"<pre><code>"+(escaped?code:escape(code,true))+"\n</code></pre>"}return'<pre><code class="'+this.options.langPrefix+escape(lang,true)+'">'+(escaped?code:escape(code,true))+"\n</code></pre>\n"};Renderer.prototype.blockquote=function(quote){return"<blockquote>\n"+quote+"</blockquote>\n"};Renderer.prototype.html=function(html){return html};Renderer.prototype.heading=function(text,level,raw){return"<h"+level+' id="'+this.options.headerPrefix+raw.toLowerCase().replace(/[^\w]+/g,"-")+'">'+text+"</h"+level+">\n"};Renderer.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"};Renderer.prototype.list=function(body,ordered){var type=ordered?"ol":"ul";return"<"+type+">\n"+body+"</"+type+">\n"};Renderer.prototype.listitem=function(text){return"<li>"+text+"</li>\n"};Renderer.prototype.paragraph=function(text){return"<p>"+text+"</p>\n"};Renderer.prototype.table=function(header,body){return"<table>\n"+"<thead>\n"+header+"</thead>\n"+"<tbody>\n"+body+"</tbody>\n"+"</table>\n"};Renderer.prototype.tablerow=function(content){return"<tr>\n"+content+"</tr>\n"};Renderer.prototype.tablecell=function(content,flags){var type=flags.header?"th":"td";var tag=flags.align?"<"+type+' style="text-align:'+flags.align+'">':"<"+type+">";return tag+content+"</"+type+">\n"};Renderer.prototype.strong=function(text){return"<strong>"+text+"</strong>"};Renderer.prototype.em=function(text){return"<em>"+text+"</em>"};Renderer.prototype.codespan=function(text){return"<code>"+text+"</code>"};Renderer.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"};Renderer.prototype.del=function(text){return"<del>"+text+"</del>"};Renderer.prototype.link=function(href,title,text){if(this.options.sanitize){try{var prot=decodeURIComponent(unescape(href)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return""}if(prot.indexOf("javascript:")===0||prot.indexOf("vbscript:")===0){return""}}var out='<a href="'+href+'"';if(title){out+=' title="'+title+'"'}out+=">"+text+"</a>";return out};Renderer.prototype.image=function(href,title,text){var out='<img src="'+href+'" alt="'+text+'"';if(title){out+=' title="'+title+'"'}out+=this.options.xhtml?"/>":">";return out};function Parser(options){this.tokens=[];this.token=null;this.options=options||marked.defaults;this.options.renderer=this.options.renderer||new Renderer;this.renderer=this.options.renderer;this.renderer.options=this.options}Parser.parse=function(src,options,renderer){var parser=new Parser(options,renderer);return parser.parse(src)};Parser.prototype.parse=function(src){this.inline=new InlineLexer(src.links,this.options,this.renderer);this.tokens=src.reverse();var out="";while(this.next()){out+=this.tok()}return out};Parser.prototype.next=function(){return this.token=this.tokens.pop()};Parser.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0};Parser.prototype.parseText=function(){var body=this.token.text;while(this.peek().type==="text"){body+="\n"+this.next().text}return this.inline.output(body)};Parser.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text);case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var header="",body="",i,row,cell,flags,j;cell="";for(i=0;i<this.token.header.length;i++){flags={header:true,align:this.token.align[i]};cell+=this.renderer.tablecell(this.inline.output(this.token.header[i]),{header:true,align:this.token.align[i]})
+}header+=this.renderer.tablerow(cell);for(i=0;i<this.token.cells.length;i++){row=this.token.cells[i];cell="";for(j=0;j<row.length;j++){cell+=this.renderer.tablecell(this.inline.output(row[j]),{header:false,align:this.token.align[j]})}body+=this.renderer.tablerow(cell)}return this.renderer.table(header,body);case"blockquote_start":var body="";while(this.next().type!=="blockquote_end"){body+=this.tok()}return this.renderer.blockquote(body);case"list_start":var body="",ordered=this.token.ordered;while(this.next().type!=="list_end"){body+=this.tok()}return this.renderer.list(body,ordered);case"list_item_start":var body="";while(this.next().type!=="list_item_end"){body+=this.token.type==="text"?this.parseText():this.tok()}return this.renderer.listitem(body);case"loose_item_start":var body="";while(this.next().type!=="list_item_end"){body+=this.tok()}return this.renderer.listitem(body);case"html":var html=!this.token.pre&&!this.options.pedantic?this.inline.output(this.token.text):this.token.text;return this.renderer.html(html);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText())}};function escape(html,encode){return html.replace(!encode?/&(?!#?\w+;)/g:/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function unescape(html){return html.replace(/&([#\w]+);/g,function(_,n){n=n.toLowerCase();if(n==="colon"){return":"}if(n.charAt(0)==="#"){return n.charAt(1)==="x"?String.fromCharCode(parseInt(n.substring(2),16)):String.fromCharCode(+n.substring(1))}return""})}function replace(regex,opt){regex=regex.source;opt=opt||"";return function self(name,val){if(!name){return new RegExp(regex,opt)}val=val.source||val;val=val.replace(/(^|[^\[])\^/g,"$1");regex=regex.replace(name,val);return self}}function noop(){}noop.exec=noop;function merge(obj){var i=1,target,key;for(;i<arguments.length;i++){target=arguments[i];for(key in target){if(Object.prototype.hasOwnProperty.call(target,key)){obj[key]=target[key]}}}return obj}function marked(src,opt,callback){if(callback||typeof opt==="function"){if(!callback){callback=opt;opt=null}opt=merge({},marked.defaults,opt||{});var highlight=opt.highlight,tokens,pending,i=0;try{tokens=Lexer.lex(src,opt)}catch(e){return callback(e)}pending=tokens.length;var done=function(err){if(err){opt.highlight=highlight;return callback(err)}var out;try{out=Parser.parse(tokens,opt)}catch(e){err=e}opt.highlight=highlight;return err?callback(err):callback(null,out)};if(!highlight||highlight.length<3){return done()}delete opt.highlight;if(!pending){return done()}for(;i<tokens.length;i++){(function(token){if(token.type!=="code"){return --pending||done()}return highlight(token.text,token.lang,function(err,code){if(err){return done(err)}if(code==null||code===token.text){return --pending||done()}token.text=code;token.escaped=true;--pending||done()})})(tokens[i])}return}try{if(opt){opt=merge({},marked.defaults,opt)}return Parser.parse(Lexer.lex(src,opt),opt)}catch(e){e.message+="\nPlease report this to https://github.com/chjj/marked.";if((opt||marked.defaults).silent){return"<p>An error occured:</p><pre>"+escape(e.message+"",true)+"</pre>"}throw e}}marked.options=marked.setOptions=function(opt){merge(marked.defaults,opt);return marked};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,smartLists:false,silent:false,highlight:null,langPrefix:"lang-",smartypants:false,headerPrefix:"",renderer:new Renderer,xhtml:false};marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;marked.Lexer=Lexer;marked.lexer=Lexer.lex;marked.InlineLexer=InlineLexer;marked.inlineLexer=InlineLexer.output;marked.parse=marked;if(typeof module!=="undefined"&&typeof exports==="object"){module.exports=marked}else{if(typeof define==="function"&&define.amd){define(function(){return marked})}else{this.marked=marked}}}).call(function(){return this||(typeof window!=="undefined"?window:global)}());
\ No newline at end of file

From fd6f904f7e5aed21ed4b1bc9dc8dfcd7535eeccc Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 20 Mar 2024 09:13:29 +0800
Subject: [PATCH 121/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9C=80?=
 =?UTF-8?q?=E8=BF=91=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8message=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/projects/commits_controller.rb  | 2 +-
 app/services/api/v1/projects/commits/recent_service.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/v1/projects/commits_controller.rb b/app/controllers/api/v1/projects/commits_controller.rb
index 9fd8de1c..21987f4f 100644
--- a/app/controllers/api/v1/projects/commits_controller.rb
+++ b/app/controllers/api/v1/projects/commits_controller.rb
@@ -11,6 +11,6 @@ class Api::V1::Projects::CommitsController < Api::V1::BaseController
   end
 
   def recent
-    @result_object = Api::V1::Projects::Commits::RecentService.call(@project, {page: page, limit: limit}, current_user&.gitea_token)
+    @result_object = Api::V1::Projects::Commits::RecentService.call(@project, {keyword: params[:keyword], page: page, limit: limit}, current_user&.gitea_token)
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/commits/recent_service.rb b/app/services/api/v1/projects/commits/recent_service.rb
index fa4f65b4..9bc77dfc 100644
--- a/app/services/api/v1/projects/commits/recent_service.rb
+++ b/app/services/api/v1/projects/commits/recent_service.rb
@@ -1,12 +1,13 @@
 class Api::V1::Projects::Commits::RecentService < ApplicationService
   
-  attr_reader :project, :page, :limit, :owner, :repo, :token 
+  attr_reader :project, :page, :limit, :keyword, :owner, :repo, :token 
   attr_accessor :gitea_data 
 
   def initialize(project, params, token=nil)
     @project = project 
     @page = params[:page] || 1 
     @limit = params[:limit] || 15
+    @keyword = params[:keyword]
     @owner = project&.owner&.login
     @repo = project&.identifier
     @token = token 
@@ -25,6 +26,7 @@ class Api::V1::Projects::Commits::RecentService < ApplicationService
       page: page,
       limit: limit
     }
+    param.merge!(keyword: keyword) if keyword.present?
 
     param 
   end

From b8b5828a7c5eb3006a35d71ee4bf986c4690aeac Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 20 Mar 2024 10:47:36 +0800
Subject: [PATCH 122/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B9=E7=9B=AEprivate=E5=8F=82=E6=95=B0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E9=A1=B9=E7=9B=AEis=5Fpublic=E7=9A=84?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a944e7c9..445c6db7 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -157,7 +157,7 @@ class ProjectsController < ApplicationController
   
         Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier, project_name: @project.name)).validate!
   
-        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false
+        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || !@project.is_public
 
         new_project_params = project_params.except(:private).merge(is_public: !private)
         @project.update_attributes!(new_project_params)

From e891d52c32a2bede9c2c37afac187c48a6dc95fd Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 21 Mar 2024 10:11:58 +0800
Subject: [PATCH 123/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aacge=20?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/oauth/acge_controller.rb | 32 ++++++++++++++++++++++++
 app/models/open_users/acge.rb            | 27 ++++++++++++++++++++
 config/routes.rb                         |  1 +
 3 files changed, 60 insertions(+)
 create mode 100644 app/controllers/oauth/acge_controller.rb
 create mode 100644 app/models/open_users/acge.rb

diff --git a/app/controllers/oauth/acge_controller.rb b/app/controllers/oauth/acge_controller.rb
new file mode 100644
index 00000000..5afc57c6
--- /dev/null
+++ b/app/controllers/oauth/acge_controller.rb
@@ -0,0 +1,32 @@
+class Oauth::AcgeController < Oauth::BaseController
+  include RegisterHelper
+
+  def create 
+    begin
+      code = params['code'].to_s.strip
+      tip_exception("code不能为空") if code.blank?
+      uid = params['uid'].to_s.strip
+      tip_exception("uid不能为空") if uid.blank?
+      redirect_uri = params['redirect_uri'].to_s.strip
+      tip_exception("redirect_uri不能为空") if redirect_uri.blank?
+
+      open_user = OpenUsers::Acge.find_by(uid: uid)
+      if open_user.present? && open_user.user.present?
+        successful_authentication(open_user.user)
+        redirect_to redirect_uri
+        return
+      else
+        if current_user.blank? || !current_user.logged?
+          session[:unionid] = uid 
+        else
+          OpenUsers::Acge.create!(user: current_user, uid: uid)
+        end
+      end
+
+      Rails.logger.info("[OAuth2] session[:unionid] -> #{session[:unionid]}")
+      redirect_to "/bindlogin/acge?redirect_uri=#{redirect_uri}"
+    rescue Exception => ex
+      render_error(ex.message)
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/open_users/acge.rb b/app/models/open_users/acge.rb
new file mode 100644
index 00000000..59963b91
--- /dev/null
+++ b/app/models/open_users/acge.rb
@@ -0,0 +1,27 @@
+# == Schema Information
+#
+# Table name: open_users
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  type       :string(255)
+#  uid        :string(255)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  extra      :text(65535)
+#
+# Indexes
+#
+#  index_open_users_on_type_and_uid  (type,uid) UNIQUE
+#  index_open_users_on_user_id       (user_id)
+#
+
+class OpenUsers::Acge < OpenUser
+  def nickname
+    extra&.[]('nickname')
+  end
+
+  def en_type
+    'acge'
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index a165a3d1..b5f5c75c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,6 +24,7 @@ Rails.application.routes.draw do
   # get 'auth/qq/callback', to: 'oauth/qq#create'
   get 'auth/failure', to: 'oauth/base#auth_failure'
   get 'auth/cas/callback', to: 'oauth/cas#create'
+  get 'auth/acge/callback', to: "oauth/acge#create"
   get 'auth/:provider/callback', to: 'oauth/callbacks#create'
 
   get 'oauth/bind', to: 'oauth/educoder#bind'

From 7bdab0bc535ccef9b3d0cc5732355e86ce92b1c9 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 21 Mar 2024 10:16:04 +0800
Subject: [PATCH 124/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Abinduser=20t?=
 =?UTF-8?q?ype=E7=B1=BB=E5=9E=8B=E6=96=B0=E5=A2=9Eacge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/bind_users_controller.rb b/app/controllers/bind_users_controller.rb
index f5ed3380..b8c25dd7 100644
--- a/app/controllers/bind_users_controller.rb
+++ b/app/controllers/bind_users_controller.rb
@@ -8,7 +8,7 @@ class BindUsersController < ApplicationController
     bind_user = User.try_to_login(params[:username], params[:password])
     tip_exception '用户名或者密码错误' if bind_user.blank?
     tip_exception '用户名或者密码错误' unless bind_user.check_password?(params[:password].to_s)
-    tip_exception '参数错误' unless ["qq", "wechat", "gitee", "github", "educoder"].include?(params[:type].to_s)
+    tip_exception '参数错误' unless ["qq", "wechat", "gitee", "github", "educoder", "acge"].include?(params[:type].to_s)
     tip_exception '该账号已被绑定，请更换其他账号进行绑定' if bind_user.bind_open_user?(params[:type].to_s)
 
     "OpenUsers::#{params[:type].to_s.capitalize}".constantize.create!(user: bind_user, uid: session[:unionid])

From d6acce86a7b57e7bdb88d6d51a2709bab0d4a313 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 21 Mar 2024 10:28:01 +0800
Subject: [PATCH 125/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Amarked.min.j?=
 =?UTF-8?q?s=E6=96=87=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/editormd/lib/marked.min.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/public/editormd/lib/marked.min.js b/public/editormd/lib/marked.min.js
index 636c21b0..9fdbc848 100644
--- a/public/editormd/lib/marked.min.js
+++ b/public/editormd/lib/marked.min.js
@@ -1,9 +1,6 @@
 /**
- * marked v0.3.3 - a markdown parser
- * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
- * https://github.com/chjj/marked
+ * marked - a markdown parser
+ * Copyright (c) 2011-2021, Christopher Jeffrey. (MIT Licensed)
+ * https://github.com/markedjs/marked
  */
-(function(){var block={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:noop,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};block.bullet=/(?:[*+-]|\d+\.)/;block.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;block.item=replace(block.item,"gm")(/bull/g,block.bullet)();block.list=replace(block.list)(/bull/g,block.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+block.def.source+")")();block.blockquote=replace(block.blockquote)("def",block.def)();block._tag="(?!(?:"+"a|em|strong|small|s|cite|q|dfn|abbr|data|time|code"+"|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo"+"|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b";block.html=replace(block.html)("comment",/<!--[\s\S]*?-->/)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)(/tag/g,block._tag)();block.paragraph=replace(block.paragraph)("hr",block.hr)("heading",block.heading)("lheading",block.lheading)("blockquote",block.blockquote)("tag","<"+block._tag)("def",block.def)();block.normal=merge({},block);block.gfm=merge({},block.normal,{fences:/^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,paragraph:/^/});block.gfm.paragraph=replace(block.paragraph)("(?!","(?!"+block.gfm.fences.source.replace("\\1","\\2")+"|"+block.list.source.replace("\\1","\\3")+"|")();block.tables=merge({},block.gfm,{nptable:/^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/});function Lexer(options){this.tokens=[];this.tokens.links={};this.options=options||marked.defaults;this.rules=block.normal;if(this.options.gfm){if(this.options.tables){this.rules=block.tables}else{this.rules=block.gfm}}}Lexer.rules=block;Lexer.lex=function(src,options){var lexer=new Lexer(options);return lexer.lex(src)};Lexer.prototype.lex=function(src){src=src.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n");return this.token(src,true)};Lexer.prototype.token=function(src,top,bq){var src=src.replace(/^ +$/gm,""),next,loose,cap,bull,b,item,space,i,l;while(src){if(cap=this.rules.newline.exec(src)){src=src.substring(cap[0].length);if(cap[0].length>1){this.tokens.push({type:"space"})}}if(cap=this.rules.code.exec(src)){src=src.substring(cap[0].length);cap=cap[0].replace(/^ {4}/gm,"");this.tokens.push({type:"code",text:!this.options.pedantic?cap.replace(/\n+$/,""):cap});continue}if(cap=this.rules.fences.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"code",lang:cap[2],text:cap[3]});continue}if(cap=this.rules.heading.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"heading",depth:cap[1].length,text:cap[2]});continue}if(top&&(cap=this.rules.nptable.exec(src))){src=src.substring(cap[0].length);item={type:"table",header:cap[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:cap[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:cap[3].replace(/\n$/,"").split("\n")};for(i=0;i<item.align.length;i++){if(/^ *-+: *$/.test(item.align[i])){item.align[i]="right"}else{if(/^ *:-+: *$/.test(item.align[i])){item.align[i]="center"}else{if(/^ *:-+ *$/.test(item.align[i])){item.align[i]="left"}else{item.align[i]=null}}}}for(i=0;i<item.cells.length;i++){item.cells[i]=item.cells[i].split(/ *\| */)}this.tokens.push(item);continue}if(cap=this.rules.lheading.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"heading",depth:cap[2]==="="?1:2,text:cap[1]});continue}if(cap=this.rules.hr.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"hr"});continue}if(cap=this.rules.blockquote.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"blockquote_start"});cap=cap[0].replace(/^ *> ?/gm,"");this.token(cap,top,true);this.tokens.push({type:"blockquote_end"});continue}if(cap=this.rules.list.exec(src)){src=src.substring(cap[0].length);bull=cap[2];this.tokens.push({type:"list_start",ordered:bull.length>1});cap=cap[0].match(this.rules.item);next=false;l=cap.length;i=0;for(;i<l;i++){item=cap[i];space=item.length;item=item.replace(/^ *([*+-]|\d+\.) +/,"");if(~item.indexOf("\n ")){space-=item.length;item=!this.options.pedantic?item.replace(new RegExp("^ {1,"+space+"}","gm"),""):item.replace(/^ {1,4}/gm,"")}if(this.options.smartLists&&i!==l-1){b=block.bullet.exec(cap[i+1])[0];if(bull!==b&&!(bull.length>1&&b.length>1)){src=cap.slice(i+1).join("\n")+src;i=l-1}}loose=next||/\n\n(?!\s*$)/.test(item);if(i!==l-1){next=item.charAt(item.length-1)==="\n";if(!loose){loose=next}}this.tokens.push({type:loose?"loose_item_start":"list_item_start"});this.token(item,false,bq);
-this.tokens.push({type:"list_item_end"})}this.tokens.push({type:"list_end"});continue}if(cap=this.rules.html.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:cap[1]==="pre"||cap[1]==="script"||cap[1]==="style",text:cap[0]});continue}if((!bq&&top)&&(cap=this.rules.def.exec(src))){src=src.substring(cap[0].length);this.tokens.links[cap[1].toLowerCase()]={href:cap[2],title:cap[3]};continue}if(top&&(cap=this.rules.table.exec(src))){src=src.substring(cap[0].length);item={type:"table",header:cap[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:cap[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:cap[3].replace(/(?: *\| *)?\n$/,"").split("\n")};for(i=0;i<item.align.length;i++){if(/^ *-+: *$/.test(item.align[i])){item.align[i]="right"}else{if(/^ *:-+: *$/.test(item.align[i])){item.align[i]="center"}else{if(/^ *:-+ *$/.test(item.align[i])){item.align[i]="left"}else{item.align[i]=null}}}}for(i=0;i<item.cells.length;i++){item.cells[i]=item.cells[i].replace(/^ *\| *| *\| *$/g,"").split(/ *\| */)}this.tokens.push(item);continue}if(top&&(cap=this.rules.paragraph.exec(src))){src=src.substring(cap[0].length);this.tokens.push({type:"paragraph",text:cap[1].charAt(cap[1].length-1)==="\n"?cap[1].slice(0,-1):cap[1]});continue}if(cap=this.rules.text.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"text",text:cap[0]});continue}if(src){throw new Error("Infinite loop on byte: "+src.charCodeAt(0))}}return this.tokens};var inline={escape:/^\\([\\`*{}\[\]()#+\-.!_>])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:noop,tag:/^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:noop,text:/^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/};inline._inside=/(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;inline._href=/\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;inline.link=replace(inline.link)("inside",inline._inside)("href",inline._href)();inline.reflink=replace(inline.reflink)("inside",inline._inside)();inline.normal=merge({},inline);inline.pedantic=merge({},inline.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/});inline.gfm=merge({},inline.normal,{escape:replace(inline.escape)("])","~|])")(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:replace(inline.text)("]|","~]|")("|","|https?://|")()});inline.breaks=merge({},inline.gfm,{br:replace(inline.br)("{2,}","*")(),text:replace(inline.gfm.text)("{2,}","*")()});function InlineLexer(links,options){this.options=options||marked.defaults;this.links=links;this.rules=inline.normal;this.renderer=this.options.renderer||new Renderer;this.renderer.options=this.options;if(!this.links){throw new Error("Tokens array requires a `links` property.")}if(this.options.gfm){if(this.options.breaks){this.rules=inline.breaks}else{this.rules=inline.gfm}}else{if(this.options.pedantic){this.rules=inline.pedantic}}}InlineLexer.rules=inline;InlineLexer.output=function(src,links,options){var inline=new InlineLexer(links,options);return inline.output(src)};InlineLexer.prototype.output=function(src){var out="",link,text,href,cap;while(src){if(cap=this.rules.escape.exec(src)){src=src.substring(cap[0].length);out+=cap[1];continue}if(cap=this.rules.autolink.exec(src)){src=src.substring(cap[0].length);if(cap[2]==="@"){text=cap[1].charAt(6)===":"?this.mangle(cap[1].substring(7)):this.mangle(cap[1]);href=this.mangle("mailto:")+text}else{text=escape(cap[1]);href=text}out+=this.renderer.link(href,null,text);continue}if(!this.inLink&&(cap=this.rules.url.exec(src))){src=src.substring(cap[0].length);text=escape(cap[1]);href=text;out+=this.renderer.link(href,null,text);continue}if(cap=this.rules.tag.exec(src)){if(!this.inLink&&/^<a /i.test(cap[0])){this.inLink=true}else{if(this.inLink&&/^<\/a>/i.test(cap[0])){this.inLink=false}}src=src.substring(cap[0].length);out+=this.options.sanitize?escape(cap[0]):cap[0];continue}if(cap=this.rules.link.exec(src)){src=src.substring(cap[0].length);this.inLink=true;out+=this.outputLink(cap,{href:cap[2],title:cap[3]});this.inLink=false;continue}if((cap=this.rules.reflink.exec(src))||(cap=this.rules.nolink.exec(src))){src=src.substring(cap[0].length);link=(cap[2]||cap[1]).replace(/\s+/g," ");link=this.links[link.toLowerCase()];if(!link||!link.href){out+=cap[0].charAt(0);src=cap[0].substring(1)+src;continue}this.inLink=true;out+=this.outputLink(cap,link);this.inLink=false;continue}if(cap=this.rules.strong.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.strong(this.output(cap[2]||cap[1]));continue}if(cap=this.rules.em.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.em(this.output(cap[2]||cap[1]));continue
-}if(cap=this.rules.code.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.codespan(escape(cap[2],true));continue}if(cap=this.rules.br.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.br();continue}if(cap=this.rules.del.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.del(this.output(cap[1]));continue}if(cap=this.rules.text.exec(src)){src=src.substring(cap[0].length);out+=escape(this.smartypants(cap[0]));continue}if(src){throw new Error("Infinite loop on byte: "+src.charCodeAt(0))}}return out};InlineLexer.prototype.outputLink=function(cap,link){var href=escape(link.href),title=link.title?escape(link.title):null;return cap[0].charAt(0)!=="!"?this.renderer.link(href,title,this.output(cap[1])):this.renderer.image(href,title,escape(cap[1]))};InlineLexer.prototype.smartypants=function(text){if(!this.options.smartypants){return text}return text.replace(/--/g,"\u2014").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1\u2018").replace(/'/g,"\u2019").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1\u201c").replace(/"/g,"\u201d").replace(/\.{3}/g,"\u2026")};InlineLexer.prototype.mangle=function(text){var out="",l=text.length,i=0,ch;for(;i<l;i++){ch=text.charCodeAt(i);if(Math.random()>0.5){ch="x"+ch.toString(16)}out+="&#"+ch+";"}return out};function Renderer(options){this.options=options||{}}Renderer.prototype.code=function(code,lang,escaped){if(this.options.highlight){var out=this.options.highlight(code,lang);if(out!=null&&out!==code){escaped=true;code=out}}if(!lang){return"<pre><code>"+(escaped?code:escape(code,true))+"\n</code></pre>"}return'<pre><code class="'+this.options.langPrefix+escape(lang,true)+'">'+(escaped?code:escape(code,true))+"\n</code></pre>\n"};Renderer.prototype.blockquote=function(quote){return"<blockquote>\n"+quote+"</blockquote>\n"};Renderer.prototype.html=function(html){return html};Renderer.prototype.heading=function(text,level,raw){return"<h"+level+' id="'+this.options.headerPrefix+raw.toLowerCase().replace(/[^\w]+/g,"-")+'">'+text+"</h"+level+">\n"};Renderer.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"};Renderer.prototype.list=function(body,ordered){var type=ordered?"ol":"ul";return"<"+type+">\n"+body+"</"+type+">\n"};Renderer.prototype.listitem=function(text){return"<li>"+text+"</li>\n"};Renderer.prototype.paragraph=function(text){return"<p>"+text+"</p>\n"};Renderer.prototype.table=function(header,body){return"<table>\n"+"<thead>\n"+header+"</thead>\n"+"<tbody>\n"+body+"</tbody>\n"+"</table>\n"};Renderer.prototype.tablerow=function(content){return"<tr>\n"+content+"</tr>\n"};Renderer.prototype.tablecell=function(content,flags){var type=flags.header?"th":"td";var tag=flags.align?"<"+type+' style="text-align:'+flags.align+'">':"<"+type+">";return tag+content+"</"+type+">\n"};Renderer.prototype.strong=function(text){return"<strong>"+text+"</strong>"};Renderer.prototype.em=function(text){return"<em>"+text+"</em>"};Renderer.prototype.codespan=function(text){return"<code>"+text+"</code>"};Renderer.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"};Renderer.prototype.del=function(text){return"<del>"+text+"</del>"};Renderer.prototype.link=function(href,title,text){if(this.options.sanitize){try{var prot=decodeURIComponent(unescape(href)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return""}if(prot.indexOf("javascript:")===0||prot.indexOf("vbscript:")===0){return""}}var out='<a href="'+href+'"';if(title){out+=' title="'+title+'"'}out+=">"+text+"</a>";return out};Renderer.prototype.image=function(href,title,text){var out='<img src="'+href+'" alt="'+text+'"';if(title){out+=' title="'+title+'"'}out+=this.options.xhtml?"/>":">";return out};function Parser(options){this.tokens=[];this.token=null;this.options=options||marked.defaults;this.options.renderer=this.options.renderer||new Renderer;this.renderer=this.options.renderer;this.renderer.options=this.options}Parser.parse=function(src,options,renderer){var parser=new Parser(options,renderer);return parser.parse(src)};Parser.prototype.parse=function(src){this.inline=new InlineLexer(src.links,this.options,this.renderer);this.tokens=src.reverse();var out="";while(this.next()){out+=this.tok()}return out};Parser.prototype.next=function(){return this.token=this.tokens.pop()};Parser.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0};Parser.prototype.parseText=function(){var body=this.token.text;while(this.peek().type==="text"){body+="\n"+this.next().text}return this.inline.output(body)};Parser.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text);case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var header="",body="",i,row,cell,flags,j;cell="";for(i=0;i<this.token.header.length;i++){flags={header:true,align:this.token.align[i]};cell+=this.renderer.tablecell(this.inline.output(this.token.header[i]),{header:true,align:this.token.align[i]})
-}header+=this.renderer.tablerow(cell);for(i=0;i<this.token.cells.length;i++){row=this.token.cells[i];cell="";for(j=0;j<row.length;j++){cell+=this.renderer.tablecell(this.inline.output(row[j]),{header:false,align:this.token.align[j]})}body+=this.renderer.tablerow(cell)}return this.renderer.table(header,body);case"blockquote_start":var body="";while(this.next().type!=="blockquote_end"){body+=this.tok()}return this.renderer.blockquote(body);case"list_start":var body="",ordered=this.token.ordered;while(this.next().type!=="list_end"){body+=this.tok()}return this.renderer.list(body,ordered);case"list_item_start":var body="";while(this.next().type!=="list_item_end"){body+=this.token.type==="text"?this.parseText():this.tok()}return this.renderer.listitem(body);case"loose_item_start":var body="";while(this.next().type!=="list_item_end"){body+=this.tok()}return this.renderer.listitem(body);case"html":var html=!this.token.pre&&!this.options.pedantic?this.inline.output(this.token.text):this.token.text;return this.renderer.html(html);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText())}};function escape(html,encode){return html.replace(!encode?/&(?!#?\w+;)/g:/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function unescape(html){return html.replace(/&([#\w]+);/g,function(_,n){n=n.toLowerCase();if(n==="colon"){return":"}if(n.charAt(0)==="#"){return n.charAt(1)==="x"?String.fromCharCode(parseInt(n.substring(2),16)):String.fromCharCode(+n.substring(1))}return""})}function replace(regex,opt){regex=regex.source;opt=opt||"";return function self(name,val){if(!name){return new RegExp(regex,opt)}val=val.source||val;val=val.replace(/(^|[^\[])\^/g,"$1");regex=regex.replace(name,val);return self}}function noop(){}noop.exec=noop;function merge(obj){var i=1,target,key;for(;i<arguments.length;i++){target=arguments[i];for(key in target){if(Object.prototype.hasOwnProperty.call(target,key)){obj[key]=target[key]}}}return obj}function marked(src,opt,callback){if(callback||typeof opt==="function"){if(!callback){callback=opt;opt=null}opt=merge({},marked.defaults,opt||{});var highlight=opt.highlight,tokens,pending,i=0;try{tokens=Lexer.lex(src,opt)}catch(e){return callback(e)}pending=tokens.length;var done=function(err){if(err){opt.highlight=highlight;return callback(err)}var out;try{out=Parser.parse(tokens,opt)}catch(e){err=e}opt.highlight=highlight;return err?callback(err):callback(null,out)};if(!highlight||highlight.length<3){return done()}delete opt.highlight;if(!pending){return done()}for(;i<tokens.length;i++){(function(token){if(token.type!=="code"){return --pending||done()}return highlight(token.text,token.lang,function(err,code){if(err){return done(err)}if(code==null||code===token.text){return --pending||done()}token.text=code;token.escaped=true;--pending||done()})})(tokens[i])}return}try{if(opt){opt=merge({},marked.defaults,opt)}return Parser.parse(Lexer.lex(src,opt),opt)}catch(e){e.message+="\nPlease report this to https://github.com/chjj/marked.";if((opt||marked.defaults).silent){return"<p>An error occured:</p><pre>"+escape(e.message+"",true)+"</pre>"}throw e}}marked.options=marked.setOptions=function(opt){merge(marked.defaults,opt);return marked};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,smartLists:false,silent:false,highlight:null,langPrefix:"lang-",smartypants:false,headerPrefix:"",renderer:new Renderer,xhtml:false};marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;marked.Lexer=Lexer;marked.lexer=Lexer.lex;marked.InlineLexer=InlineLexer;marked.inlineLexer=InlineLexer.output;marked.parse=marked;if(typeof module!=="undefined"&&typeof exports==="object"){module.exports=marked}else{if(typeof define==="function"&&define.amd){define(function(){return marked})}else{this.marked=marked}}}).call(function(){return this||(typeof window!=="undefined"?window:global)}());
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).marked=t()}(this,function(){"use strict";function r(e,t){for(var u=0;u<t.length;u++){var n=t[u];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function i(e,t){(null==t||t>e.length)&&(t=e.length);for(var u=0,n=new Array(t);u<t;u++)n[u]=e[u];return n}function o(e,t){var u="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(u)return(u=u.call(e)).next.bind(u);if(Array.isArray(e)||(u=function(e,t){if(e){if("string"==typeof e)return i(e,t);var u=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(u="Object"===u&&e.constructor?e.constructor.name:u)||"Set"===u?Array.from(e):"Arguments"===u||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(u)?i(e,t):void 0}}(e))||t&&e&&"number"==typeof e.length){u&&(e=u);var n=0;return function(){return n>=e.length?{done:!0}:{done:!1,value:e[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var t={exports:{}};function e(){return{baseUrl:null,breaks:!1,extensions:null,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:null,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,tokenizer:null,walkTokens:null,xhtml:!1}}t.exports={defaults:e(),getDefaults:e,changeDefaults:function(e){t.exports.defaults=e}};function u(e){return D[e]}var n=/[&<>"']/,s=/[&<>"']/g,l=/[<>"']|&(?!#?\w+;)/,a=/[<>"']|&(?!#?\w+;)/g,D={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"};var c=/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi;function h(e){return e.replace(c,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}var p=/(^|[^\[])\^/g;var g=/[^\w:]/g,f=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;var F={},A=/^[^:]+:\/*[^/]*$/,d=/^([^:]+:)[\s\S]*$/,C=/^([^:]+:\/*[^/]*)[\s\S]*$/;function k(e,t){F[" "+e]||(A.test(e)?F[" "+e]=e+"/":F[" "+e]=E(e,"/",!0));var u=-1===(e=F[" "+e]).indexOf(":");return"//"===t.substring(0,2)?u?t:e.replace(d,"$1")+t:"/"===t.charAt(0)?u?t:e.replace(C,"$1")+t:e+t}function E(e,t,u){var n=e.length;if(0===n)return"";for(var r=0;r<n;){var i=e.charAt(n-r-1);if(i!==t||u){if(i===t||!u)break;r++}else r++}return e.substr(0,n-r)}var x=function(e,t){if(t){if(n.test(e))return e.replace(s,u)}else if(l.test(e))return e.replace(a,u);return e},m=h,b=function(u,e){u=u.source||u,e=e||"";var n={replace:function(e,t){return t=(t=t.source||t).replace(p,"$1"),u=u.replace(e,t),n},getRegex:function(){return new RegExp(u,e)}};return n},B=function(e,t,u){if(e){var n;try{n=decodeURIComponent(h(u)).replace(g,"").toLowerCase()}catch(e){return null}if(0===n.indexOf("javascript:")||0===n.indexOf("vbscript:")||0===n.indexOf("data:"))return null}t&&!f.test(u)&&(u=k(t,u));try{u=encodeURI(u).replace(/%25/g,"%")}catch(e){return null}return u},w={exec:function(){}},v=function(e){for(var t,u,n=1;n<arguments.length;n++)for(u in t=arguments[n])Object.prototype.hasOwnProperty.call(t,u)&&(e[u]=t[u]);return e},y=function(e,t){var u=e.replace(/\|/g,function(e,t,u){for(var n=!1,r=t;0<=--r&&"\\"===u[r];)n=!n;return n?"|":" |"}).split(/ \|/),n=0;if(u.length>t)u.splice(t);else for(;u.length<t;)u.push("");for(;n<u.length;n++)u[n]=u[n].trim().replace(/\\\|/g,"|");return u},_=E,z=function(e,t){if(-1===e.indexOf(t[1]))return-1;for(var u=e.length,n=0,r=0;r<u;r++)if("\\"===e[r])r++;else if(e[r]===t[0])n++;else if(e[r]===t[1]&&--n<0)return r;return-1},$=function(e){e&&e.sanitize&&!e.silent&&console.warn("marked(): sanitize and sanitizer parameters are deprecated since version 0.7.0, should not be used and will be removed in the future. Read more here: https://marked.js.org/#/USING_ADVANCED.md#options")},S=function(e,t){if(t<1)return"";for(var u="";1<t;)1&t&&(u+=e),t>>=1,e+=e;return u+e},T=t.exports.defaults,I=_,R=y,q=x,Z=z;function O(e,t,u){var n=t.href,r=t.title?q(t.title):null,t=e[1].replace(/\\([\[\]])/g,"$1");return"!"!==e[0].charAt(0)?{type:"link",raw:u,href:n,title:r,text:t}:{type:"image",raw:u,href:n,title:r,text:q(t)}}_=function(){function e(e){this.options=e||T}var t=e.prototype;return t.space=function(e){e=this.rules.block.newline.exec(e);if(e)return 1<e[0].length?{type:"space",raw:e[0]}:{raw:"\n"}},t.code=function(e){var t=this.rules.block.code.exec(e);if(t){e=t[0].replace(/^ {1,4}/gm,"");return{type:"code",raw:t[0],codeBlockStyle:"indented",text:this.options.pedantic?e:I(e,"\n")}}},t.fences=function(e){var t=this.rules.block.fences.exec(e);if(t){var u=t[0],e=function(e,t){if(null===(e=e.match(/^(\s+)(?:```)/)))return t;var u=e[1];return t.split("\n").map(function(e){var t=e.match(/^\s+/);return null!==t&&t[0].length>=u.length?e.slice(u.length):e}).join("\n")}(u,t[3]||"");return{type:"code",raw:u,lang:t[2]&&t[2].trim(),text:e}}},t.heading=function(e){var t=this.rules.block.heading.exec(e);if(t){var u=t[2].trim();return/#$/.test(u)&&(e=I(u,"#"),!this.options.pedantic&&e&&!/ $/.test(e)||(u=e.trim())),{type:"heading",raw:t[0],depth:t[1].length,text:u}}},t.nptable=function(e){e=this.rules.block.nptable.exec(e);if(e){var t={type:"table",header:R(e[1].replace(/^ *| *\| *$/g,"")),align:e[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:e[3]?e[3].replace(/\n$/,"").split("\n"):[],raw:e[0]};if(t.header.length===t.align.length){for(var u=t.align.length,n=0;n<u;n++)/^ *-+: *$/.test(t.align[n])?t.align[n]="right":/^ *:-+: *$/.test(t.align[n])?t.align[n]="center":/^ *:-+ *$/.test(t.align[n])?t.align[n]="left":t.align[n]=null;for(u=t.cells.length,n=0;n<u;n++)t.cells[n]=R(t.cells[n],t.header.length);return t}}},t.hr=function(e){e=this.rules.block.hr.exec(e);if(e)return{type:"hr",raw:e[0]}},t.blockquote=function(e){var t=this.rules.block.blockquote.exec(e);if(t){e=t[0].replace(/^ *> ?/gm,"");return{type:"blockquote",raw:t[0],text:e}}},t.list=function(e){e=this.rules.block.list.exec(e);if(e){for(var t,u,n,r,i,s,l=e[0],a=e[2],o=1<a.length,D={type:"list",raw:l,ordered:o,start:o?+a.slice(0,-1):"",loose:!1,items:[]},c=e[0].match(this.rules.block.item),h=!1,p=c.length,g=this.rules.block.listItemStart.exec(c[0]),f=0;f<p;f++){if(l=t=c[f],this.options.pedantic||(s=t.match(new RegExp("\\n\\s*\\n {0,"+(g[0].length-1)+"}\\S")))&&(u=t.length-s.index+c.slice(f+1).join("\n").length,D.raw=D.raw.substring(0,D.raw.length-u),l=t=t.substring(0,s.index),p=f+1),f!==p-1){if(n=this.rules.block.listItemStart.exec(c[f+1]),this.options.pedantic?n[1].length>g[1].length:n[1].length>=g[0].length||3<n[1].length){c.splice(f,2,c[f]+(!this.options.pedantic&&n[1].length<g[0].length&&!c[f].match(/\n$/)?"":"\n")+c[f+1]),f--,p--;continue}(!this.options.pedantic||this.options.smartLists?n[2][n[2].length-1]!==a[a.length-1]:o==(1===n[2].length))&&(u=c.slice(f+1).join("\n").length,D.raw=D.raw.substring(0,D.raw.length-u),f=p-1),g=n}n=t.length,~(t=t.replace(/^ *([*+-]|\d+[.)]) ?/,"")).indexOf("\n ")&&(n-=t.length,t=this.options.pedantic?t.replace(/^ {1,4}/gm,""):t.replace(new RegExp("^ {1,"+n+"}","gm"),"")),t=I(t,"\n"),f!==p-1&&(l+="\n"),n=h||/\n\n(?!\s*$)/.test(l),f!==p-1&&(h="\n\n"===l.slice(-2),n=n||h),n&&(D.loose=!0),this.options.gfm&&(i=void 0,(r=/^\[[ xX]\] /.test(t))&&(i=" "!==t[1],t=t.replace(/^\[[ xX]\] +/,""))),D.items.push({type:"list_item",raw:l,task:r,checked:i,loose:n,text:t})}return D}},t.html=function(e){e=this.rules.block.html.exec(e);if(e)return{type:this.options.sanitize?"paragraph":"html",raw:e[0],pre:!this.options.sanitizer&&("pre"===e[1]||"script"===e[1]||"style"===e[1]),text:this.options.sanitize?this.options.sanitizer?this.options.sanitizer(e[0]):q(e[0]):e[0]}},t.def=function(e){e=this.rules.block.def.exec(e);if(e)return e[3]&&(e[3]=e[3].substring(1,e[3].length-1)),{type:"def",tag:e[1].toLowerCase().replace(/\s+/g," "),raw:e[0],href:e[2],title:e[3]}},t.table=function(e){e=this.rules.block.table.exec(e);if(e){var t={type:"table",header:R(e[1].replace(/^ *| *\| *$/g,"")),align:e[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:e[3]?e[3].replace(/\n$/,"").split("\n"):[]};if(t.header.length===t.align.length){t.raw=e[0];for(var u=t.align.length,n=0;n<u;n++)/^ *-+: *$/.test(t.align[n])?t.align[n]="right":/^ *:-+: *$/.test(t.align[n])?t.align[n]="center":/^ *:-+ *$/.test(t.align[n])?t.align[n]="left":t.align[n]=null;for(u=t.cells.length,n=0;n<u;n++)t.cells[n]=R(t.cells[n].replace(/^ *\| *| *\| *$/g,""),t.header.length);return t}}},t.lheading=function(e){e=this.rules.block.lheading.exec(e);if(e)return{type:"heading",raw:e[0],depth:"="===e[2].charAt(0)?1:2,text:e[1]}},t.paragraph=function(e){e=this.rules.block.paragraph.exec(e);if(e)return{type:"paragraph",raw:e[0],text:"\n"===e[1].charAt(e[1].length-1)?e[1].slice(0,-1):e[1]}},t.text=function(e){e=this.rules.block.text.exec(e);if(e)return{type:"text",raw:e[0],text:e[0]}},t.escape=function(e){e=this.rules.inline.escape.exec(e);if(e)return{type:"escape",raw:e[0],text:q(e[1])}},t.tag=function(e,t,u){e=this.rules.inline.tag.exec(e);if(e)return!t&&/^<a /i.test(e[0])?t=!0:t&&/^<\/a>/i.test(e[0])&&(t=!1),!u&&/^<(pre|code|kbd|script)(\s|>)/i.test(e[0])?u=!0:u&&/^<\/(pre|code|kbd|script)(\s|>)/i.test(e[0])&&(u=!1),{type:this.options.sanitize?"text":"html",raw:e[0],inLink:t,inRawBlock:u,text:this.options.sanitize?this.options.sanitizer?this.options.sanitizer(e[0]):q(e[0]):e[0]}},t.link=function(e){var t=this.rules.inline.link.exec(e);if(t){var u=t[2].trim();if(!this.options.pedantic&&/^</.test(u)){if(!/>$/.test(u))return;e=I(u.slice(0,-1),"\\");if((u.length-e.length)%2==0)return}else{var n=Z(t[2],"()");-1<n&&(i=(0===t[0].indexOf("!")?5:4)+t[1].length+n,t[2]=t[2].substring(0,n),t[0]=t[0].substring(0,i).trim(),t[3]="")}var r,n=t[2],i="";return this.options.pedantic?(r=/^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(n))&&(n=r[1],i=r[3]):i=t[3]?t[3].slice(1,-1):"",n=n.trim(),O(t,{href:(n=/^</.test(n)?this.options.pedantic&&!/>$/.test(u)?n.slice(1):n.slice(1,-1):n)&&n.replace(this.rules.inline._escapes,"$1"),title:i&&i.replace(this.rules.inline._escapes,"$1")},t[0])}},t.reflink=function(e,t){if((u=this.rules.inline.reflink.exec(e))||(u=this.rules.inline.nolink.exec(e))){e=(u[2]||u[1]).replace(/\s+/g," ");if((e=t[e.toLowerCase()])&&e.href)return O(u,e,u[0]);var u=u[0].charAt(0);return{type:"text",raw:u,text:u}}},t.emStrong=function(e,t,u){void 0===u&&(u="");var n=this.rules.inline.emStrong.lDelim.exec(e);if(n&&(!n[3]||!u.match(/(?:[0-9A-Za-z\xAA\xB2\xB3\xB5\xB9\xBA\xBC-\xBE\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u0660-\u0669\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07C0-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08C7\u0904-\u0939\u093D\u0950\u0958-\u0961\u0966-\u096F\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09E6-\u09F1\u09F4-\u09F9\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A66-\u0A6F\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AE6-\u0AEF\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B66-\u0B6F\u0B71-\u0B77\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0BE6-\u0BF2\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C66-\u0C6F\u0C78-\u0C7E\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CE6-\u0CEF\u0CF1\u0CF2\u0D04-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D58-\u0D61\u0D66-\u0D78\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DE6-\u0DEF\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E86-\u0E8A\u0E8C-\u0EA3\u0EA5\u0EA7-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F20-\u0F33\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F-\u1049\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u1090-\u1099\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1369-\u137C\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A16\u1A20-\u1A54\u1A80-\u1A89\u1A90-\u1A99\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B50-\u1B59\u1B83-\u1BA0\u1BAE-\u1BE5\u1C00-\u1C23\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF3\u1CF5\u1CF6\u1CFA\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2070\u2071\u2074-\u2079\u207F-\u2089\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2150-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2CFD\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u3192-\u3195\u31A0-\u31BF\u31F0-\u31FF\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\u3400-\u4DBF\u4E00-\u9FFC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7BF\uA7C2-\uA7CA\uA7F5-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA830-\uA835\uA840-\uA873\uA882-\uA8B3\uA8D0-\uA8D9\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA900-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF-\uA9D9\uA9E0-\uA9E4\uA9E6-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA50-\uAA59\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB69\uAB70-\uABE2\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDE80-\uDE9C\uDEA0-\uDED0\uDEE1-\uDEFB\uDF00-\uDF23\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC58-\uDC76\uDC79-\uDC9E\uDCA7-\uDCAF\uDCE0-\uDCF2\uDCF4\uDCF5\uDCFB-\uDD1B\uDD20-\uDD39\uDD80-\uDDB7\uDDBC-\uDDCF\uDDD2-\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE40-\uDE48\uDE60-\uDE7E\uDE80-\uDE9F\uDEC0-\uDEC7\uDEC9-\uDEE4\uDEEB-\uDEEF\uDF00-\uDF35\uDF40-\uDF55\uDF58-\uDF72\uDF78-\uDF91\uDFA9-\uDFAF]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDCFA-\uDD23\uDD30-\uDD39\uDE60-\uDE7E\uDE80-\uDEA9\uDEB0\uDEB1\uDF00-\uDF27\uDF30-\uDF45\uDF51-\uDF54\uDFB0-\uDFCB\uDFE0-\uDFF6]|\uD804[\uDC03-\uDC37\uDC52-\uDC6F\uDC83-\uDCAF\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD03-\uDD26\uDD36-\uDD3F\uDD44\uDD47\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDD0-\uDDDA\uDDDC\uDDE1-\uDDF4\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDEF0-\uDEF9\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC50-\uDC59\uDC5F-\uDC61\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE50-\uDE59\uDE80-\uDEAA\uDEB8\uDEC0-\uDEC9\uDF00-\uDF1A\uDF30-\uDF3B]|\uD806[\uDC00-\uDC2B\uDCA0-\uDCF2\uDCFF-\uDD06\uDD09\uDD0C-\uDD13\uDD15\uDD16\uDD18-\uDD2F\uDD3F\uDD41\uDD50-\uDD59\uDDA0-\uDDA7\uDDAA-\uDDD0\uDDE1\uDDE3\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE89\uDE9D\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC50-\uDC6C\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46\uDD50-\uDD59\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD89\uDD98\uDDA0-\uDDA9\uDEE0-\uDEF2\uDFB0\uDFC0-\uDFD4]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD822\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879\uD880-\uD883][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF50-\uDF59\uDF5B-\uDF61\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE96\uDF00-\uDF4A\uDF50\uDF93-\uDF9F\uDFE0\uDFE1\uDFE3]|\uD821[\uDC00-\uDFF7]|\uD823[\uDC00-\uDCD5\uDD00-\uDD08]|\uD82C[\uDC00-\uDD1E\uDD50-\uDD52\uDD64-\uDD67\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD834[\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD838[\uDD00-\uDD2C\uDD37-\uDD3D\uDD40-\uDD49\uDD4E\uDEC0-\uDEEB\uDEF0-\uDEF9]|\uD83A[\uDC00-\uDCC4\uDCC7-\uDCCF\uDD00-\uDD43\uDD4B\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9]|\uD869[\uDC00-\uDEDD\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uD884[\uDC00-\uDF4A])/))){var r=n[1]||n[2]||"";if(!r||r&&(""===u||this.rules.inline.punctuation.exec(u))){var i,s=n[0].length-1,l=s,a=0,o="*"===n[0][0]?this.rules.inline.emStrong.rDelimAst:this.rules.inline.emStrong.rDelimUnd;for(o.lastIndex=0,t=t.slice(-1*e.length+s);null!=(n=o.exec(t));)if(i=n[1]||n[2]||n[3]||n[4]||n[5]||n[6])if(i=i.length,n[3]||n[4])l+=i;else if(!((n[5]||n[6])&&s%3)||(s+i)%3){if(!(0<(l-=i)))return i=Math.min(i,i+l+a),Math.min(s,i)%2?{type:"em",raw:e.slice(0,s+n.index+i+1),text:e.slice(1,s+n.index+i)}:{type:"strong",raw:e.slice(0,s+n.index+i+1),text:e.slice(2,s+n.index+i-1)}}else a+=i}}},t.codespan=function(e){var t=this.rules.inline.code.exec(e);if(t){var u=t[2].replace(/\n/g," "),n=/[^ ]/.test(u),e=/^ /.test(u)&&/ $/.test(u);return n&&e&&(u=u.substring(1,u.length-1)),u=q(u,!0),{type:"codespan",raw:t[0],text:u}}},t.br=function(e){e=this.rules.inline.br.exec(e);if(e)return{type:"br",raw:e[0]}},t.del=function(e){e=this.rules.inline.del.exec(e);if(e)return{type:"del",raw:e[0],text:e[2]}},t.autolink=function(e,t){e=this.rules.inline.autolink.exec(e);if(e){var u,t="@"===e[2]?"mailto:"+(u=q(this.options.mangle?t(e[1]):e[1])):u=q(e[1]);return{type:"link",raw:e[0],text:u,href:t,tokens:[{type:"text",raw:u,text:u}]}}},t.url=function(e,t){var u,n,r,i;if(u=this.rules.inline.url.exec(e)){if("@"===u[2])r="mailto:"+(n=q(this.options.mangle?t(u[0]):u[0]));else{for(;i=u[0],u[0]=this.rules.inline._backpedal.exec(u[0])[0],i!==u[0];);n=q(u[0]),r="www."===u[1]?"http://"+n:n}return{type:"link",raw:u[0],text:n,href:r,tokens:[{type:"text",raw:n,text:n}]}}},t.inlineText=function(e,t,u){e=this.rules.inline.text.exec(e);if(e){u=t?this.options.sanitize?this.options.sanitizer?this.options.sanitizer(e[0]):q(e[0]):e[0]:q(this.options.smartypants?u(e[0]):e[0]);return{type:"text",raw:e[0],text:u}}},e}(),y=w,z=b,w=v,b={newline:/^(?: *(?:\n|$))+/,code:/^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,fences:/^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?! {0,3}bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?(?:\\?>\\n*|$)|<![A-Z][\\s\\S]*?(?:>\\n*|$)|<!\\[CDATA\\[[\\s\\S]*?(?:\\]\\]>\\n*|$)|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:(?:\\n *)+\\n|$)|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$))",def:/^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,nptable:y,table:y,lheading:/^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,_paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html| +\n)[^\n]+)*)/,text:/^[^\n]+/,_label:/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,_title:/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/};b.def=z(b.def).replace("label",b._label).replace("title",b._title).getRegex(),b.bullet=/(?:[*+-]|\d{1,9}[.)])/,b.item=/^( *)(bull) ?[^\n]*(?:\n(?! *bull ?)[^\n]*)*/,b.item=z(b.item,"gm").replace(/bull/g,b.bullet).getRegex(),b.listItemStart=z(/^( *)(bull) */).replace("bull",b.bullet).getRegex(),b.list=z(b.list).replace(/bull/g,b.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+b.def.source+")").getRegex(),b._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",b._comment=/<!--(?!-?>)[\s\S]*?(?:-->|$)/,b.html=z(b.html,"i").replace("comment",b._comment).replace("tag",b._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),b.paragraph=z(b._paragraph).replace("hr",b.hr).replace("heading"," {0,3}#{1,6} ").replace("|lheading","").replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)").replace("tag",b._tag).getRegex(),b.blockquote=z(b.blockquote).replace("paragraph",b.paragraph).getRegex(),b.normal=w({},b),b.gfm=w({},b.normal,{nptable:"^ *([^|\\n ].*\\|.*)\\n {0,3}([-:]+ *\\|[-| :]*)(?:\\n((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)",table:"^ *\\|(.+)\\n {0,3}\\|?( *[-:]+[-| :]*)(?:\\n *((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)"}),b.gfm.nptable=z(b.gfm.nptable).replace("hr",b.hr).replace("heading"," {0,3}#{1,6} ").replace("blockquote"," {0,3}>").replace("code"," {4}[^\\n]").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)").replace("tag",b._tag).getRegex(),b.gfm.table=z(b.gfm.table).replace("hr",b.hr).replace("heading"," {0,3}#{1,6} ").replace("blockquote"," {0,3}>").replace("code"," {4}[^\\n]").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)").replace("tag",b._tag).getRegex(),b.pedantic=w({},b.normal,{html:z("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",b._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,heading:/^(#{1,6})(.*)(?:\n+|$)/,fences:y,paragraph:z(b.normal._paragraph).replace("hr",b.hr).replace("heading"," *#{1,6} *[^\n]").replace("lheading",b.lheading).replace("blockquote"," {0,3}>").replace("|fences","").replace("|list","").replace("|html","").getRegex()});y={escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:y,tag:"^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>",link:/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,nolink:/^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,reflinkSearch:"reflink|nolink(?!\\()",emStrong:{lDelim:/^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,rDelimAst:/\_\_[^_*]*?\*[^_*]*?\_\_|[punct_](\*+)(?=[\s]|$)|[^punct*_\s](\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|[^punct*_\s](\*+)(?=[^punct*_\s])/,rDelimUnd:/\*\*[^_*]*?\_[^_*]*?\*\*|[punct*](\_+)(?=[\s]|$)|[^punct*_\s](\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/},code:/^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,br:/^( {2,}|\\)\n(?!\s*$)/,del:y,text:/^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<!\[`*_]|\b_|$)|[^ ](?= {2,}\n)))/,punctuation:/^([\spunctuation])/,_punctuation:"!\"#$%&'()+\\-.,/:;<=>?@\\[\\]`^{|}~"};y.punctuation=z(y.punctuation).replace(/punctuation/g,y._punctuation).getRegex(),y.blockSkip=/\[[^\]]*?\]\([^\)]*?\)|`[^`]*?`|<[^>]*?>/g,y.escapedEmSt=/\\\*|\\_/g,y._comment=z(b._comment).replace("(?:--\x3e|$)","--\x3e").getRegex(),y.emStrong.lDelim=z(y.emStrong.lDelim).replace(/punct/g,y._punctuation).getRegex(),y.emStrong.rDelimAst=z(y.emStrong.rDelimAst,"g").replace(/punct/g,y._punctuation).getRegex(),y.emStrong.rDelimUnd=z(y.emStrong.rDelimUnd,"g").replace(/punct/g,y._punctuation).getRegex(),y._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,y._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,y._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,y.autolink=z(y.autolink).replace("scheme",y._scheme).replace("email",y._email).getRegex(),y._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,y.tag=z(y.tag).replace("comment",y._comment).replace("attribute",y._attribute).getRegex(),y._label=/(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/,y._href=/<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/,y._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,y.link=z(y.link).replace("label",y._label).replace("href",y._href).replace("title",y._title).getRegex(),y.reflink=z(y.reflink).replace("label",y._label).getRegex(),y.reflinkSearch=z(y.reflinkSearch,"g").replace("reflink",y.reflink).replace("nolink",y.nolink).getRegex(),y.normal=w({},y),y.pedantic=w({},y.normal,{strong:{start:/^__|\*\*/,middle:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,endAst:/\*\*(?!\*)/g,endUnd:/__(?!_)/g},em:{start:/^_|\*/,middle:/^()\*(?=\S)([\s\S]*?\S)\*(?!\*)|^_(?=\S)([\s\S]*?\S)_(?!_)/,endAst:/\*(?!\*)/g,endUnd:/_(?!_)/g},link:z(/^!?\[(label)\]\((.*?)\)/).replace("label",y._label).getRegex(),reflink:z(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",y._label).getRegex()}),y.gfm=w({},y.normal,{escape:z(y.escape).replace("])","~|])").getRegex(),_extended_email:/[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,url:/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,_backpedal:/(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,del:/^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,text:/^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/}),y.gfm.url=z(y.gfm.url,"i").replace("email",y.gfm._extended_email).getRegex(),y.breaks=w({},y.gfm,{br:z(y.br).replace("{2,}","*").getRegex(),text:z(y.gfm.text).replace("\\b_","\\b_| {2,}\\n").replace(/\{2,\}/g,"*").getRegex()});var b={block:b,inline:y},j=_,U=t.exports.defaults,P=b.block,L=b.inline,M=S;function N(e){return e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…")}function X(e){for(var t,u="",n=e.length,r=0;r<n;r++)t=e.charCodeAt(r),u+="&#"+(t=.5<Math.random()?"x"+t.toString(16):t)+";";return u}var y=function(){function u(e){this.tokens=[],this.tokens.links=Object.create(null),this.options=e||U,this.options.tokenizer=this.options.tokenizer||new j,this.tokenizer=this.options.tokenizer,this.tokenizer.options=this.options;e={block:P.normal,inline:L.normal};this.options.pedantic?(e.block=P.pedantic,e.inline=L.pedantic):this.options.gfm&&(e.block=P.gfm,this.options.breaks?e.inline=L.breaks:e.inline=L.gfm),this.tokenizer.rules=e}u.lex=function(e,t){return new u(t).lex(e)},u.lexInline=function(e,t){return new u(t).inlineTokens(e)};var e,t,n=u.prototype;return n.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    "),this.blockTokens(e,this.tokens,!0),this.inline(this.tokens),this.tokens},n.blockTokens=function(r,t,e){var u,n,i,s,l,a,o=this;for(void 0===t&&(t=[]),void 0===e&&(e=!0),this.options.pedantic&&(r=r.replace(/^ +$/gm,""));r;)if(!(this.options.extensions&&this.options.extensions.block&&this.options.extensions.block.some(function(e){return!!(u=e.call(o,r,t))&&(r=r.substring(u.raw.length),t.push(u),!0)})))if(u=this.tokenizer.space(r))r=r.substring(u.raw.length),u.type&&t.push(u);else if(u=this.tokenizer.code(r))r=r.substring(u.raw.length),(s=t[t.length-1])&&"paragraph"===s.type?(s.raw+="\n"+u.raw,s.text+="\n"+u.text):t.push(u);else if(u=this.tokenizer.fences(r))r=r.substring(u.raw.length),t.push(u);else if(u=this.tokenizer.heading(r))r=r.substring(u.raw.length),t.push(u);else if(u=this.tokenizer.nptable(r))r=r.substring(u.raw.length),t.push(u);else if(u=this.tokenizer.hr(r))r=r.substring(u.raw.length),t.push(u);else if(u=this.tokenizer.blockquote(r))r=r.substring(u.raw.length),u.tokens=this.blockTokens(u.text,[],e),t.push(u);else if(u=this.tokenizer.list(r)){for(r=r.substring(u.raw.length),i=u.items.length,n=0;n<i;n++)u.items[n].tokens=this.blockTokens(u.items[n].text,[],!1);t.push(u)}else if(u=this.tokenizer.html(r))r=r.substring(u.raw.length),t.push(u);else if(e&&(u=this.tokenizer.def(r)))r=r.substring(u.raw.length),this.tokens.links[u.tag]||(this.tokens.links[u.tag]={href:u.href,title:u.title});else if(u=this.tokenizer.table(r))r=r.substring(u.raw.length),t.push(u);else if(u=this.tokenizer.lheading(r))r=r.substring(u.raw.length),t.push(u);else if(l=r,this.options.extensions&&this.options.extensions.startBlock&&function(){var t,u=1/0,n=r.slice(1);o.options.extensions.startBlock.forEach(function(e){"number"==typeof(t=e.call(this,n))&&0<=t&&(u=Math.min(u,t))}),u<1/0&&0<=u&&(l=r.substring(0,u+1))}(),e&&(u=this.tokenizer.paragraph(l)))s=t[t.length-1],a&&"paragraph"===s.type?(s.raw+="\n"+u.raw,s.text+="\n"+u.text):t.push(u),a=l.length!==r.length,r=r.substring(u.raw.length);else if(u=this.tokenizer.text(r))r=r.substring(u.raw.length),(s=t[t.length-1])&&"text"===s.type?(s.raw+="\n"+u.raw,s.text+="\n"+u.text):t.push(u);else if(r){var D="Infinite loop on byte: "+r.charCodeAt(0);if(this.options.silent){console.error(D);break}throw new Error(D)}return t},n.inline=function(e){for(var t,u,n,r,i,s=e.length,l=0;l<s;l++)switch((i=e[l]).type){case"paragraph":case"text":case"heading":i.tokens=[],this.inlineTokens(i.text,i.tokens);break;case"table":for(i.tokens={header:[],cells:[]},n=i.header.length,t=0;t<n;t++)i.tokens.header[t]=[],this.inlineTokens(i.header[t],i.tokens.header[t]);for(n=i.cells.length,t=0;t<n;t++)for(r=i.cells[t],i.tokens.cells[t]=[],u=0;u<r.length;u++)i.tokens.cells[t][u]=[],this.inlineTokens(r[u],i.tokens.cells[t][u]);break;case"blockquote":this.inline(i.tokens);break;case"list":for(n=i.items.length,t=0;t<n;t++)this.inline(i.items[t].tokens)}return e},n.inlineTokens=function(r,t,e,u){var n,i,s,l=this;void 0===t&&(t=[]),void 0===e&&(e=!1),void 0===u&&(u=!1);var a,o,D,c=r;if(this.tokens.links){var h=Object.keys(this.tokens.links);if(0<h.length)for(;null!=(a=this.tokenizer.rules.inline.reflinkSearch.exec(c));)h.includes(a[0].slice(a[0].lastIndexOf("[")+1,-1))&&(c=c.slice(0,a.index)+"["+M("a",a[0].length-2)+"]"+c.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex))}for(;null!=(a=this.tokenizer.rules.inline.blockSkip.exec(c));)c=c.slice(0,a.index)+"["+M("a",a[0].length-2)+"]"+c.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);for(;null!=(a=this.tokenizer.rules.inline.escapedEmSt.exec(c));)c=c.slice(0,a.index)+"++"+c.slice(this.tokenizer.rules.inline.escapedEmSt.lastIndex);for(;r;)if(o||(D=""),o=!1,!(this.options.extensions&&this.options.extensions.inline&&this.options.extensions.inline.some(function(e){return!!(n=e.call(l,r,t))&&(r=r.substring(n.raw.length),t.push(n),!0)})))if(n=this.tokenizer.escape(r))r=r.substring(n.raw.length),t.push(n);else if(n=this.tokenizer.tag(r,e,u))r=r.substring(n.raw.length),e=n.inLink,u=n.inRawBlock,(i=t[t.length-1])&&"text"===n.type&&"text"===i.type?(i.raw+=n.raw,i.text+=n.text):t.push(n);else if(n=this.tokenizer.link(r))r=r.substring(n.raw.length),"link"===n.type&&(n.tokens=this.inlineTokens(n.text,[],!0,u)),t.push(n);else if(n=this.tokenizer.reflink(r,this.tokens.links))r=r.substring(n.raw.length),i=t[t.length-1],"link"===n.type?(n.tokens=this.inlineTokens(n.text,[],!0,u),t.push(n)):i&&"text"===n.type&&"text"===i.type?(i.raw+=n.raw,i.text+=n.text):t.push(n);else if(n=this.tokenizer.emStrong(r,c,D))r=r.substring(n.raw.length),n.tokens=this.inlineTokens(n.text,[],e,u),t.push(n);else if(n=this.tokenizer.codespan(r))r=r.substring(n.raw.length),t.push(n);else if(n=this.tokenizer.br(r))r=r.substring(n.raw.length),t.push(n);else if(n=this.tokenizer.del(r))r=r.substring(n.raw.length),n.tokens=this.inlineTokens(n.text,[],e,u),t.push(n);else if(n=this.tokenizer.autolink(r,X))r=r.substring(n.raw.length),t.push(n);else if(e||!(n=this.tokenizer.url(r,X))){if(s=r,this.options.extensions&&this.options.extensions.startInline&&function(){var t,u=1/0,n=r.slice(1);l.options.extensions.startInline.forEach(function(e){"number"==typeof(t=e.call(this,n))&&0<=t&&(u=Math.min(u,t))}),u<1/0&&0<=u&&(s=r.substring(0,u+1))}(),n=this.tokenizer.inlineText(s,u,N))r=r.substring(n.raw.length),"_"!==n.raw.slice(-1)&&(D=n.raw.slice(-1)),o=!0,(i=t[t.length-1])&&"text"===i.type?(i.raw+=n.raw,i.text+=n.text):t.push(n);else if(r){var p="Infinite loop on byte: "+r.charCodeAt(0);if(this.options.silent){console.error(p);break}throw new Error(p)}}else r=r.substring(n.raw.length),t.push(n);return t},e=u,t=[{key:"rules",get:function(){return{block:P,inline:L}}}],(n=null)&&r(e.prototype,n),t&&r(e,t),u}(),G=t.exports.defaults,V=B,H=x,b=function(){function e(e){this.options=e||G}var t=e.prototype;return t.code=function(e,t,u){var n=(t||"").match(/\S*/)[0];return!this.options.highlight||null!=(t=this.options.highlight(e,n))&&t!==e&&(u=!0,e=t),e=e.replace(/\n$/,"")+"\n",n?'<pre><code class="'+this.options.langPrefix+H(n,!0)+'">'+(u?e:H(e,!0))+"</code></pre>\n":"<pre><code>"+(u?e:H(e,!0))+"</code></pre>\n"},t.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},t.html=function(e){return e},t.heading=function(e,t,u,n){return this.options.headerIds?"<h"+t+' id="'+this.options.headerPrefix+n.slug(u)+'">'+e+"</h"+t+">\n":"<h"+t+">"+e+"</h"+t+">\n"},t.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},t.list=function(e,t,u){var n=t?"ol":"ul";return"<"+n+(t&&1!==u?' start="'+u+'"':"")+">\n"+e+"</"+n+">\n"},t.listitem=function(e){return"<li>"+e+"</li>\n"},t.checkbox=function(e){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox"'+(this.options.xhtml?" /":"")+"> "},t.paragraph=function(e){return"<p>"+e+"</p>\n"},t.table=function(e,t){return"<table>\n<thead>\n"+e+"</thead>\n"+(t=t&&"<tbody>"+t+"</tbody>")+"</table>\n"},t.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},t.tablecell=function(e,t){var u=t.header?"th":"td";return(t.align?"<"+u+' align="'+t.align+'">':"<"+u+">")+e+"</"+u+">\n"},t.strong=function(e){return"<strong>"+e+"</strong>"},t.em=function(e){return"<em>"+e+"</em>"},t.codespan=function(e){return"<code>"+e+"</code>"},t.br=function(){return this.options.xhtml?"<br/>":"<br>"},t.del=function(e){return"<del>"+e+"</del>"},t.link=function(e,t,u){if(null===(e=V(this.options.sanitize,this.options.baseUrl,e)))return u;e='<a href="'+H(e)+'"';return t&&(e+=' title="'+t+'"'),e+=">"+u+"</a>"},t.image=function(e,t,u){if(null===(e=V(this.options.sanitize,this.options.baseUrl,e)))return u;u='<img src="'+e+'" alt="'+u+'"';return t&&(u+=' title="'+t+'"'),u+=this.options.xhtml?"/>":">"},t.text=function(e){return e},e}(),S=function(){function e(){}var t=e.prototype;return t.strong=function(e){return e},t.em=function(e){return e},t.codespan=function(e){return e},t.del=function(e){return e},t.html=function(e){return e},t.text=function(e){return e},t.link=function(e,t,u){return""+u},t.image=function(e,t,u){return""+u},t.br=function(){return""},e}(),B=function(){function e(){this.seen={}}var t=e.prototype;return t.serialize=function(e){return e.toLowerCase().trim().replace(/<[!\/a-z].*?>/gi,"").replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g,"").replace(/\s/g,"-")},t.getNextSafeSlug=function(e,t){var u=e,n=0;if(this.seen.hasOwnProperty(u))for(n=this.seen[e];u=e+"-"+ ++n,this.seen.hasOwnProperty(u););return t||(this.seen[e]=n,this.seen[u]=0),u},t.slug=function(e,t){void 0===t&&(t={});var u=this.serialize(e);return this.getNextSafeSlug(u,t.dryrun)},e}(),J=b,K=S,Q=B,W=t.exports.defaults,Y=m,ee=y,te=function(){function u(e){this.options=e||W,this.options.renderer=this.options.renderer||new J,this.renderer=this.options.renderer,this.renderer.options=this.options,this.textRenderer=new K,this.slugger=new Q}u.parse=function(e,t){return new u(t).parse(e)},u.parseInline=function(e,t){return new u(t).parseInline(e)};var e=u.prototype;return e.parse=function(e,t){void 0===t&&(t=!0);for(var u,n,r,i,s,l,a,o,D,c,h,p,g,f,F,A,d="",C=e.length,k=0;k<C;k++)if(o=e[k],!(this.options.extensions&&this.options.extensions.renderers&&this.options.extensions.renderers[o.type])||!1===(A=this.options.extensions.renderers[o.type].call(this,o))&&["space","hr","heading","code","table","blockquote","list","html","paragraph","text"].includes(o.type))switch(o.type){case"space":continue;case"hr":d+=this.renderer.hr();continue;case"heading":d+=this.renderer.heading(this.parseInline(o.tokens),o.depth,Y(this.parseInline(o.tokens,this.textRenderer)),this.slugger);continue;case"code":d+=this.renderer.code(o.text,o.lang,o.escaped);continue;case"table":for(l=D="",r=o.header.length,u=0;u<r;u++)l+=this.renderer.tablecell(this.parseInline(o.tokens.header[u]),{header:!0,align:o.align[u]});for(D+=this.renderer.tablerow(l),a="",r=o.cells.length,u=0;u<r;u++){for(l="",i=(s=o.tokens.cells[u]).length,n=0;n<i;n++)l+=this.renderer.tablecell(this.parseInline(s[n]),{header:!1,align:o.align[n]});a+=this.renderer.tablerow(l)}d+=this.renderer.table(D,a);continue;case"blockquote":a=this.parse(o.tokens),d+=this.renderer.blockquote(a);continue;case"list":for(D=o.ordered,E=o.start,c=o.loose,r=o.items.length,a="",u=0;u<r;u++)g=(p=o.items[u]).checked,f=p.task,h="",p.task&&(F=this.renderer.checkbox(g),c?0<p.tokens.length&&"text"===p.tokens[0].type?(p.tokens[0].text=F+" "+p.tokens[0].text,p.tokens[0].tokens&&0<p.tokens[0].tokens.length&&"text"===p.tokens[0].tokens[0].type&&(p.tokens[0].tokens[0].text=F+" "+p.tokens[0].tokens[0].text)):p.tokens.unshift({type:"text",text:F}):h+=F),h+=this.parse(p.tokens,c),a+=this.renderer.listitem(h,f,g);d+=this.renderer.list(a,D,E);continue;case"html":d+=this.renderer.html(o.text);continue;case"paragraph":d+=this.renderer.paragraph(this.parseInline(o.tokens));continue;case"text":for(a=o.tokens?this.parseInline(o.tokens):o.text;k+1<C&&"text"===e[k+1].type;)a+="\n"+((o=e[++k]).tokens?this.parseInline(o.tokens):o.text);d+=t?this.renderer.paragraph(a):a;continue;default:var E='Token with "'+o.type+'" type was not found.';if(this.options.silent)return void console.error(E);throw new Error(E)}else d+=A||"";return d},e.parseInline=function(e,t){t=t||this.renderer;for(var u,n,r="",i=e.length,s=0;s<i;s++)if(u=e[s],!(this.options.extensions&&this.options.extensions.renderers&&this.options.extensions.renderers[u.type])||!1===(n=this.options.extensions.renderers[u.type].call(this,u))&&["escape","html","link","image","strong","em","codespan","br","del","text"].includes(u.type))switch(u.type){case"escape":r+=t.text(u.text);break;case"html":r+=t.html(u.text);break;case"link":r+=t.link(u.href,u.title,this.parseInline(u.tokens,t));break;case"image":r+=t.image(u.href,u.title,u.text);break;case"strong":r+=t.strong(this.parseInline(u.tokens,t));break;case"em":r+=t.em(this.parseInline(u.tokens,t));break;case"codespan":r+=t.codespan(u.text);break;case"br":r+=t.br();break;case"del":r+=t.del(this.parseInline(u.tokens,t));break;case"text":r+=t.text(u.text);break;default:var l='Token with "'+u.type+'" type was not found.';if(this.options.silent)return void console.error(l);throw new Error(l)}else r+=n||"";return r},u}(),ue=_,ne=b,S=S,B=B,re=v,ie=$,se=x,$=t.exports.getDefaults,le=t.exports.changeDefaults,x=t.exports.defaults;function ae(e,u,n){if(null==e)throw new Error("marked(): input parameter is undefined or null");if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");if("function"==typeof u&&(n=u,u=null),u=re({},ae.defaults,u||{}),ie(u),n){var r,i=u.highlight;try{r=ee.lex(e,u)}catch(e){return n(e)}var s=function(t){var e;if(!t)try{u.walkTokens&&ae.walkTokens(r,u.walkTokens),e=te.parse(r,u)}catch(e){t=e}return u.highlight=i,t?n(t):n(null,e)};if(!i||i.length<3)return s();if(delete u.highlight,!r.length)return s();var l=0;return ae.walkTokens(r,function(u){"code"===u.type&&(l++,setTimeout(function(){i(u.text,u.lang,function(e,t){return e?s(e):(null!=t&&t!==u.text&&(u.text=t,u.escaped=!0),void(0===--l&&s()))})},0))}),void(0===l&&s())}try{var t=ee.lex(e,u);return u.walkTokens&&ae.walkTokens(t,u.walkTokens),te.parse(t,u)}catch(e){if(e.message+="\nPlease report this to https://github.com/markedjs/marked.",u.silent)return"<p>An error occurred:</p><pre>"+se(e.message+"",!0)+"</pre>";throw e}}return ae.options=ae.setOptions=function(e){return re(ae.defaults,e),le(ae.defaults),ae},ae.getDefaults=$,ae.defaults=x,ae.use=function(){for(var u=this,e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];var r,i=re.apply(void 0,[{}].concat(t)),s=ae.defaults.extensions||{renderers:{},childTokens:{}};t.forEach(function(l){var t;l.extensions&&(r=!0,l.extensions.forEach(function(r){if(!r.name)throw new Error("extension name required");var i;if(r.renderer&&(i=s.renderers?s.renderers[r.name]:null,s.renderers[r.name]=i?function(){for(var e=arguments.length,t=new Array(e),u=0;u<e;u++)t[u]=arguments[u];var n=r.renderer.apply(this,t);return n=!1===n?i.apply(this,t):n}:r.renderer),r.tokenizer){if(!r.level||"block"!==r.level&&"inline"!==r.level)throw new Error("extension level must be 'block' or 'inline'");s[r.level]?s[r.level].unshift(r.tokenizer):s[r.level]=[r.tokenizer],r.start&&("block"===r.level?s.startBlock?s.startBlock.push(r.start):s.startBlock=[r.start]:"inline"===r.level&&(s.startInline?s.startInline.push(r.start):s.startInline=[r.start]))}r.childTokens&&(s.childTokens[r.name]=r.childTokens)})),l.renderer&&function(){var e,s=ae.defaults.renderer||new ne;for(e in l.renderer)!function(r){var i=s[r];s[r]=function(){for(var e=arguments.length,t=new Array(e),u=0;u<e;u++)t[u]=arguments[u];var n=l.renderer[r].apply(s,t);return n=!1===n?i.apply(s,t):n}}(e);i.renderer=s}(),l.tokenizer&&function(){var e,s=ae.defaults.tokenizer||new ue;for(e in l.tokenizer)!function(r){var i=s[r];s[r]=function(){for(var e=arguments.length,t=new Array(e),u=0;u<e;u++)t[u]=arguments[u];var n=l.tokenizer[r].apply(s,t);return n=!1===n?i.apply(s,t):n}}(e);i.tokenizer=s}(),l.walkTokens&&(t=ae.defaults.walkTokens,i.walkTokens=function(e){l.walkTokens.call(u,e),t&&t(e)}),r&&(i.extensions=s),ae.setOptions(i)})},ae.walkTokens=function(e,l){for(var a,t=o(e);!(a=t()).done;)!function(){var t=a.value;switch(l(t),t.type){case"table":for(var e=o(t.tokens.header);!(u=e()).done;){var u=u.value;ae.walkTokens(u,l)}for(var n,r=o(t.tokens.cells);!(n=r()).done;)for(var i=o(n.value);!(s=i()).done;){var s=s.value;ae.walkTokens(s,l)}break;case"list":ae.walkTokens(t.items,l);break;default:ae.defaults.extensions&&ae.defaults.extensions.childTokens&&ae.defaults.extensions.childTokens[t.type]?ae.defaults.extensions.childTokens[t.type].forEach(function(e){ae.walkTokens(t[e],l)}):t.tokens&&ae.walkTokens(t.tokens,l)}}()},ae.parseInline=function(e,t){if(null==e)throw new Error("marked.parseInline(): input parameter is undefined or null");if("string"!=typeof e)throw new Error("marked.parseInline(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");t=re({},ae.defaults,t||{}),ie(t);try{var u=ee.lexInline(e,t);return t.walkTokens&&ae.walkTokens(u,t.walkTokens),te.parseInline(u,t)}catch(e){if(e.message+="\nPlease report this to https://github.com/markedjs/marked.",t.silent)return"<p>An error occurred:</p><pre>"+se(e.message+"",!0)+"</pre>";throw e}},ae.Parser=te,ae.parser=te.parse,ae.Renderer=ne,ae.TextRenderer=S,ae.Lexer=ee,ae.lexer=ee.lex,ae.Tokenizer=ue,ae.Slugger=B,ae.parse=ae});
\ No newline at end of file

From bf7289032a342c3075a274918a8589ad87f6d5ef Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 21 Mar 2024 11:25:05 +0800
Subject: [PATCH 126/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Aprivate?=
 =?UTF-8?q?=E4=BC=A0=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8bb0ed92..a4e369c1 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -203,8 +203,9 @@ class ProjectsController < ApplicationController
                                                :project_category_id, :project_language_id, :private, :identifier)
 
         Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier, project_name: @project.name)).validate!
-  
-        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || !@project.is_public
+
+        private = params[:private].nil? ? !@project.is_public : params[:private]
+        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : private
 
         new_project_params = project_params.except(:private).merge(is_public: !private)
         @project.update_attributes!(new_project_params)

From 6e2816af758a1eabae843e7272f45deeb8112b62 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 21 Mar 2024 14:58:35 +0800
Subject: [PATCH 127/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5acge=E7=94=A8=E6=88=B7=E5=B9=B6=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B9=B3=E5=8F=B0=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/oauth/acge_controller.rb | 38 ++++++++++++++++++++++--
 app/models/user.rb                       |  2 +-
 public/操作系统大赛用户信息.csv          |  2 ++
 3 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 public/操作系统大赛用户信息.csv

diff --git a/app/controllers/oauth/acge_controller.rb b/app/controllers/oauth/acge_controller.rb
index 5afc57c6..d9db8a89 100644
--- a/app/controllers/oauth/acge_controller.rb
+++ b/app/controllers/oauth/acge_controller.rb
@@ -3,12 +3,16 @@ class Oauth::AcgeController < Oauth::BaseController
 
   def create 
     begin
-      code = params['code'].to_s.strip
-      tip_exception("code不能为空") if code.blank?
       uid = params['uid'].to_s.strip
       tip_exception("uid不能为空") if uid.blank?
       redirect_uri = params['redirect_uri'].to_s.strip
       tip_exception("redirect_uri不能为空") if redirect_uri.blank?
+      email = params['email'].to_s.strip 
+      tip_exception("email不能为空") if email.blank?
+      phone = params['phone'].to_s.strip 
+      tip_exception("phone不能为空") if phone.blank?
+      name = params['name'].to_s.strip 
+      tip_exception("name不能为空") if name.blank?
 
       open_user = OpenUsers::Acge.find_by(uid: uid)
       if open_user.present? && open_user.user.present?
@@ -18,13 +22,41 @@ class Oauth::AcgeController < Oauth::BaseController
       else
         if current_user.blank? || !current_user.logged?
           session[:unionid] = uid 
+          user = User.find_by(mail: email) || User.find_by(phone: phone)
+          if user.present? 
+            OpenUsers::Acge.create!(user: user, uid: uid)
+            successful_authentication(user)
+            redirect_to redirect_uri
+
+            return
+          else
+            username = uid[0..7]
+            password = SecureRandom.hex(4)
+            reg_result = autologin_register(username, email, password, 'acge', phone, name)
+            CSV.open("public/操作系统大赛用户信息.csv", 'wb') do |csv| 
+              csv << [username, email, password, phone, name]
+            end
+            if reg_result[:message].blank?
+              open_user = OpenUsers::Acge.create!(user_id: reg_result[:user][:id], uid: uid)
+              successful_authentication(open_user.user)
+              redirect_to redirect_uri
+
+              return
+            else 
+              render_error(reg_result[:message])
+            end
+          end
         else
           OpenUsers::Acge.create!(user: current_user, uid: uid)
+          successful_authentication(current_user)
+          redirect_to redirect_uri
+
+          return
         end
       end
 
       Rails.logger.info("[OAuth2] session[:unionid] -> #{session[:unionid]}")
-      redirect_to "/bindlogin/acge?redirect_uri=#{redirect_uri}"
+      # redirect_to "/bindlogin/acge?redirect_uri=#{redirect_uri}"
     rescue Exception => ex
       render_error(ex.message)
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index afe817d3..9d623f94 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -115,7 +115,7 @@ class User < Owner
   # trustie: 来自Trustie平台
   # forge: 平台本身注册的用户
   # military: 军科的用户
-  enumerize :platform, in: [:forge, :educoder, :trustie, :military, :github, :gitee, :qq, :wechat, :bot], default: :forge, scope: :shallow
+  enumerize :platform, in: [:forge, :educoder, :trustie, :military, :github, :gitee, :qq, :wechat, :bot, :acge], default: :forge, scope: :shallow
 
   belongs_to :laboratory, optional: true
   has_one :user_extension, dependent: :destroy
diff --git a/public/操作系统大赛用户信息.csv b/public/操作系统大赛用户信息.csv
new file mode 100644
index 00000000..7365072b
--- /dev/null
+++ b/public/操作系统大赛用户信息.csv
@@ -0,0 +1,2 @@
+用户名,邮箱,密码,手机号,昵称
+123456789,yystopf1@163.com,9b653a7d,15386415122,何慧

From c999d37f7ebbbdabcd55c20fddbbf6be77f58f9f Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 21 Mar 2024 16:58:27 +0800
Subject: [PATCH 128/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5acge=E7=94=A8=E6=88=B7=E8=AE=B0=E5=BD=95=E5=9C=A8?=
 =?UTF-8?q?=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/oauth/acge_controller.rb b/app/controllers/oauth/acge_controller.rb
index d9db8a89..73360cf6 100644
--- a/app/controllers/oauth/acge_controller.rb
+++ b/app/controllers/oauth/acge_controller.rb
@@ -33,8 +33,11 @@ class Oauth::AcgeController < Oauth::BaseController
             username = uid[0..7]
             password = SecureRandom.hex(4)
             reg_result = autologin_register(username, email, password, 'acge', phone, name)
-            CSV.open("public/操作系统大赛用户信息.csv", 'wb') do |csv| 
-              csv << [username, email, password, phone, name]
+            existing_rows = CSV.read("public/操作系统大赛用户信息.csv")
+            new_row = [username, email, password, phone, name]
+            existing_rows << new_row
+            CSV.open("public/操作系统大赛用户信息.csv", 'w') do |csv| 
+              existing_rows.each { |row| csv << row }
             end
             if reg_result[:message].blank?
               open_user = OpenUsers::Acge.create!(user_id: reg_result[:user][:id], uid: uid)

From 68348f1fc31546dca3d97df0d2e6a4b14efc3fbf Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 21 Mar 2024 17:38:57 +0800
Subject: [PATCH 129/130] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Acsv=E5=86=99?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/oauth/acge_controller.rb b/app/controllers/oauth/acge_controller.rb
index 73360cf6..efa5cca0 100644
--- a/app/controllers/oauth/acge_controller.rb
+++ b/app/controllers/oauth/acge_controller.rb
@@ -36,7 +36,7 @@ class Oauth::AcgeController < Oauth::BaseController
             existing_rows = CSV.read("public/操作系统大赛用户信息.csv")
             new_row = [username, email, password, phone, name]
             existing_rows << new_row
-            CSV.open("public/操作系统大赛用户信息.csv", 'w') do |csv| 
+            CSV.open("public/操作系统大赛用户信息.csv", 'wb') do |csv| 
               existing_rows.each { |row| csv << row }
             end
             if reg_result[:message].blank?

From b91358a7fe83c1a3a27086495023f30c69f08b45 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 22 Mar 2024 08:49:26 +0800
Subject: [PATCH 130/130] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E9=9C=80=E4=BC=A0type=E5=80=BC?=
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 61541d09..0ce74c5b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -715,7 +715,7 @@ class ApplicationController < ActionController::Base
 	end
 
 	def find_user_with_id
-		@user = User.find_by_id params[:user_id]
+		@user = User.find_by(type: 'User', id: params[:user_id])
     # render_not_found("未找到’#{params[:login]}’相关的用户") unless @user
 		render_error("未找到相关的用户") unless @user
 	end