diff --git a/Gemfile b/Gemfile
index edaae8a75..811fabc41 100644
--- a/Gemfile
+++ b/Gemfile
@@ -141,4 +141,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.4.6'
+gem 'gitea-client', '~> 1.5.7'
diff --git a/app/controllers/admins/message_templates_controller.rb b/app/controllers/admins/message_templates_controller.rb
index 6a5000c24..abe332ac5 100644
--- a/app/controllers/admins/message_templates_controller.rb
+++ b/app/controllers/admins/message_templates_controller.rb
@@ -7,12 +7,12 @@ class Admins::MessageTemplatesController < Admins::BaseController
   end
 
   def new 
-    @message_template = MessageTemplate.new
+    @message_template = MessageTemplate::CustomTip.new
   end
 
-  def create
-    @message_template = MessageTemplate::CustomTip.new(message_template_params)
-    @message_template.type = "MessageTemplate::CustomTip"
+  def create 
+    @message_template = MessageTemplate::CustomTip.new
+    @message_template.attributes = message_template_params
     if @message_template.save!
       redirect_to admins_message_templates_path 
       flash[:success] = "创建消息模板成功"
@@ -47,9 +47,7 @@ class Admins::MessageTemplatesController < Admins::BaseController
 
   private 
   def message_template_params
-    # type = @message_template.present? ? @message_template.type : "MessageTemplate::CustomTip"
-    # params.require(type.split("::").join("_").underscore.to_sym).permit!
-    params.require(:message_template_custom_tip).permit!
+    params.require(@message_template.type.split("::").join("_").underscore.to_sym).permit!
   end
 
   def get_template
diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb
index dc3f6030a..926ab8a29 100644
--- a/app/controllers/admins/projects_controller.rb
+++ b/app/controllers/admins/projects_controller.rb
@@ -32,7 +32,7 @@ class Admins::ProjectsController < Admins::BaseController
   def destroy
     project = Project.find_by!(id: params[:id])
     ActiveRecord::Base.transaction do
-      Gitea::Repository::DeleteService.new(project.owner, project.identifier).call
+      Gitea::Repository::DeleteService.new(project.owner, project.identifier, current_user.gitea_token).call
       project.destroy!
       # render_delete_success
       UserAction.create(action_id: project.id, action_type: "DestroyProject", user_id: current_user.id, :ip => request.remote_ip, data_bank: project.attributes.to_json)
diff --git a/app/controllers/api/v1/gitlink_competition_applies_controller.rb b/app/controllers/api/v1/gitlink_competition_applies_controller.rb
new file mode 100644
index 000000000..5f2d7ef28
--- /dev/null
+++ b/app/controllers/api/v1/gitlink_competition_applies_controller.rb
@@ -0,0 +1,37 @@
+class Api::V1::GitlinkCompetitionAppliesController < Api::V1::BaseController 
+
+  def create 
+    return render_error("请输入正确的竞赛ID") unless params[:competition_id].present? 
+    return render_error("请输入正确的队伍ID") unless params[:team_id].present? 
+    return render_error("请输入正确的队伍成员信息") unless params[:team_members].is_a?(Array)
+    params[:team_members].each do |member| 
+      apply = GitlinkCompetitionApply.find_or_create_by(competition_id: params[:competition_id], team_id: params[:team_id], educoder_login: member[:login])
+      apply.competition_identifier = params[:competition_identifier]
+      apply.team_name = params[:team_name]
+      apply.school_name = member[:school_name]
+      apply.nickname = member[:nickname]
+      apply.identity = member[:identity]
+      apply.role = member[:role]
+      apply.email = member[:email]
+      user_info = get_user_info_by_educoder_login(member[:login])
+      apply.phone = user_info["phone"]
+      apply.save
+    end
+    render_ok
+  end
+
+  def get_user_info_by_educoder_login(edu_login)
+    req_params = { "login" => "#{edu_login}", "private_token" => "hriEn3UwXfJs3PmyXnqQ" }
+    api_url=  "https://data.educoder.net"
+    client = Faraday.new(url: api_url)
+    response = client.public_send("get", "/api/sources/get_user_info_by_login", req_params)
+    result = JSON.parse(response.body)
+
+    return nil if result["status"].to_s != "0"
+
+    # login 邮箱 手机号 姓名 学校/单位
+    user_info = result["data"]
+
+    return user_info
+  end
+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
index 05918dbe2..ff7c28e85 100644
--- a/app/controllers/api/v1/projects/actions/runs_controller.rb
+++ b/app/controllers/api/v1/projects/actions/runs_controller.rb
@@ -5,8 +5,42 @@ class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::B
     puts @result_object
   end
 
