Merge pull request '20220608版本' (#307) from develop into master

2022-06-08 14:44:09 +08:00 · 2022-06-08 14:44:09 +08:00 · 4a886b4bb1
parent 31d7f0a13c 507d63e98c
commit 4a886b4bb1
62 changed files with 2816 additions and 1530 deletions
--- a/.gitignore
+++ b/.gitignore
@ -85,3 +85,4 @@ Dockerfile
 dump.rdb
 .tags*
 ceshi_user.xlsx
+public/trace_task_results
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -1,6 +1,25 @@
 class AccountsController < ApplicationController
+  before_action :require_login, only: [:login_check, :simple_update]
  include ApplicationHelper

+  #skip_before_action :check_account, :only => [:logout]
+
+  def simple_update 
+    simple_update_params.merge!(username: params[:username]&.gsub(/\s+/, ""))
+    simple_update_params.merge!(email: params[:email]&.gsub(/\s+/, ""))
+    simple_update_params.merge!(platform: (params[:platform] || 'forge')&.gsub(/\s+/, ""))
+    Register::RemoteForm.new(simple_update_params).validate!
+
+    ActiveRecord::Base.transaction do 
+      result = auto_update(current_user, simple_update_params)
+      if result[:message].blank?
+        render_ok
+      else
+        render_error(result[:message])
+      end
+    end
+  end
+
  def index
    render json: session
  end
@ -316,6 +335,11 @@ class AccountsController < ApplicationController
    render_ok
  end

+  def login_check 
+    Register::LoginCheckColumnsForm.new(check_params.merge(user: current_user)).validate!
+    render_ok
+  end
+  
  private

  # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验证手机号是否有效 # 如果有新的继续后面加
@ -383,4 +407,7 @@ class AccountsController < ApplicationController
    params.permit(:username, :email, :password, :platform)
  end
  
+  def simple_update_params
+    params.permit(:username, :email, :password, :platform)
+  end
 end
--- a/app/controllers/admins/import_users_controller.rb
+++ b/app/controllers/admins/import_users_controller.rb
@ -2,7 +2,7 @@ class Admins::ImportUsersController < Admins::BaseController
  def create
    return render_error('请上传正确的文件') if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)

-    result = Admins::ImportUserService.call(params[:file].to_io)
+    result = Admins::ImportUserFromExcelService.call(params[:file].to_io)
    render_ok(result)
  rescue Admins::ImportUserService::Error => ex
    render_error(ex)
--- a/app/controllers/admins/message_templates_controller.rb
+++ b/app/controllers/admins/message_templates_controller.rb
@ -2,8 +2,24 @@ class Admins::MessageTemplatesController < Admins::BaseController
  before_action :get_template, only: [:edit, :update, :destroy]

  def index 
-    message_templates = MessageTemplate.group(:type).count.keys
-    @message_templates = kaminari_array_paginate(message_templates)
+    message_templates = MessageTemplate.ransack(sys_notice_or_email_or_email_title_cont: params[:search]).result
+    @message_templates = kaminari_paginate(message_templates)
+  end
+
+  def new 
+    @message_template = MessageTemplate::CustomTip.new
+  end
+
+  def create 
+    @message_template = MessageTemplate::CustomTip.new(ignore_params)
+
+    if @message_template.save!
+      redirect_to admins_message_templates_path 
+      flash[:success] = "创建消息模板成功"
+    else
+      render :new
+      flash[:danger] = "创建消息模板失败"
+    end
  end

  def edit 
--- a/app/controllers/ci/cloud_accounts_controller.rb
+++ b/app/controllers/ci/cloud_accounts_controller.rb
@ -14,12 +14,12 @@ class Ci::CloudAccountsController < Ci::BaseController

  def create
    flag, msg = check_bind_cloud_account!
-    return render_error(msg) if flag === true
+    return tip_exception(msg) if flag === true

    ActiveRecord::Base.transaction do
      @cloud_account = bind_account!
      if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
+        tip_exception('激活失败, 请检查你的云服务器信息是否正确.')
        raise ActiveRecord::Rollback
      else
        current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
@ -27,17 +27,17 @@ class Ci::CloudAccountsController < Ci::BaseController
      end
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def activate
-    return render_error('请先认证') unless current_user.ci_certification?
+    return tip_exception('请先认证') unless current_user.ci_certification?

    begin
      @cloud_account = Ci::CloudAccount.find params[:id]
      ActiveRecord::Base.transaction do
        if @repo
-          return render_error('该项目已经激活') if @repo.repo_active?
+          return tip_exception('该项目已经激活') if @repo.repo_active?
          @repo.activate!(@project)
        else
          @repo = Ci::Repo.auto_create!(@ci_user, @project)
@ -50,7 +50,7 @@ class Ci::CloudAccountsController < Ci::BaseController
      end
      render_ok
    rescue Exception => ex
-      render_error(ex.message)
+      tip_exception(ex.message)
    end
  end

@ -59,39 +59,39 @@ class Ci::CloudAccountsController < Ci::BaseController

  def bind
    flag, msg = check_bind_cloud_account!
-    return render_error(msg) if flag === true
+    return tip_exception(msg) if flag === true

    ActiveRecord::Base.transaction do
      @cloud_account = bind_account!
      if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
+        tip_exception('激活失败, 请检查你的云服务器信息是否正确.')
        raise ActiveRecord::Rollback
      else
        current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
      end
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def trustie_bind
    account = params[:account].to_s
-    return render_error("account不能为空.") if account.blank?
+    return tip_exception("account不能为空.") if account.blank?

    flag, msg = check_trustie_bind_cloud_account!
-    return render_error(msg) if flag === true
+    return tip_exception(msg) if flag === true

    ActiveRecord::Base.transaction do
      @cloud_account = trustie_bind_account!
      if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
+        tip_exception('激活失败, 请检查你的云服务器信息是否正确.')
        raise ActiveRecord::Rollback
      else
        current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
      end
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def unbind
@ -107,18 +107,18 @@ class Ci::CloudAccountsController < Ci::BaseController
      render_ok
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def oauth_grant
    password = params[:password].to_s
-    return render_error('你输入的密码不正确.') unless current_user.check_password?(password)
+    return tip_exception('你输入的密码不正确.') unless current_user.check_password?(password)

    oauth = current_user.oauths.last
-    return render_error("服务器出小差了.") if oauth.blank?
+    return tip_exception("服务器出小差了.") if oauth.blank?

    result = gitea_oauth_grant!(password, oauth)
-    return render_error('授权失败.') unless result === true
+    return tip_exception('授权失败.') unless result === true
    current_user.set_drone_step!(User::DEVOPS_CERTIFICATION)
  end

--- a/app/controllers/ci/pipelines_controller.rb
+++ b/app/controllers/ci/pipelines_controller.rb
@ -30,7 +30,7 @@ class Ci::PipelinesController < Ci::BaseController
    ActiveRecord::Base.transaction do
      size = Ci::Pipeline.where('branch=? and identifier=? and owner=?', params[:branch], params[:repo], params[:owner]).size
      if size > 0
-        render_error("#{params[:branch]}分支已经存在流水线！")
+        tip_exception("#{params[:branch]}分支已经存在流水线！")
        return
      end
      pipeline = Ci::Pipeline.new(pipeline_name: params[:pipeline_name], file_name: params[:file_name],owner: params[:owner],
@ -53,7 +53,7 @@ class Ci::PipelinesController < Ci::BaseController
      render_ok({id: pipeline.id})
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  # 在代码库创建文件
@ -81,6 +81,7 @@ class Ci::PipelinesController < Ci::BaseController
        repo_branch: pipeline.branch,
        repo_config: pipeline.file_name
      }
+      Rails.logger.info("########create_params===#{create_params.to_json}")
      repo = Ci::Repo.create_repo(create_params)
      repo
    end
@ -118,7 +119,7 @@ class Ci::PipelinesController < Ci::BaseController
    end
    render_ok
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def destroy
@ -132,7 +133,7 @@ class Ci::PipelinesController < Ci::BaseController
    end
    render_ok
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def content
@ -182,7 +183,7 @@ class Ci::PipelinesController < Ci::BaseController
      render_ok
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def update_stage
@ -192,7 +193,7 @@ class Ci::PipelinesController < Ci::BaseController
    end
    render_ok
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def delete_stage
@ -205,7 +206,7 @@ class Ci::PipelinesController < Ci::BaseController
      render_ok
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def update_stage_index(pipeline_id, show_index, diff)
@ -229,7 +230,7 @@ class Ci::PipelinesController < Ci::BaseController
      unless steps.empty?
        steps.each do |step|
          unless step[:template_id]
-            render_error('请选择模板！')
+            tip_exception('请选择模板！')
            return
          end
          if !step[:id]
@ -246,7 +247,7 @@ class Ci::PipelinesController < Ci::BaseController
      render_ok
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def create_stage_step
@ -262,7 +263,7 @@ class Ci::PipelinesController < Ci::BaseController
      render_ok
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def update_stage_step
@ -279,7 +280,7 @@ class Ci::PipelinesController < Ci::BaseController
      render_ok
    end
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def delete_stage_step
@ -289,6 +290,6 @@ class Ci::PipelinesController < Ci::BaseController
    end
    render_ok
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end
 end
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@ -30,19 +30,19 @@ class Ci::ProjectsController < Ci::BaseController
      @file = interactor.result
      render_result(1, "更新成功")
    else
