Merge branch 'standalone_develop' into pre_trustie_server

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

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)

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

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

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
     # 项目名称，标识，所有者变化时重置缓存

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