+  def rerun 
+    return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank?
+    gitea_result = $gitea_hat_client.post_repos_actions_runs_rerun_by_owner_repo_run(@project&.owner&.login, @project&.identifier, params[:run_id]) rescue nil 
+    if gitea_result
+      render_ok 
+    else 
+      render_error("重启所有流水线任务失败")
+    end
+  end
+
+  def job_rerun 
+    return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank?
+    return render_error("请输入正确的流水线任务ID") if params[:job].blank? 
+    gitea_result = $gitea_hat_client.post_repos_actions_runs_jobs_rerun_by_owner_repo_run_job(@project&.owner&.login, @project&.identifier, params[:run_id], params[:job]) rescue nil 
+    if gitea_result
+      render_ok 
+    else 
+      render_error("重启流水线任务失败")
+    end
+  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)
   end
 
+  def job_logs 
+    return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank?
+    return render_error("请输入正确的流水线任务ID") if params[:job].blank? 
+    domain  = GiteaService.gitea_config[:domain]
+    api_url = GiteaService.gitea_config[:hat_base_url]
+
+    url = "/repos/#{@owner.login}/#{@repository.identifier}/actions/runs/#{CGI.escape(params[:run_id])}/jobs/#{CGI.escape(params[:job])}/logs"
+    file_path = [domain, api_url, url].join
+    file_path = [file_path, "access_token=#{@owner&.gitea_token}"].join("?") 
+
+    redirect_to file_path
+  end
+
 end
\ No newline at end of file
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index d7a0396a1..fa83f6e5c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -36,6 +36,8 @@ class ProjectsController < ApplicationController
   def index
     scope = current_user.logged? ? Projects::ListQuery.call(params, current_user.id) : Projects::ListQuery.call(params)
 
+    # scope = scope.joins(repository: :mirror).where.not(mirrors: {status: 2}) # 导入失败项目不显示
+
     @projects = kaminari_paginate(scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units, :project_topics))
     # @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
 
@@ -214,7 +216,7 @@ class ProjectsController < ApplicationController
 
         new_project_params = project_params.except(:private).merge(is_public: !private)
         @project.update_attributes!(new_project_params)