-      render_error(interactor.error)
+      tip_exception(interactor.error)
    end
  end

  def activate
-    return render_error('你还未认证') unless current_user.ci_certification?
+    return tip_exception('你还未认证') unless current_user.ci_certification?

    begin
      ActiveRecord::Base.transaction do
        if @repo
-          return render_error('该项目已经激活') if @repo.repo_active?
+          @repo.destroy! if @repo&.repo_user_id == 0
+          return tip_exception('该项目已经激活') if @repo.repo_active?
          @repo.activate!(@project)
-          return render_ok
        else
          @repo = Ci::Repo.auto_create!(@ci_user, @project)
          @ci_user.update_column(:user_syncing, false)
@ -55,12 +55,12 @@ class Ci::ProjectsController < Ci::BaseController
      end
      render_ok
    rescue Exception => ex
-      render_error(ex.message)
+      tip_exception(ex.message)
    end
  end

  def deactivate
-    return render_error('该项目已经取消激活') if !@repo.repo_active?
+    return tip_exception('该项目已经取消激活') if !@repo.repo_active?

    @project.update_column(:open_devops, false)
    @repo.deactivate_repos!
--- a/app/controllers/ci/secrets_controller.rb
+++ b/app/controllers/ci/secrets_controller.rb
@ -20,14 +20,14 @@ class Ci::SecretsController < Ci::BaseController
      if result["id"]
        render_ok
      else
-        render_error(result["message"])
+        tip_exception(result["message"])
      end
    else
      result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).create_secret
      if result["id"]
        render_ok
      else
-        render_error(result["message"])
+        tip_exception(result["message"])
      end
    end
  end
@ -39,7 +39,7 @@ class Ci::SecretsController < Ci::BaseController
      Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], {name: name}).delete_secret
      render_ok
    else
-      render_error("参数名不能为空")
+      tip_exception("参数名不能为空")
    end
  rescue Exception => ex
    render_ok
--- a/app/controllers/ci/templates_controller.rb
+++ b/app/controllers/ci/templates_controller.rb
@ -50,7 +50,7 @@ class Ci::TemplatesController < Ci::BaseController
    end
    render_ok
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def update
@ -63,7 +63,7 @@ class Ci::TemplatesController < Ci::BaseController
    )
    render_ok
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  def destroy
@ -73,7 +73,7 @@ class Ci::TemplatesController < Ci::BaseController
    end
    render_ok
  rescue Exception => ex
-    render_error(ex.message)
+    tip_exception(ex.message)
  end

  #======流水线模板查询=====#
--- a/app/controllers/concerns/ci/cloud_account_manageable.rb
+++ b/app/controllers/concerns/ci/cloud_account_manageable.rb
@ -160,9 +160,9 @@ module Ci::CloudAccountManageable
    state = SecureRandom.hex(8)
    # redirect_uri eg:
    #  https://localhost:3000/login/oauth/authorize?client_id=94976481-ad0e-4ed4-9247-7eef106007a2&redirect_uri=http%3A%2F%2F121.69.81.11%3A80%2Flogin&response_type=code&state=9cab990b9cfb1805
-    redirect_uri = CGI.escape("#{@cloud_account.drone_url}/login")
-    clientId = client_id(oauth)
-    grant_url = "#{Gitea.gitea_config[:domain]}/login/oauth/authorize?client_id=#{clientId}&redirect_uri=#{redirect_uri}&response_type=code&state=#{state}"
+    # redirect_uri = CGI.escape("#{@cloud_account.drone_url}/login")
+    # clientId = client_id(oauth)
+    grant_url = "#{@cloud_account.drone_url}/login"
    logger.info "[gitea] grant_url: #{grant_url}"

    conn = Faraday.new(url: grant_url) do |req|
@ -179,7 +179,7 @@ module Ci::CloudAccountManageable

  def drone_oauth_user!(url, state)
    logger.info "[drone] drone_oauth_user url: #{url}"
-    conn = Faraday.new(url: "#{Gitea.gitea_config[:domain]}#{url}") do |req|
+    conn = Faraday.new(url: url) do |req|
      req.request :url_encoded
      req.adapter Faraday.default_adapter
      req.headers["cookie"] = "_session_=#{SecureRandom.hex(28)}; _oauth_state_=#{state}"
@ -188,8 +188,8 @@ module Ci::CloudAccountManageable
    response = conn.get
    logger.info "[drone] response headers: #{response.headers}"

-    true
-    # response.headers['location'].include?('error') ? false : true
+    # true
+    response.headers['location'].include?('error') ? false : true
  end

  private
--- a/app/controllers/concerns/register_helper.rb
+++ b/app/controllers/concerns/register_helper.rb
@ -58,4 +58,32 @@ module RegisterHelper
    end
  end

+  def auto_update(user, params={})
+    return if params.blank?
+    result = {message: nil, user: nil}
+    before_login = user.login
+    user.login = params[:username]
+    user.password = params[:password]
+    user.mail = params[:email]
+
+    if user.save! 
+      sync_params = {
+        password: params[:password].to_s,
+        email: params[:email],
+        login_name: params[:username],
+        new_name: params[:username],
+        source_id: 0
+      }
+  
+      interactor = Gitea::User::UpdateInteractor.call(before_login, sync_params)
+      if interactor.success? 
+        result[:user] = user
+      else
+        result[:message] = '用户同步Gitea失败!'
+      end
+    else
+      result[:message] = user.errors.full_messages.join(",")
+      return
+    end
+  end
 end
--- a/app/controllers/concerns/render_helper.rb
+++ b/app/controllers/concerns/render_helper.rb
@ -4,7 +4,7 @@ module RenderHelper
  end

  def render_error(message = '')
-    render json: { status: -1, message: message }
+    render json: { status: status, message: message }
  end

  def render_not_acceptable(message = '请求已拒绝')
--- a/app/controllers/notices_controller.rb
+++ b/app/controllers/notices_controller.rb
@ -1,7 +1,7 @@
 class NoticesController < ApplicationController

  def create
-    tip_exception("参数有误") if params["source"].blank?
+    return tip_exception("参数有误") if params["source"].blank?
    user_id = params[:user_id]

    if params["source"] == "CompetitionBegin"
@ -13,9 +13,21 @@ class NoticesController < ApplicationController
    elsif params["source"] == "CompetitionReview"
      competition_id = params[:competition_id]
      SendTemplateMessageJob.perform_later('CompetitionReview', user_id, competition_id)
+    elsif params["source"] == "CustomTip"
+      users_id = params[:users_id]
+      props = params[:props].to_unsafe_hash
+      return tip_exception("参数有误") unless props.is_a?(Hash) && users_id.is_a?(Array)
+      template_id = params[:template_id]
+      SendTemplateMessageJob.perform_later('CustomTip', users_id, template_id, props)
    else
      tip_exception("#{params["source"]}未配置")
    end
    render_ok
  end
+
+
+  private 
+  def params_props
+    params.require(:notice).permit(:props)
+  end
 end
--- a/app/controllers/owners_controller.rb
+++ b/app/controllers/owners_controller.rb
@ -12,7 +12,7 @@ class OwnersController < ApplicationController

  def show 
    @owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
-    return render_ok(type: 'User') unless @owner.present?
+    return render_not_found unless @owner.present?
    # 组织
    if @owner.is_a?(Organization)
      return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -22,6 +22,7 @@ class ProjectsController < ApplicationController
    menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") && @project.forge?
    menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions")
    menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge?
+    menu.append(menu_hash_by_name("services")) if @project.has_menu_permission("services") && @project.forge? && (current_user.admin? || @project.member?(current_user.id))
    menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources") && @project.forge?
    menu.append(menu_hash_by_name("activity"))
    menu.append(menu_hash_by_name("settings")) if user_is_admin && @project.forge?
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -225,7 +225,8 @@ class RepositoriesController < ApplicationController
    @path = Gitea.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/"
    @readme = result[:status] === :success ? result[:body] : nil
    @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path)
-    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha")
+    @readme['replace_content'] = readme_decode64_content(@readme, @owner, @repository, params[:ref], @path)
+    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha", "replace_content")
  rescue 
    render json: nil
  end