-        @project.forked_projects.update_all(is_public: @project.is_public)
+        @project.forked_projects.map{|p| p.update!(is_public: @project.is_public)}
         gitea_params = {
           private: private,
           default_branch: @project.default_branch,
@@ -255,7 +257,7 @@ class ProjectsController < ApplicationController
   def destroy
     if current_user.admin? || @project.manager?(current_user)
       ActiveRecord::Base.transaction do
-        Gitea::Repository::DeleteService.new(@project.owner, @project.identifier).call
+        Gitea::Repository::DeleteService.new(@project.owner, @project.identifier,current_user.gitea_token).call
         @project.destroy!
         @project.forked_projects.update_all(forked_from_project_id: nil)
         # 如果该项目有所属的项目分类以及为私有项目，需要更新对应数量
@@ -305,6 +307,30 @@ class ProjectsController < ApplicationController
   end
 
   def simple
+    if !@project.common? && @project&.repository&.mirror&.waiting?
+      gitea_result = $gitea_client.get_repos_by_owner_repo(@project&.owner&.login, @project&.identifier)
+      if !gitea_result["empty"]
+        @project&.update_columns(gpid: gitea_result["id"])
+        @project&.repository&.mirror&.succeeded!
+        project_id = @project&.id
+        user_id = @project&.owner&.id
+        Rails.logger.info "############ mirror project_id,user_id: #{project_id},#{user_id}  ############"
+        OpenProjectDevOpsJob.set(wait: 5.seconds).perform_later(project_id, user_id) if project_id.present? && user_id.present?
+        UpdateProjectTopicJob.set(wait: 1.seconds).perform_later(project_id) if project_id.present?
+        Rails.logger.info "############ mirror status: #{@project&.repository&.mirror&.status} ############"
+      end
+    elsif !@project.common? && @project&.repository&.mirror&.failed?
+      # 导入失败的项目标记 project.status=0, 在列表中不显示
+      @project&.update_columns(status: 0) if @project&.status == 1
+
+      # Rails.logger.info "############ mirror status: #{@project&.repository&.mirror&.status}"
+      # Gitea::Repository::DeleteService.new(@project.owner, @project.identifier,current_user.gitea_token).call
+      # @project.destroy!
+      # @project.forked_projects.update_all(forked_from_project_id: nil)
+      # # 如果该项目有所属的项目分类以及为私有项目，需要更新对应数量
+      # @project.project_category.decrement!(:private_projects_count, 1) if @project.project_category.present? && !@project.is_public
+      # return render_error("导入失败，请重试！")
+    end
     # 为了缓存活跃项目的基本信息，后续删除
     Cache::V2::ProjectCommonService.new(@project.id).read
     # 项目名称，标识，所有者变化时重置缓存
diff --git a/app/controllers/version_releases_controller.rb b/app/controllers/version_releases_controller.rb
index 2419a1fef..d542fbb76 100644
--- a/app/controllers/version_releases_controller.rb
+++ b/app/controllers/version_releases_controller.rb
@@ -157,7 +157,7 @@ class VersionReleasesController < ApplicationController
       name: params[:name],
       prerelease: params[:prerelease] || false,
       tag_name: params[:tag_name],
-      target_commitish: params[:target_commitish] || "master"  #分支
+      target_commitish: params[:target_commitish] || @project.default_branch  #分支
     }
   end
 
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 360f7d03f..79e58346d 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -210,11 +210,13 @@ module RepositoriesHelper
       end
     end
 
-    after_ss_souces = content.to_s.scan(s_regex)
+    after_ss_souces = content.to_s.scan(s_regex).uniq
     after_ss_souces.each_with_index do |s, index| 
       content = content.gsub("#{s[0]}","#{total_sources[:ss][index][0]}")
     end
-    after_ss_c_souces = content.to_s.scan(s_regex_c)
+    after_ss_c_souces = content.to_s.scan(s_regex_c).uniq
+    puts after_ss_c_souces
+    puts total_sources
     after_ss_c_souces.each_with_index do |s, index| 
       content = content.gsub("#{s[0]}","#{total_sources[:ss_c][index][0]}")
     end
diff --git a/app/jobs/check_mirror_job.rb b/app/jobs/check_mirror_job.rb
index 9854110b8..7de7cbd1b 100644
--- a/app/jobs/check_mirror_job.rb
+++ b/app/jobs/check_mirror_job.rb
@@ -11,7 +11,7 @@ class CheckMirrorJob < ApplicationJob
       unless response.present?
         SyncLog.sync_log("==========check_project_error_id:#{project.id}============")
         ActiveRecord::Base.transaction do
-          delete_gitea = Gitea::Repository::DeleteService.new(project.owner, project.identifier).call
+          delete_gitea = Gitea::Repository::DeleteService.new(project.owner, project.identifier, project.owner.gitea_token).call
           if delete_gitea.status == 204 || delete_gitea.status == 404   #删除成功或者仓库不存在，都重新创建
             repository_params= {
               name: project.identifier,
diff --git a/app/jobs/migrate_remote_repository_job.rb b/app/jobs/migrate_remote_repository_job.rb
index 2493bff01..1d6e41128 100644
--- a/app/jobs/migrate_remote_repository_job.rb
+++ b/app/jobs/migrate_remote_repository_job.rb
@@ -19,9 +19,21 @@ class MigrateRemoteRepositoryJob < ApplicationJob
       UpdateProjectTopicJob.set(wait: 1.seconds).perform_later(project_id) if project_id.present?
       puts "############ mirror status: #{repo.mirror.status} ############"
     else 
-      repo&.mirror&.failed!
+      gitea_result = $gitea_client.get_repos_by_owner_repo(repo&.project&.owner&.login, repo&.project&.identifier)
+      if gitea_result["empty"]
+        repo&.mirror&.failed!
+        repo&.project&.update_columns(status: 0)
+      else
+        repo&.project&.update_columns(gpid: gitea_result["id"])
+        repo&.mirror&.succeeded!
+        project_id = repo&.project&.id
+        puts "############ mirror project_id,user_id: #{project_id},#{user_id}  ############"
+        OpenProjectDevOpsJob.set(wait: 5.seconds).perform_later(project_id, user_id) if project_id.present? && user_id.present?
+        UpdateProjectTopicJob.set(wait: 1.seconds).perform_later(project_id) if project_id.present?
+        puts "############ mirror status: #{repo.mirror.status} ############"
+      end
     end
     # UpdateProjectTopicJob 中语言要延迟1S才能获取
-    BroadcastMirrorRepoMsgJob.set(wait: 1.seconds).perform_later(repo.id) unless repo&.mirror.waiting?
+    BroadcastMirrorRepoMsgJob.set(wait: 10.seconds).perform_later(repo.id) unless repo&.mirror.waiting?
   end
 end
diff --git a/app/models/gitlink_competition_apply.rb b/app/models/gitlink_competition_apply.rb
new file mode 100644
index 000000000..f3b7d4ce1
--- /dev/null
+++ b/app/models/gitlink_competition_apply.rb
@@ -0,0 +1,21 @@
+ # == Schema Information
+#
+# Table name: gitlink_competition_applies
+#
+#  id                     :integer          not null, primary key
+#  competition_id         :integer
+#  competition_identifier :string(255)
+#  team_id                :integer
+#  team_name              :string(255)
+#  school_name            :string(255)
+#  login                  :string(255)
+#  nickname               :string(255)
+#  phone                  :string(255)
+#  identity               :string(255)
+#  role                   :string(255)
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#
+
+class GitlinkCompetitionApply < ApplicationRecord
+end
diff --git a/app/models/organization.rb b/app/models/organization.rb
index f978611b1..faa6396df 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -216,4 +216,9 @@ class Organization < Owner
     ids.uniq.size
   end
 
+  # user容错处理
+  def get_letter_avatar_url
+    ""
+  end
+
 end
diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb
index c67feed61..09a02010c 100644
--- a/app/queries/projects/list_query.rb
+++ b/app/queries/projects/list_query.rb
@@ -38,7 +38,7 @@ class Projects::ListQuery < ApplicationQuery
   end
 
   def main_collection
-    collection = Project.visible
+    collection = Project.visible.where(status: 1)
     # 增加私有组织中项目过滤
     collection = collection.joins("left join organization_extensions on organization_extensions.organization_id = projects.user_id")
                            .where("organization_extensions.visibility is null or organization_extensions.visibility in (0,1)")
diff --git a/app/services/gitea/repository/delete_service.rb b/app/services/gitea/repository/delete_service.rb
index eee6ca6d6..c5d5c1b50 100644
--- a/app/services/gitea/repository/delete_service.rb
+++ b/app/services/gitea/repository/delete_service.rb
@@ -1,9 +1,10 @@
 class Gitea::Repository::DeleteService < Gitea::ClientService
-  attr_reader :user, :repo_name
+  attr_reader :user, :repo_name, :token
 
-  def initialize(user, repo_name)
+  def initialize(user, repo_name, token=nil)
     @user = user
     @repo_name = repo_name
+    @token = token
   end
 
   def call
@@ -13,7 +14,7 @@ class Gitea::Repository::DeleteService < Gitea::ClientService
   private
 
   def params
-    Hash.new.merge(token: user.gitea_token)
+    Hash.new.merge(token: token)
   end
 
   def url
diff --git a/app/views/repositories/detail.json.jbuilder b/app/views/repositories/detail.json.jbuilder
index 0e5d850a5..236cb165d 100644
--- a/app/views/repositories/detail.json.jbuilder
+++ b/app/views/repositories/detail.json.jbuilder
@@ -1,4 +1,3 @@
-json.empty @result[:repo]["empty"]
 json.content @project.content
 json.website @project.website
 json.lesson_url @project.lesson_url
@@ -47,6 +46,7 @@ json.fork_info do
   end
 end
 if @result[:repo]
+  json.empty @result[:repo]["empty"]
   json.size replace_bytes_to_b(number_to_human_size(@result[:repo]['size'].to_i*1024))
   json.ssh_url @result[:repo]['ssh_url']
   json.clone_url @project.educoder? ? "#{Rails.application.config_for(:configuration)['educoder']['git_site']}/#{@project&.project_educoder&.repo_name}.git" : @result[:repo]['clone_url']
@@ -55,6 +55,7 @@ if @result[:repo]
   json.full_name @result[:repo]['full_name']
   json.private @result[:repo]['private']
 else  
+  json.empty true
   json.size 0
   json.ssh_url nil 
   json.clone_url nil
diff --git a/config/routes/api.rb b/config/routes/api.rb
index b502a679e..34751cf50 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -96,6 +96,9 @@ defaults format: :json do
                 post :enable
                 resources :runs, only: [:index] do 
                   post '/jobs/:job', to: 'runs#job_show'
+                  post '/rerun', to: 'runs#rerun'
+                  post '/jobs/:job/rerun', to: 'runs#job_rerun'
+                  get '/jobs/:job/logs', to: 'runs#job_logs'
                 end 
               end
             end
@@ -159,6 +162,7 @@ defaults format: :json do
       resources :projects, only: [:index]
       resources :project_topics, only: [:index, :create, :destroy]
       resources :project_datasets, only: [:index]
+      resources :gitlink_competition_applies, only: [:create]
       
     end
   end
diff --git a/db/migrate/20240522015212_create_gitlink_competition_applies.rb b/db/migrate/20240522015212_create_gitlink_competition_applies.rb
new file mode 100644
index 000000000..6f24a0922
--- /dev/null
+++ b/db/migrate/20240522015212_create_gitlink_competition_applies.rb
@@ -0,0 +1,19 @@
+class CreateGitlinkCompetitionApplies < ActiveRecord::Migration[5.2]
+  def change
+    create_table :gitlink_competition_applies do |t|
+      t.integer :competition_id 
+      t.string :competition_identifier
+      t.integer :team_id
+      t.string :team_name
+      t.string :school_name
+      t.string :educoder_login 
+      t.string :nickname
+      t.string :phone 
+      t.string :email
+      t.string :identity
+      t.string :role
+
+      t.timestamps
+    end
+  end
+end
diff --git a/spec/models/gitlink_competition_apply_spec.rb b/spec/models/gitlink_competition_apply_spec.rb
new file mode 100644
index 000000000..8b05ff4ad
--- /dev/null
+++ b/spec/models/gitlink_competition_apply_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe GitlinkCompetitionApply, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end