--- a/app/controllers/traces/base_controller.rb
+++ b/app/controllers/traces/base_controller.rb
@ -0,0 +1,18 @@
+class Traces::BaseController < ApplicationController
+
+  helper_method :observed_logged_user?, :observed_user
+
+
+  def observed_user
+    @_observed_user ||= (User.find_by_login(params[:user_id]) || User.find_by_id(params[:user_id]))
+  end
+
+  def observed_logged_user?
+    observed_user.id == User.current&.id
+  end
+
+  protected
+  def check_auth 
+    return render_forbidden unless current_user.admin? || observed_logged_user?
+  end
+end
--- a/app/controllers/traces/projects_controller.rb
+++ b/app/controllers/traces/projects_controller.rb
@ -0,0 +1,83 @@
+class Traces::ProjectsController < Traces::BaseController
+  include OperateProjectAbilityAble
+
+  before_action :require_login
+  before_action :load_project
+  before_action :authorizate_user_can_edit_project!, except: [:task_results]
+
+  def tasks 
+    branch_name = params[:branch_name]
+    return render_error("无可用检测次数") if @project.user_trace_tasks.size >= 5
+    return render_error("分支名不能为空！") if branch_name.blank?
+    @all_branches = Gitea::Repository::Branches::ListNameService.call(@project&.owner, @project.identifier)
+    return render_error("请输入正确的分支名！") unless @all_branches["branch_name"].include?(branch_name) 
+    code, data, error = Trace::CheckService.call(current_user.trace_token, @project, "1", branch_name)
+    if code == 200 
+      UserTraceTask.create!(
+        user_id: current_user.id,
+        project_id: @project.id, 
+        branch_tag: branch_name,
+        task_id: data["task_id"]
+      )
+      render_ok
+    else 
+      render_error("检测失败 Error:#{error}")
+    end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+
+  def task_results
+    limit = params[:limit] || params[:per_page]
+		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
+		page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
+    return render :json => {left_tasks_count: 5, data: []} if current_user.trace_user.nil?
+    code, data, error = Trace::CheckResultService.call(current_user.trace_token, @project, nil, page, limit)
+    if code == 200
+      render :json => {left_tasks_count: 5 - @project.user_trace_tasks.size, data: data}
+    else 
+      render_error("获取检测记录失败 Error:#{error}")
+    end
+  rescue Exception => exception 
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+
+  def reload_task 
+    return render_error("project_id错误") if params[:project_id].blank?
+    branch_name = params[:branch_name]
+    return render_error("分支名不能为空！") if branch_name.blank?
+    @all_branches = Gitea::Repository::Branches::ListNameService.call(@project&.owner, @project.identifier)
+    return render_error("请输入正确的分支名！") unless @all_branches["branch_name"].include?(branch_name) 
+    code, data, error = Trace::ReloadCheckService.call(current_user.trace_token, params[:project_id])
+    if code == 200 
+      UserTraceTask.create!(
+        user_id: current_user.id,
+        project_id: @project.id, 
+        branch_tag: branch_name,
+        task_id: data["task_id"]
+      )
+      render_ok 
+    else 
+      render_error("重新检测失败 Error:#{error}")
+    end
+  rescue Exception => exception 
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+
+
+  def task_pdf 
+    return render_error("task_id错误") if params[:task_id].blank?
+    result = Trace::PdfReportService.call(current_user.trace_token, params[:task_id])
+    if result.is_a?(Hash) && result[:code] == 200
+      redirect_to result[:download_url]
+    else 
+      render_error("下载报告失败！")
+    end
+  rescue Exception => exception 
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+end
--- a/app/controllers/traces/trace_users_controller.rb
+++ b/app/controllers/traces/trace_users_controller.rb
@ -0,0 +1,14 @@
+class Traces::TraceUsersController < Traces::BaseController
+  before_action :require_login
+
+  def create  
+    if current_user.trace_token.present?
+      render_ok
+    else
+      render_error(-1,  "代码溯源用户初始化失败")
+    end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+end
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -8,6 +8,7 @@ class UsersController < ApplicationController
  before_action :connect_to_ci_db, only: [:get_user_info]
  before_action :convert_image!, only: [:update, :update_image]
  skip_before_action :check_sign, only: [:attachment_show]
+  before_action :sso_login, only: [:get_user_info]

  def connect_to_ci_db(options={})
    if !(current_user && !current_user.is_a?(AnonymousUser) && current_user.devops_certification?)
@ -301,6 +302,11 @@ class UsersController < ApplicationController
    end
  end

+  def email_search 
+    return render_error('请输入email') if params[:email].blank?
+    @user = User.find_by(mail: params[:email])
+  end
+
  private
  def load_user
    @user = User.find_by_login(params[:id]) || User.find_by(id: params[:id])
@ -329,4 +335,65 @@ class UsersController < ApplicationController
    render_not_found
  end

+  def sso_login
+    if params[:login].present? && !current_user.logged? && params[:websiteName].present?
+      user = User.where("login = ?", "#{params[:login].presence}").first
+      # 已同步注册，直接登录
+      if user.present?
+        successful_authentication(user)
+      else
+        autologin_register_by_educoder(params[:login].presence)
+      end
+    end
+  end
+
+  # 通过login参数查询头歌账号信息，注册并登录
+  def autologin_register_by_educoder(edu_login)
+    req_params = { "login" => "#{edu_login}", "private_token" => "hriEn3UwXfJs3PmyXnSH" }
+    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"]
+    Rails.logger.info("user_info====== #{user_info}")
+    login = user_info["login"]
+    email = user_info["mail"]
+    phone = user_info["phone"]
+    real_name = user_info["username"]
+    department_name = user_info["school"]
+    password = "12345678"
+
+    # 没有用户时，新建用户并登录
+    user = User.where("login = ?  or phone = ? or mail = ? ", "#{login}", phone, email).first
+    if user.present?
+      # 手机号先记录，后续用
+      user.update_column(:phone, "#{phone}") if phone.present?
+    else
+      ActiveRecord::Base.transaction do
+        email = "#{login}@gitlink.org.cn" if email.blank?
+        user_params = { status: 1, type: 'User', login: "#{login}", lastname: "#{real_name}", mail: "#{email}",
+                        nickname: "#{real_name}", professional_certification: 0, certification: 0, grade: 0,
+                        password: "#{password}", phone: "#{phone}", profile_completed: 1 }
+        user = User.create!(user_params)
+        UserExtension.create!(user_id: user.id, gender: 1, custom_department: "#{department_name}")
+        interactor = Gitea::RegisterInteractor.call({username: login, email: email, password: password})
+        if interactor.success?
+          gitea_user = interactor.result
+          Rails.logger.info("Gitea::RegisterInteractor.call result====== #{gitea_user}")
+          result = Gitea::User::GenerateTokenService.call(login, password)
+          user.gitea_token = result['sha1']
+          user.gitea_uid = gitea_user[:body]['id']
+          user.save!
+        else
+          Rails.logger.info("Gitea::RegisterInteractor.call error====== #{interactor.error}")
+        end
+      end
+    end
+    successful_authentication(user) if user.present?
+  end
+
 end
--- a/app/docs/slate/source/api.html.md
+++ b/app/docs/slate/source/api.html.md
@ -16,6 +16,7 @@ includes:
  - users
  - projects
  - repositories
+  - traces
  - pulls
  - issues
  - organizations
--- a/app/docs/slate/source/includes/_projects.md
+++ b/app/docs/slate/source/includes/_projects.md
@ -280,7 +280,7 @@ repo             |是| |string |项目标识identifier
 ### 返回字段说明
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
-menu_name     |string|导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,activity:动态,setting:仓库设置
+menu_name     |string|导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,wiki:维基,services:服务,activity:动态,setting:仓库设置


 > 返回的JSON示例:
@ -408,7 +408,7 @@ await octokit.request('POST /api/yystopf/ceshi/project_units')
 ### 请求参数
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
-|unit_types |是| |array    | 项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑 |
+|unit_types |是| |array    | 项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,wiki:维基,resources:资源库,services:服务 |


 ### 返回字段说明:
@ -850,3 +850,35 @@ await octokit.request('POST /api/:owner/:repo/applied_transfer_projects/cancel.j
    "time_ago": "1分钟前"
 }
 ```
+
+## 退出项目
+供项目成员(开发者、报告者)退出项目用
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/ceshi1/ceshi_repo1/quit.json
+```
+
+```javascript
+await octokit.request('POST /api/:owner/:repo/quit.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/quit.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner     |是| |string |用户登录名  |
+|repo      |是| |string |项目标识identifier  |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
--- a/app/docs/slate/source/includes/_traces.md
+++ b/app/docs/slate/source/includes/_traces.md
@ -0,0 +1,217 @@
+# Traces
+
+## 代码溯源初始化
+用户同意协议后请求的接口，创建代码溯源的账号
+
+> 示例:
+
+```shell
+curl -X POST \
+http://localhost:3000/api/traces/trace_users.json
+```
+
+```javascript
+await octokit.request('POST /api/traces/trace_users.json')
+```
+
+### HTTP 请求
+`POST api/traces/trace_users.json`
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+## 代码分析结果列表
+查询项目下代码分析的结果
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/traces/yystopf/many_branch/task_results.json
+```
+
+```javascript
+await octokit.request('GET /api/traces/:owner/:repo/task_results.json')
+```
+
+### HTTP 请求
+`GET api/traces/:owner/:repo/task_results.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner|是|否|string | 项目所有者标识|
+repo|是 | 否|string | 项目标识 |
+page  |否| 1 | int |  页码   |
+limit |否| 15 | int | 每页数量 |
+
+### 返回字段说明（暂缺）
+<!-- 参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+total_count              |int   |总数 |
+public_keys.id           |int   |ID|
+public_keys.name         |string|密钥标题|
+public_keys.content      |string|密钥内容|
+public_keys.fingerprint  |string|密钥标识|
+public_keys.created_time |string|密钥创建时间| -->
+
+> 返回的JSON示例:
+
+```json
+{
+    "data": [
+        {
+            "accuracy": "20",
+            "code_type": "C",
+            "depth": "2",
+            "detect_flag": "快速-组件级",
+            "detect_rule": "快速-组件级,2,20,,开源软件,50,10",
+            "detect_startdate": "2022-05-10 15:59:46 ",
+            "detect_status": "fail",
+            "detectflag": "快速-组件级",
+            "fail_reason": "Invalid package type",
+            "file_name": "many_branch.zip",
+            "license_process": "100",
+            "licenseparam": "开源软件",
+            "package_type": "",
+            "product_name": "84727546110",
+            "project_id": "6dbc3e42-5857-4ca4-a54d-58fd9dbf6dc5",
+            "sim_process": "100",
+            "similarity_process": "2",
+            "task_id": "15139171-091b-4316-98b1-6068970efa44",
+            "totalsize": 5,
+            "uid": "78",
+            "vuln_process": "",
+            "vulnlevel": ""
+        }
+    ]
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+
+
+## 新建分析
+用户选择仓库分支进行代码分析的接口
+
+> 示例:
+
+```shell
+curl -X POST \
+http://localhost:3000/api/traces/yystopf/many_branch/tasks.json
+```
+
+```javascript
+await octokit.request('POST /api/traces/:owner/:repo/tasks.json')
+```
+
+### HTTP 请求
+`POST api/traces/:owner/:repo/tasks.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner   |是 | 否 | string |  项目所有者标识   |
+repo |是 | 否 | string | 项目标识 |
+branch_name|是 | 否| string | 分支名称 |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+## 重新扫描
+对代码分析结果进行再次分析
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/traces/yystopf/many_branch/reload_task.json
+```
+
+```javascript
+await octokit.request('GET /api/traces/:owner/:repo/reload_task.json')
+```
+
+### HTTP 请求
+`GET api/traces/:owner/:repo/reload_task.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner   |是 | 否 | string |  项目所有者标识   |
+repo |是 | 否 | string | 项目标识 |
+project_id|是 | 否| string | 代码分析结果里的project_id |
+branch_name|是 | 否| string | 分支名称 |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+
+## 下载报告
+把代码分析的结果下载到本地
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/traces/yystopf/many_branch/task_pdf.json
+```
+
+```javascript
+await octokit.request('GET /api/traces/:owner/:repo/task_pdf.json')
+```
+
+### HTTP 请求
+`GET api/traces/:owner/:repo/task_pdf.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner   |是 | 否 | string |  项目所有者标识   |
+repo |是 | 否 | string | 项目标识 |
+task_id|是 | 否| string | 代码分析结果里的task_id |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
--- a/app/forms/gitea/user/update_form.rb
+++ b/app/forms/gitea/user/update_form.rb
@ -4,7 +4,7 @@ class Gitea::User::UpdateForm

  attr_accessor :username, :email, :admin, :allow_create_organization, :allow_git_hook, :allow_import_local,
                :full_name, :location, :login_name, :max_repo_creation, :must_change_password, :password, :prohibit_login,
-                :source_id, :website
+                :source_id, :website, :new_name

  validates :username, presence: true
  validates :email, presence: true, format: { with: EMAIL_REGEX, multiline: true }
--- a/app/forms/register/base_form.rb
+++ b/app/forms/register/base_form.rb
@ -3,28 +3,40 @@ module Register
    include ActiveModel::Model
    
    private
-    def check_login(login)
+    def check_login(login, user=nil)
      login = strip(login)
      raise LoginError, "登录名格式有误" unless login =~ CustomRegexp::LOGIN

      login_exist = Owner.exists?(login: login) || ReversedKeyword.check_exists?(login)
+      if user.present? 
+        raise LoginError, '登录名已被使用' if login_exist && login != user&.login
+      else
        raise LoginError, '登录名已被使用' if login_exist
      end
+    end

-    def check_mail(mail)
+    def check_mail(mail, user=nil)
      mail = strip(mail)
      raise EmailError, "邮件格式有误" unless mail =~ CustomRegexp::EMAIL
  
      mail_exist = Owner.exists?(mail: mail)
+      if user.present? 
+        raise EmailError, '邮箱已被使用' if mail_exist && mail != user&.mail
+      else
        raise EmailError, '邮箱已被使用' if mail_exist
      end
+    end
    
-    def check_phone(phone)
+    def check_phone(phone, user=nil)
      phone = strip(phone)
      raise PhoneError, "手机号格式有误" unless phone =~ CustomRegexp::PHONE

      phone_exist = Owner.exists?(phone: phone)
+      if user.present?
+        raise PhoneError, '手机号已被使用' if phone_exist && phone != user&.phone
+      else
        raise PhoneError, '手机号已被使用' if phone_exist
      end 
    end
  end
+end
--- a/app/forms/register/login_check_columns_form.rb
+++ b/app/forms/register/login_check_columns_form.rb
@ -0,0 +1,19 @@
+module Register
+  class LoginCheckColumnsForm < Register::BaseForm
+    attr_accessor :type, :value, :user
+
+    validates :type, presence: true, numericality: true
+    validates :value, presence: true
+    validate :check!
+    
+    def check!
+      # params[:type] 为事件类型 1：登录名(login) 2：email(邮箱) 3：phone(手机号)
+      case strip(type).to_i
+      when 1 then check_login(strip(value), user)
+      when 2 then check_mail(strip(value), user)
+      when 3 then check_phone(strip(value), user)
+      else raise("type值无效")
+      end
+    end
+  end
+end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -103,13 +103,13 @@ module ApplicationHelper
      timeIntoFormat = timePassed / ONE_MINUTE
      updateAtValue = timeIntoFormat.to_s + "分钟前"
    elsif (timePassed < ONE_DAY)
-      timeIntoFormat = timePassed / ONE_HOUR
+      timeIntoFormat = (timePassed.to_f / ONE_HOUR).ceil
      updateAtValue = timeIntoFormat.to_s + "小时前"
    elsif (timePassed < ONE_MONTH)
-      timeIntoFormat = timePassed / ONE_DAY
+      timeIntoFormat = (timePassed.to_f / ONE_DAY).ceil
      updateAtValue = timeIntoFormat.to_s + "天前"
    elsif (timePassed < ONE_YEAR)
-      timeIntoFormat = timePassed / ONE_MONTH
+      timeIntoFormat = (timePassed.to_f / ONE_MONTH).ceil
      updateAtValue = timeIntoFormat.to_s + "个月前"
    else
      timeIntoFormat = timePassed / ONE_YEAR
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@ -22,7 +22,7 @@ module RepositoriesHelper
  def is_readme?(type, str)
    return false if type != 'file' || str.blank?
    readme_types = ["readme.md", "readme", "readme_en.md", "readme_zh.md", "readme_en", "readme_zh"]
-    readme_types.include?(str.to_s.downcase)
+    readme_types.include?(str.to_s.downcase) || str =~ CustomRegexp::MD_REGEX
  end

  def render_commit_author(author_json)
@ -103,6 +103,46 @@ module RepositoriesHelper
    end
  end

+  # author hui.he
+  def new_readme_render_decode64_content(str, owner, repo, ref, readme_path, readme_name)
+    file_path = readme_path.include?('/') ? readme_path.gsub("/#{readme_name}", '') : readme_path.gsub("#{readme_name}", '')
+    return nil if str.blank?
+    content = Base64.decode64(str).force_encoding('UTF-8')
+    s_regex = /\[.*?\]\((.*?)\)/
+    src_regex = /src=\"(.*?)\"/
+    ss = content.to_s.scan(s_regex)
+    ss_src = content.to_s.scan(src_regex)
+    total_sources = ss + ss_src
+    total_sources.uniq! 
+    total_sources.each do |s|
+      begin
+        s_content = s[0]
+        # 链接直接跳过不做替换
+        next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:') || s_content.blank?
+        ext = File.extname(s_content)[1..-1]
+
+        if image_type?(ext) || download_type(ext) 
+          s_content = File.expand_path(s_content, file_path)
+          s_content = s_content.split("#{Rails.root}/")[1]
+          # content = content.gsub(s[0], "/#{s_content}")
+          s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{s_content}&ref=#{ref}"].join
+          content = content.gsub(s[0], s_content)
+        else
+          path = [owner&.login, repo&.identifier, 'tree', ref, file_path].join("/")
+          s_content = File.expand_path(s_content, path)
+          s_content = s_content.split("#{Rails.root}/")[1]
+          content = content.gsub(s[0], "/#{s_content}")
+        end
+      rescue
+        next
+      end
+    end
+
+    return content
+  rescue
+    return str
+  end
+
  # unix_time values for example: 1604382982
  def render_format_time_with_unix(unix_time)
    Time.at(unix_time).strftime("%Y-%m-%d %H:%M")
@ -113,12 +153,21 @@ module RepositoriesHelper
    date.to_time.strftime("%Y-%m-%d %H:%M")
  end

+  def readme_decode64_content(entry, owner, repo, ref, path=nil)
+    Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
+    content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
+    Rails.logger.info("content===#{content}")
+    # readme_render_decode64_content(content, owner, repo, ref)
+    new_readme_render_decode64_content(content, owner, repo, ref, entry['path'], entry['name'])
+  end
+
  def decode64_content(entry, owner, repo, ref, path=nil)
    if is_readme?(entry['type'], entry['name'])
-      # content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
-      content = entry['content']
-      path = URI.escape(entry['path']).to_s.downcase.gsub("/readme.md","")
-      readme_render_decode64_content(content, owner, repo, ref, path)
+      Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
+      content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
+      Rails.logger.info("content===#{content}")
+      # readme_render_decode64_content(content, owner, repo, ref)
+      return Base64.decode64(content).force_encoding('UTF-8')
    else
      file_type = File.extname(entry['name'].to_s)[1..-1]
      if image_type?(file_type)
--- a/app/imports/admins/new_import_user_from_excel.rb
+++ b/app/imports/admins/new_import_user_from_excel.rb
@ -0,0 +1,15 @@
+class Admins::NewImportUserFromExcel < BaseImportXlsx
+  UserData = Struct.new(:login, :email, :password, :nickname)
+
+  def read_each(&block)
+    sheet.each_row_streaming(pad_cells: true, offset: 1) do |row|
+      data = row.map(&method(:cell_value))[0..3]
+      block.call UserData.new(*data)
+    end
+  end
+
+  private 
+  def cell_value(obj)
+    obj&.cell_value 
+  end
+end
--- a/app/interactors/gitea/register_interactor.rb
+++ b/app/interactors/gitea/register_interactor.rb
@ -13,7 +13,7 @@ module Gitea
    end

    def success?
-      @error.nil?
+      @error.nil? && @result[:status].to_s == "success"
    end

    def result
--- a/app/jobs/send_template_message_job.rb
+++ b/app/jobs/send_template_message_job.rb
@ -4,6 +4,24 @@ class SendTemplateMessageJob < ApplicationJob
  def perform(source, *args)
    Rails.logger.info "SendTemplateMessageJob [args] #{args}"
    case source 
+    when 'CustomTip'
+      receivers_id, template_id, props = args[0], args[1], args[2]
+      template = MessageTemplate.find_by_id(template_id)
+      return unless template.present?
+      receivers = User.where(id: receivers_id).or(User.where(mail: receivers_id))
+      not_exists_receivers = receivers_id - receivers.pluck(:id) - receivers.pluck(:mail)
+      receivers_string, content, notification_url = MessageTemplate::CustomTip.get_message_content(receivers, template, props)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {receivers_id: receivers_id, template_id: template_id, props: props})
+      receivers.find_each do |receiver|
+        receivers_email_string, email_title, email_content = MessageTemplate::CustomTip.get_email_message_content(receiver, template, props)
+        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
+      end
+      not_exists_receivers.each do |mail|
+        valid_email_regex = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/i
+        next unless (mail =~ valid_email_regex)
+        email_title, email_content = MessageTemplate::CustomTip.get_email_content(template, props)
+        Notice::Write::EmailCreateService.call(mail, email_title, email_content)
+      end
    when 'FollowTip'
      watcher_id = args[0]
      watcher = Watcher.find_by_id(watcher_id)
--- a/app/libs/custom_regexp.rb
+++ b/app/libs/custom_regexp.rb
@ -1,7 +1,7 @@
 module CustomRegexp
  PHONE = /1\d{10}/
  EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/
-  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]{4,15}\z/ #只含有数字、字母、下划线不能以下划线开头和结尾
  LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/
  NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/
  PASSWORD = /\A[a-z_A-Z0-9\-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'_<>~\·`\?:;|]{8,16}\z/
@ -11,5 +11,5 @@ module CustomRegexp

  URL_REGEX = /\A(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?\z/i
  REPOSITORY_NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
-  
+  MD_REGEX = /^.+(\.[m|M][d|D])$/
 end
--- a/app/models/message_template.rb
+++ b/app/models/message_template.rb
@ -16,8 +16,7 @@ class MessageTemplate < ApplicationRecord
  PLATFORM = 'GitLink'

  def self.build_init_data
-    MessageTemplate::IssueAssignerExpire.destroy_all
-    MessageTemplate::IssueCreatorExpire.destroy_all
+    MessageTemplate.where.not(type: 'MessageTemplate::CustomTip').destroy_all
    self.create(type: 'MessageTemplate::FollowedTip', sys_notice: '<b>{nickname}</b> 关注了你', notification_url: '{baseurl}/{login}')
    email_html = File.read("#{email_template_html_dir}/issue_assigned.html")
    self.create(type: 'MessageTemplate::IssueAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个疑修：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 指派给你一个疑修")
--- a/app/models/message_template/custom_tip.rb
+++ b/app/models/message_template/custom_tip.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::CustomTip < MessageTemplate 
+  
+  # MessageTemplate::CustomTip.get_message_content(User.where(login: 'yystopf'), "hahah")
+  def self.get_message_content(receivers, template, props={})
+   return '', '', '' if receivers.blank? || template.blank?
+   content = template.sys_notice
+   notification_url = template.notification_url
+   props.each do |k, v|
+    content.gsub!("{#{k}}", v)
+    notification_url.gsub!("{#{k}}", v)
+   end
+   notification_url.gsub!('{baseurl}', base_url)
+   return receivers_string(receivers), content, notification_url
+ rescue => e
+   Rails.logger.info("MessageTemplate::CustomTip.get_message_content [ERROR] #{e}")
+   return '', '', ''
+ end
+
+ def self.get_email_message_content(receiver, template, props={})
+    return '', '', '' if receiver.blank? || template.blank?
+    title = template.email_title
+    content = template.email
+    props.each do |k, v|
+      title.gsub!("{#{k}}", v)
+      content.gsub!("{#{k}}", v)
+    end
+    content.gsub!('{receiver}', receiver&.real_name)
+    title.gsub!('{platform}', PLATFORM)
+    content.gsub!('{platform}', PLATFORM)
+    content.gsub!('{baseurl}', base_url)
+
+    return receiver&.mail, title, content
+ rescue => e
+   Rails.logger.info("MessageTemplate::CustomTip.get_email_message_content [ERROR] #{e}")
+   return '', '', ''
+ end
+
+  def self.get_email_content(template, props = {})
+    return '', '', '' if template.blank?
+    title = template.email_title
+    content = template.email
+    props.each do |k, v|
+      title.gsub!("{#{k}}", v)
+      content.gsub!("{#{k}}", v)
+    end
+    title.gsub!('{platform}', PLATFORM)
+    content.gsub!('{platform}', PLATFORM)
+
+    return title, content
+  rescue => e
+    Rails.logger.info("MessageTemplate::CustomTip.get_email_content [ERROR] #{e}")
+    return '', ''
+  end
+end
--- a/app/models/message_template/project_setting_changed.rb
+++ b/app/models/message_template/project_setting_changed.rb
@ -141,6 +141,7 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
      navbar.gsub!('devops', '工作流')
      navbar.gsub!('versions', '里程碑')
      navbar.gsub!('resources', '资源库')
+      navbar.gsub!('services', '服务')
      if change_count > 1
        content.sub!('{ifnavbar}', '<br/>') 
      else
@ -290,6 +291,7 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
        navbar.gsub!('devops', '工作流')
        navbar.gsub!('versions', '里程碑')
        navbar.gsub!('resources', '资源库')
+        navbar.gsub!('services', '服务')
        if change_count > 1
          content.sub!('{ifnavbar}', '<br/>') 
        else
--- a/app/models/project.rb
+++ b/app/models/project.rb
@ -37,6 +37,8 @@
 #  rep_identifier         :string(255)
 #  project_category_id    :integer
 #  project_language_id    :integer
+#  license_id             :integer
+#  ignore_id              :integer
 #  praises_count          :integer          default("0")
 #  watchers_count         :integer          default("0")
 #  issues_count           :integer          default("0")
@ -50,8 +52,6 @@
 #  open_devops_count      :integer          default("0")
 #  recommend              :boolean          default("0")
 #  platform               :integer          default("0")
-#  license_id             :integer
-#  ignore_id              :integer
 #  default_branch         :string(255)      default("master")
 #  website                :string(255)
 #  lesson_url             :string(255)
@ -124,6 +124,7 @@ class Project < ApplicationRecord
  has_many :pinned_projects, dependent: :destroy 
  has_many :has_pinned_users, through: :pinned_projects, source: :user
  has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
+  has_many :user_trace_tasks, 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
@ -137,6 +138,8 @@ class Project < ApplicationRecord
  delegate :content, to: :project_detail, allow_nil: true
  delegate :name, to: :license, prefix: true, allow_nil: true

+  validate :validate_sensitive_string
+
  def self.all_visible(user_id=nil)
    user_projects_sql = Project.joins(:owner).where(users: {type: 'User'}).to_sql
    org_public_projects_sql = Project.joins(:owner).merge(Organization.joins(:organization_extension).where(organization_extensions: {visibility: 'common'})).to_sql
@ -370,6 +373,7 @@ class Project < ApplicationRecord
    logger.info "########namespace_path: #{namespace_path} ########identifier: #{identifier} "

    user = Owner.find_by_login namespace_path
+    user = Owner.new(login: namespace_path) if user.nil?
    project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
    return nil if project.blank?

@ -408,4 +412,9 @@ class Project < ApplicationRecord
  def is_transfering
    applied_transfer_project&.common? ? true : false
  end
+
+  def validate_sensitive_string
+    raise("项目名称包含敏感词汇，请重新输入") if name && !HarmoniousDictionary.clean?(name)
+    raise("项目描述包含敏感词汇，请重新输入") if description && !HarmoniousDictionary.clean?(description)
+  end
 end
--- a/app/models/project_unit.rb
+++ b/app/models/project_unit.rb
@ -16,7 +16,7 @@
 class ProjectUnit < ApplicationRecord
  belongs_to :project

-  enum unit_type: {code: 1, issues: 2, pulls: 3, wiki:4, devops: 5, versions: 6, resources: 7}
+  enum unit_type: {code: 1, issues: 2, pulls: 3, wiki:4, devops: 5, versions: 6, resources: 7, services: 8}

  validates :unit_type, uniqueness: { scope: :project_id}

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@ -48,6 +48,10 @@ class Repository < ApplicationRecord
    self.identifier.parameterize
  end

+  def url
+    self['url'].blank? ? "#{Rails.application.config_for(:configuration)['platform_url']}/#{self.owner&.login}/#{self.identifier}.git" : self['url']
+  end
+
  # with repository is mirror
  def set_mirror!
    self.build_mirror(status: Mirror.statuses[:waiting]).save
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -175,6 +175,7 @@ class User < Owner
  has_many :system_notification_histories
  has_many :system_notifications, through: :system_notification_histories
  has_one :trace_user, dependent: :destroy
+  has_many :user_trace_tasks, dependent: :destroy 
  
  # Groups and active users
  scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
--- a/app/models/user_trace_task.rb
+++ b/app/models/user_trace_task.rb
@ -0,0 +1,25 @@
+# == Schema Information
+#
+# Table name: user_trace_tasks
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  project_id :integer
+#  branch_tag :string(255)
+#  task_id    :string(255)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_user_trace_tasks_on_project_id  (project_id)
+#  index_user_trace_tasks_on_user_id     (user_id)
+#
+
+class UserTraceTask < ApplicationRecord
+
+  belongs_to :user 
+  belongs_to :project
+
+  
+end
--- a/app/services/admins/import_user_from_excel_service.rb
+++ b/app/services/admins/import_user_from_excel_service.rb
@ -0,0 +1,71 @@
+class Admins::ImportUserFromExcelService < ApplicationService 
+  Error = Class.new(StandardError)
+
+  attr_reader :file, :result
+
+  def initialize(file)
+    @file = file 
+    @result = { success: 0, fail: [] }
+  end
+
+  def call 
+    raise Error, '文件不存在' if file.blank?
+    excel = Admins::NewImportUserFromExcel.new(file)
+
+    excel.read_each(&method(:save_user))
+    result 
+  rescue ApplicationImport::Error => ex 
+    raise Error, ex.message
+  end
+
+  private 
+  def save_user(data)
+    user = find_user(data)
+    if user.blank? 
+      create_user(data)
+      result[:success] +=1
+    else 
+      fail_data = data.as_json
+      fail_data[:data] = fail_data.values.join(",")
+      fail_data[:message] = '用户已存在'
+      result[:fail] << fail_data  
+    end
+
+  rescue Exception => ex 
+    fail_data = data.as_json
+    fail_data[:data] = fail_data.values.join(",")
+    fail_data[:message] = ex.message
+    result[:fail] << fail_data  
+  end
+
+  def create_user(data)
+    ActiveRecord::Base.transaction do 
+      username = data.login&.gsub(/\s+/, "")
+      email = data.email&.gsub(/\s+/, "")
+      password = data.password
+      nickname = data.nickname&.gsub(/\s+/, "")
+      raise Error, "无法使用以下关键词：#{username}，请重新命名" if ReversedKeyword.check_exists?(data.login)
+      Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge'}).validate!
+      user = User.new(admin: false, login: username, mail: email, nickname: nickname, platform: 'forge' , type: "User")
+      user.password = password
+      user.activate
+      raise Error, user.errors.full_messages.join(",") unless user.valid?
+      interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
+      if interactor.success?
+        gitea_user = interactor.result
+        result = Gitea::User::GenerateTokenService.call(username, password)
+        user.gitea_token = result['sha1']
+        user.gitea_uid = gitea_user[:body]['id']
+        UserExtension.create!(user_id: user.id) if user.save! 
+      else 
+        raise interactor.error, 'gitea user create error' 
+      end
+
+      user
+    end
+  end
+
+  def find_user(data)
+    User.find_by(login: data.login)
+  end
+end
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@ -24,7 +24,8 @@ class Projects::TransferService < ApplicationService

  private
  def update_owner
-    project.members.map{|m| m.destroy! if m.user_id == owner.id || (new_owner.is_a?(Organization) && new_owner.is_member?(m.user_id)) }
+    project.members.map{|m| m.destroy! if m.user_id == owner.id || project.member(new_owner.id) || (new_owner.is_a?(Organization) && new_owner.is_member?(m.user_id)) }
+    project.set_owner_permission(new_owner)
    project.update!(user_id: new_owner.id)
  end

--- a/app/services/trace/check_result_service.rb
+++ b/app/services/trace/check_result_service.rb
@ -1,11 +1,11 @@
 # 代码溯源 查询检测结果
 class Trace::CheckResultService < Trace::ClientService

-  attr_accessor :token, :project_name, :file_name, :page_num, :page_size
+  attr_accessor :token, :project, :file_name, :page_num, :page_size

-  def initialize(token, project_name=nil, file_name=nil, page_num=1, page_size=15) 
+  def initialize(token, project, file_name=nil, page_num=1, page_size=15) 
    @token = token 
-    @project_name = project_name 
+    @project = project
    @file_name = file_name
    @page_num = page_num
    @page_size = page_size
@ -19,7 +19,7 @@ class Trace::CheckResultService < Trace::ClientService
  private 
  def request_params 
    {
-      product_name: project_name, 
+      product_name: Digest::MD5.hexdigest(project&.id.to_s)[0...20], 
      file_name: file_name,
      pageNum: page_num,
      pageSize: page_size,
--- a/app/services/trace/check_service.rb
+++ b/app/services/trace/check_service.rb
@ -11,26 +11,25 @@ class Trace::CheckService < Trace::ClientService
  end

  def call
-    result = authed_post(token, url, {data: request_params})
+    result = http_authed_post(token, url, {data: request_params})
    reponse = render_response(result)
  end

  private 
  def request_params 
-   repo = Gitea::Repository::GetService.call(project&.owner&.login, project&.identifier)
+   repo = Gitea::Repository::GetService.call(project&.owner, project&.identifier)
    {
-      product_name: project&.name, 
-      product_type: project&.category&.name,
-      code_type: project&.language&.name,
+      product_name: Digest::MD5.hexdigest(project&.id.to_s)[0...20], 
+      product_type: project&.project_category&.name || '其他',
+      code_type: project&.project_language&.name || '其他',
      product_desc: project&.description,
      git_url: repo['clone_url'],
      if_branch: if_branch,
      branch_tag: branch_tag
-    }
+    }.compact
  end

  def url 
    "/user/check".freeze
  end
 end
-
--- a/app/services/trace/client_service.rb
+++ b/app/services/trace/client_service.rb
@ -12,6 +12,19 @@ class Trace::ClientService < ApplicationService
    conn.post(full_url(url), params[:data]) 
  end

+  def http_authed_post(token, url, params={})
+    puts "[trace][POST] request params: #{params}"
+    puts "[trace][POST] request token: #{token}"
+    url = URI("#{full_url(url)}")
+    http = Net::HTTP.new(url.host, url.port)
+    http.read_timeout = 1200
+    request = Net::HTTP::Post.new(url)
+    request["Authorization"] = token
+    form_data = params[:data].stringify_keys.to_a
+    request.set_form form_data, 'multipart/form-data'
+    http.request(request)
+  end
+
  def get(url, params={})
    puts "[trace][GET] request params: #{params}"
    conn.get do |req|
@ -100,6 +113,7 @@ class Trace::ClientService < ApplicationService
  end

  def render_response(response)
+    if response.is_a?(Faraday::Response) 
      status = response.status
      body = JSON.parse(response&.body)

@ -107,4 +121,14 @@ class Trace::ClientService < ApplicationService

      return [body["code"], body["data"], body["error"]]
    end
+     
+    if response.is_a?(Net::HTTPOK)
+      status = 200
+      body = JSON.parse(response&.body)
+  
+      log_error(status, body)
+  
+      return [body["code"], body["data"], body["error"]]
+    end 
+  end
 end
--- a/app/services/trace/pdf_report_service.rb
+++ b/app/services/trace/pdf_report_service.rb
@ -1,4 +1,7 @@
 # 代码溯源 导出pdf
+require 'open-uri'
+require 'fileutils'
+
 class Trace::PdfReportService < Trace::ClientService
  
  attr_accessor :token, :task_id 
@ -9,15 +12,23 @@ class Trace::PdfReportService < Trace::ClientService
  end

  def call 
-    result = authed_get(token, url, request_params)
-    response = render_response(result)
+    content = open("#{domain}#{base_url}#{url}?task_id=#{task_id}", "Authorization" => token)
+    if content.is_a?(Tempfile)
+      check_file_path
+      IO.copy_stream(content, "#{save_path}/#{task_id}.pdf")
+      return {code: 200, download_url: "/trace_task_results/#{task_id}.pdf"}
+    else 
+      return {code: 404}
+    end
  end

  private 
-  def request_params 
-    {
-      task_id: task_id
-    }
+  def check_file_path 
+    FileUtils.mkdir_p save_path
+  end
+
+  def save_path 
+    "public/trace_task_results"
  end

  def url
--- a/app/views/admins/message_templates/_list.html.erb
+++ b/app/views/admins/message_templates/_list.html.erb
@ -11,8 +11,8 @@
  </thead>
  <tbody>
  <% if message_templates.present? %>
-    <% message_templates.each_with_index do |message_template_type, index| %>
-      <% message_template = message_template_type.constantize.last%>
+    <% message_templates.each_with_index do |message_template, index| %>
+      <%# message_template = message_template_type.constantize.last%>
      <tr class="project-language-item-<%= message_template.id %>">
        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
        <td><%= message_template.simple_type %></td>
--- a/app/views/admins/message_templates/index.html.erb
+++ b/app/views/admins/message_templates/index.html.erb
@ -3,7 +3,13 @@
 <% end %>
 <div id="admins-message-templates-content">
  <div class="box search-form-container project-list-form">
-    <%= link_to "初始化数据", init_data_admins_message_templates_path, class: "btn btn-primary pull-right", "data-disabled-with":"...初始化数据" %> 
+    <%= form_tag(admins_message_templates_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+      <%= text_field_tag(:search, params[:search], class: 'form-control col-12 col-md-2 mr-3', placeholder: '名称检索') %>
+      <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+      <input type="reset" class="btn btn-secondary clear-btn" value="清空"/>
+    <% end %>
+    <%= link_to "初始化数据", init_data_admins_message_templates_path, class: "btn btn-primary mr-3 pull-right", "data-disabled-with":"...初始化数据" %>
+    <%= link_to "新增", new_admins_message_template_path, remote: true, class: "btn btn-primary pull-right", "data-disabled-with":"...新增" %>  
  </div>
  <div class="box admin-list-container message-templates-list-container">
    <%= render partial: 'admins/message_templates/list', locals: { message_templates: @message_templates } %>
--- a/app/views/admins/message_templates/new.js.erb
+++ b/app/views/admins/message_templates/new.js.erb
@ -0,0 +1,2 @@
+$("#admins-message-templates-content").html("<%= j render partial: 'admins/message_templates/form', locals:{type: 'create'} %>")
+createMDEditor('message-template-email-editor', { height: 500, placeholder: '请输入邮件模版' });
--- a/app/views/admins/users/index.html.erb
+++ b/app/views/admins/users/index.html.erb
@ -31,7 +31,9 @@
    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
  <% end %>

-  <%= javascript_void_link '导入用户', class: 'btn btn-secondary btn-sm', data: { toggle: 'modal', target: '.admin-import-user-modal'} %>
+  <%= link_to '下载导入模板', "/导入用户模板.xlsx", class: 'btn btn-secondary mr-3' %>
+
+  <%= javascript_void_link '导入用户', class: 'btn btn-secondary', data: { toggle: 'modal', target: '.admin-import-user-modal'} %>
  
 </div>

--- a/app/views/organizations/projects/index.json.jbuilder
+++ b/app/views/organizations/projects/index.json.jbuilder
@ -1,6 +1,6 @@
 json.total_count @projects.total_count
 json.projects @projects.each do |project|
-  json.(project, :id, :name, :identifier, :description, :forked_count, :praises_count, :forked_from_project_id)
+  json.(project, :id, :name, :identifier, :description, :forked_count, :praises_count, :forked_from_project_id, :is_public)
  json.mirror_url project.repository&.mirror_url
  json.type project.numerical_for_project_type
  json.praised project.praised_by?(current_user)
--- a/app/views/organizations/teams/_detail.json.jbuilder
+++ b/app/views/organizations/teams/_detail.json.jbuilder
@ -9,7 +9,7 @@ json.num_projects team.num_projects
 json.num_users team.num_users
 json.units team.team_units.pluck(:unit_type)
 json.users team.team_users.each do |user|
-  json.partial! "organizations/user_detail", user: user&.user
+  json.partial! "organizations/user_detail", user: user&.user if user&.user
 end
 json.is_admin @is_admin
 json.is_member  team.is_member?(current_user.id)
--- a/app/views/repositories/_simple_entry.json.jbuilder
+++ b/app/views/repositories/_simple_entry.json.jbuilder
@ -9,7 +9,10 @@ if @project.forge?
  json.path entry['path']
  json.type entry['type']
  json.size entry['size']
-
+  is_readme = is_readme?(entry['type'], entry['name'])
+  if is_readme 
+    json.replace_content readme_decode64_content(entry, @owner, @repository, @ref, @path)
+  end
  json.content (direct_download || image_type || is_dir) ? nil : decode64_content(entry, @owner, @repository, @ref, @path)
  json.target entry['target']
  
@ -25,7 +28,7 @@ if @project.forge?

  json.direct_download direct_download
  json.image_type image_type
-  json.is_readme_file is_readme?(entry['type'], entry['name'])
+  json.is_readme_file is_readme
  json.commit do
    json.partial! 'last_commit', latest_commit: entry['latest_commit']
  end
--- a/app/views/users/email_search.json.jbuilder
+++ b/app/views/users/email_search.json.jbuilder
@ -0,0 +1,5 @@
+if @user.present?
+  json.partial! 'users/user', locals: { user: @user }
+else 
+  json.null 
+end
--- a/app/views/users/get_user_info.json.jbuilder
+++ b/app/views/users/get_user_info.json.jbuilder
@ -25,3 +25,5 @@ json.description @user.description
 json.super_description @user.super_description
 json.(@user, :show_email, :show_department, :show_location, :show_super_description)
 json.message_unread_total @message_unread_total
+json.has_trace_user @user.trace_user.present?
+json.is_new @user.login.present? && params[:login].to_s.include?("#{@user.login}")
--- a/config/routes.rb
+++ b/config/routes.rb
@ -214,6 +214,8 @@ Rails.application.routes.draw do
        post :remote_password
        post :change_password
        post :check
+        post :login_check
+        post :simple_update
      end
    end

@ -247,6 +249,7 @@ Rails.application.routes.draw do
        get :trustie_projects
        get :trustie_related_projects
        post :sync_user_info
+        get :email_search

        scope '/ci', module: :ci do
          scope do
@ -427,6 +430,20 @@ Rails.application.routes.draw do
      end
    end

+    namespace :traces do 
+      resources :trace_users, only: [:create]
+      scope "/:owner/:repo" do 
+        resource :projects, path: '/', only: [:index] do
+          member do 
+            post :tasks
+            get :task_results
+            get :reload_task
+            get :task_pdf
+          end
+        end
+      end
+    end
+
    # Project Area START
    scope "/:owner/:repo" do
      scope do
@ -712,7 +729,7 @@ Rails.application.routes.draw do
        get :history
      end
    end
-    resources :message_templates, only: [:index, :edit, :update] do 
+    resources :message_templates, only: [:index, :new, :create, :edit, :update] do 
      collection do 
        get :init_data
      end
--- a/db/migrate/20220513061129_create_user_trace_tasks.rb
+++ b/db/migrate/20220513061129_create_user_trace_tasks.rb
@ -0,0 +1,12 @@
+class CreateUserTraceTasks < ActiveRecord::Migration[5.2]
+  def change
+    create_table :user_trace_tasks do |t|
+      t.references :user 
+      t.references :project
+      t.string :branch_tag
+      t.string :task_id
+      
+      t.timestamps
+    end
+  end
+end
--- a/lib/tasks/sync_outer_repo.rake
+++ b/lib/tasks/sync_outer_repo.rake
@ -0,0 +1,35 @@
+namespace :sync_outer_repo do
+  desc "sync outer repository to gitlink"
+  task done: :environment do
+    file = ENV['file'] || "rcore-os_repo.xlsx"
+    user_type = ENV['type'] || "User"
+    doc = SimpleXlsxReader.open("#{Rails.root}/public/#{file}")
+    data = doc.sheets.first.rows
+    data.each_with_index do |row, index|
+      next if index == 0
+      begin
+        user = (user_type == "User" ? User.find_by(login: row[1]) : Owner.find_by(login: row[1]))
+        project = user.projects.find_by(identifier: row[4])
+        unless project.present?
+          p_category = ProjectCategory.find_or_create_by(name: row[6])
+          p_language = ProjectLanguage.find_or_create_by(name: row[7].to_s.split("/")[0]) if row[7]
+          p_license = License.find_by(name: row[8])
+
+          mirror_params = {
+            user_id: user.id,
+            name: row[5],
+            description: row[9],
+            repository_name: row[4],
+            project_category_id: p_category.id,
+            project_language_id: p_language&.id,
+            clone_addr: row[10]
+          }
+          Projects::MigrateService.call(user, mirror_params)
+        end
+        puts "sync outer repository to gitlink Success repo: #{row[5]} username: #{row[0]}"
+      rescue Exception => e
+        puts "sync outer repository to gitlink Error repo: #{row[5]} username: #{row[0]}, error:#{e}"
+      end
+    end
+  end
+end
--- a/public/docs/api.html
+++ b/public/docs/api.html
@ -467,6 +467,9 @@
                  <li>
                    <a href="#4f8579f6bd" class="toc-h2 toc-link" data-title="取消迁移项目">取消迁移项目</a>
                  </li>
+                  <li>
+                    <a href="#88c0b2e25f" class="toc-h2 toc-link" data-title="退出项目">退出项目</a>
+                  </li>
              </ul>
          </li>
          <li>
@ -543,6 +546,26 @@
                  </li>
              </ul>
          </li>
+          <li>
+            <a href="#traces" class="toc-h1 toc-link" data-title="Traces">Traces</a>
+              <ul class="toc-list-h2">
+                  <li>
+                    <a href="#ca438fc3ca" class="toc-h2 toc-link" data-title="代码溯源初始化">代码溯源初始化</a>
+                  </li>
+                  <li>
+                    <a href="#bb16c601f1" class="toc-h2 toc-link" data-title="代码分析结果列表">代码分析结果列表</a>
+                  </li>
+                  <li>
+                    <a href="#32497859e0" class="toc-h2 toc-link" data-title="新建分析">新建分析</a>
+                  </li>
+                  <li>
+                    <a href="#7b3a48e274" class="toc-h2 toc-link" data-title="重新扫描">重新扫描</a>
+                  </li>
+                  <li>
+                    <a href="#87775b1430" class="toc-h2 toc-link" data-title="下载报告">下载报告</a>
+                  </li>
+              </ul>
+          </li>
          <li>
            <a href="#pulls" class="toc-h1 toc-link" data-title="Pulls">Pulls</a>
              <ul class="toc-list-h2">
@ -4968,7 +4991,7 @@ http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
 <tr>
 <td>menu_name</td>
 <td>string</td>
-<td>导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,activity:动态,setting:仓库设置</td>
+<td>导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,wiki:维基,services:服务,activity:动态,setting:仓库设置</td>
 </tr>
 </tbody></table>

@ -5131,7 +5154,7 @@ http://localhost:3000/api/yystopf/ceshi/project_units.json
 <td>是</td>
 <td></td>
 <td>array</td>
-<td>项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑</td>
+<td>项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,wiki:维基,resources:资源库,services:服务</td>
 </tr>
 </tbody></table>
 <h3 id='7447e4874e-2'>返回字段说明:</h3>
@ -6026,6 +6049,49 @@ http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizat
    </span><span class="nl">"created_at"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2021-04-26 09:54"</span><span class="p">,</span><span class="w">
    </span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1分钟前"</span><span class="w">
 </span><span class="p">}</span><span class="w">
+</span></code></pre></div><h2 id='88c0b2e25f'>退出项目</h2>
+<p>供项目成员(开发者、报告者)退出项目用</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST http://localhost:3000/api/ceshi1/ceshi_repo1/quit.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/:owner/:repo/quit.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-15'>HTTP 请求</h3>
+<p><code>POST /api/:owner/:repo/quit.json</code></p>
+<h3 id='1f9ac54b15-13'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>用户登录名</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td></td>
+<td>string</td>
+<td>项目标识identifier</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
 </span></code></pre></div><h1 id='repositories'>Repositories</h1><h2 id='0a366f0c25'>仓库详情</h2>
 <p>仓库详情</p>

@ -9302,6 +9368,289 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/test.json
 <aside class="success">
  Success Data.
 </aside>
+<h1 id='traces'>Traces</h1><h2 id='ca438fc3ca'>代码溯源初始化</h2>
+<p>用户同意协议后请求的接口，创建代码溯源的账号</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+http://localhost:3000/api/traces/trace_users.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/traces/trace_users.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http'>HTTP 请求</h3>
+<p><code>POST api/traces/trace_users.json</code></p>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+<h2 id='bb16c601f1'>代码分析结果列表</h2>
+<p>查询项目下代码分析的结果</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+http://localhost:3000/api/traces/yystopf/many_branch/task_results.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/traces/:owner/:repo/task_results.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-2'>HTTP 请求</h3>
+<p><code>GET api/traces/:owner/:repo/task_results.json</code></p>
+<h3 id='1f9ac54b15'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目所有者标识</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>page</td>
+<td>否</td>
+<td>1</td>
+<td>int</td>
+<td>页码</td>
+</tr>
+<tr>
+<td>limit</td>
+<td>否</td>
+<td>15</td>
+<td>int</td>
+<td>每页数量</td>
+</tr>
+</tbody></table>
+<h3 id='90889036d2'>返回字段说明（暂缺）</h3>
+<!-- 参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+total_count              |int   |总数 |
+public_keys.id           |int   |ID|
+public_keys.name         |string|密钥标题|
+public_keys.content      |string|密钥内容|
+public_keys.fingerprint  |string|密钥标识|
+public_keys.created_time |string|密钥创建时间| -->
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"data"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"accuracy"</span><span class="p">:</span><span class="w"> </span><span class="s2">"20"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"code_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"C"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"depth"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detect_flag"</span><span class="p">:</span><span class="w"> </span><span class="s2">"快速-组件级"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detect_rule"</span><span class="p">:</span><span class="w"> </span><span class="s2">"快速-组件级,2,20,,开源软件,50,10"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detect_startdate"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-05-10 15:59:46 "</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detect_status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fail"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detectflag"</span><span class="p">:</span><span class="w"> </span><span class="s2">"快速-组件级"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"fail_reason"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Invalid package type"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"many_branch.zip"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"license_process"</span><span class="p">:</span><span class="w"> </span><span class="s2">"100"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"licenseparam"</span><span class="p">:</span><span class="w"> </span><span class="s2">"开源软件"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"package_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"product_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"84727546110"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"project_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"6dbc3e42-5857-4ca4-a54d-58fd9dbf6dc5"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"sim_process"</span><span class="p">:</span><span class="w"> </span><span class="s2">"100"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"similarity_process"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"task_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"15139171-091b-4316-98b1-6068970efa44"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"totalsize"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"uid"</span><span class="p">:</span><span class="w"> </span><span class="s2">"78"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"vuln_process"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"vulnlevel"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+<h2 id='32497859e0'>新建分析</h2>
+<p>用户选择仓库分支进行代码分析的接口</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+http://localhost:3000/api/traces/yystopf/many_branch/tasks.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/traces/:owner/:repo/tasks.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-3'>HTTP 请求</h3>
+<p><code>POST api/traces/:owner/:repo/tasks.json</code></p>
+<h3 id='1f9ac54b15-2'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目所有者标识</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>branch_name</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>分支名称</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+<h2 id='7b3a48e274'>重新扫描</h2>
+<p>对代码分析结果进行再次分析</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+http://localhost:3000/api/traces/yystopf/many_branch/reload_task.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/traces/:owner/:repo/reload_task.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-4'>HTTP 请求</h3>
+<p><code>GET api/traces/:owner/:repo/reload_task.json</code></p>
+<h3 id='1f9ac54b15-3'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目所有者标识</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>project_id</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>代码分析结果里的project_id</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+<h2 id='87775b1430'>下载报告</h2>
+<p>把代码分析的结果下载到本地</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+http://localhost:3000/api/traces/yystopf/many_branch/task_pdf.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/traces/:owner/:repo/task_pdf.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-5'>HTTP 请求</h3>
+<p><code>GET api/traces/:owner/:repo/task_pdf.json</code></p>
+<h3 id='1f9ac54b15-4'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目所有者标识</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>task_id</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>代码分析结果里的task_id</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
 <h1 id='pulls'>Pulls</h1><h2 id='get-a-pull-request'>Get a pull request</h2>
 <p>获取合并请求详情接口</p>

--- a/public/rcore-os_repo.xlsx
+++ b/public/rcore-os_repo.xlsx
--- a/public/导入用户模板.xlsx
+++ b/public/导入用户模板.xlsx
--- a/spec/models/user_trace_task_spec.rb
+++ b/spec/models/user_trace_task_spec.rb
@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe UserTraceTask, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end