add: glcc news management and api data

README.md

@@ -1,30 +1,17 @@
-# GitLink - CCF开源创新服务平台
+Trustie （确实）是一个以大众化协同开发、开放式资源共享、持续性可信评估为核心机理，面向高校创新实践的在线协作平台。
 
-GitLink（确实开源）是中国计算机学会（CCF）官方指定的开源创新服务平台，旨在以“为开源创新服务”为使命，以“成为开源创新的汇聚地”为愿景，秉承“创新、开放、协作、共享”的价值观，致力于为大规模开源开放协同创新助力赋能，打造创新成果孵化和新工科人才培养的开源创新生态！
+## 特性
 
-<center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/gitlink.png?raw=true" width=80% />
-</center>
-    
-## 特色功能
+- 软件创作与生产深度融合的软件开发环境体系结构 软件自由创作和工程生产的高效衔接，适于软件开发中群体智慧的有效汇聚。
 
-- **分布式协作开发**：基于Git打造分布式代码托管环境，提供免费公、私有代码仓库，支持在线文件编辑、代码分支管理、协作贡献统计、代码仓库复刻（Fork）、贡献合并请求（PR）、群智贡献审阅等功能，让您的项目在这里健康、快速的成长！
+- 构件化协同开发环境的可扩展运行框架多样化工具的集成和联动，形成了强动态扩展能力的平台框架。
 
-- **一站式过程管理**：提供易修（Issue）、里程碑、通知提醒、标签归档等多样化任务管理工具，支持各类开发任务的发布、指派与跟踪，同时提供在线Wiki文档、组织多粒度管理等功能，为您搭建一站式的项目过程管理环境，让您的团队协作更高效、过程更透明！
+- “互联网即资源库”的全新软件复用模式 成长式软件资源管理系统，实现了分散资源的知识融合、资源的可持续增长和有效复用。
 
-- **高效流水线运维**：融合DevOps思想，提供轻量级的工作流引擎（Engine），打通编码、测试、构建、部署等开发运维环节；支持自定义配置、代码静态扫描、构建自动触发、容器镜像托管等功能，同时支持接入第三方运维工具，让您的代码更加快速、可靠地形成高质量的产品！
-
-- **多层次代码分析**：提供软件软代码和芯片RTL代码的溯源分析、文件级和组件级许可证识别及风险分析、输入性开源漏洞检测和加固建议，支持分析结果的多层次可视化展示，帮助您实施有效开源治理，厘清代码引用链，发现并消除漏洞感染链，为安全合规的开源引用保驾护航！
-
-- **多维度用户画像**：实时采集和分析平台中的各类开源资源数据，搭建多维度用户画像评估系统，提供开发活动统计、贡献度日历、用户能力建模、角色与专业定位分析等功能，让您在个人主页展示开发动态与创新能力！
-
-## 第三方组件
+## 部署
 
 
-## 部署流程
-
-
-### 依赖库
+### Depends Versions
 
 * Ruby 2.4.5
 
@@ -36,19 +23,22 @@ GitLink（确实开源）是中国计算机学会（CCF）官方指定的开源
 
 * imagemagick
 
-### 步骤
+### Steps
 
-（1）克隆稳定版本
+#### 1. 克隆稳定版本
 ```
 git clone -b standalone https://git.trustie.net/jasder/forgeplus.git
 ```
 
-（2）安装依赖包
+#### 2. 安装依赖包
+
 ```bash
 cd forgeplus && bundle install
 ```
 
-（3）配置初始化文件：进入项目根目录执行以下命令
+#### 3. 配置初始化文件
+进入项目根目录执行一下命令：
+
 ```bash
 cp config/configuration.yml.example config/configuration.yml
 cp config/database.yml.example config/database.yml
@@ -56,7 +46,11 @@ touch config/redis.yml
 touch config/elasticsearch.yml
 ```
 
-（4）配置数据库：数据库配置信息请查看/config/database.yml文件，项目默认采用mysql数据库, 如需更改，请自行修改配置信息，默认配置如下
+#### 4. 配置数据库
+数据库配置信息请查看/config/database.yml文件，
+项目默认采用mysql数据库, 如需更改，请自行修改配置信息，
+默认配置如下：
+
 ```bash
 default: &default
   adapter: mysql2
@@ -66,13 +60,14 @@ default: &default
   password: 123456
 ```
 
-（5）配置gitea服务(可选)：如需要部署自己的gitea平台，请参考[gitea官方平台文档](https://docs.gitea.io/zh-cn/install-from-binary/)。因目前gitea平台api受限，暂时推荐从forge平台获取[gitea部署文件](https://forgeplus.trustie.net/projects/Trustie/gitea-binary)进行部署
+#### 5. 配置gitea服务(可选)
+**如需要部署自己的gitea平台，请参考gitea官方平台：https://docs.gitea.io/zh-cn/install-from-binary/**
 
-- 配置gitea服务步骤：
-                                                  
-	-- 部署gitea服务，并注册root账户
-                                                  
-	-- 修改forge平台的 config/configuration.yml中的gitea服务指向地址，如：
+**因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/Trustie/gitea-binary**
+
+**配置gitea服务步骤**
+1. 部署gitea服务，并注册root账户
+2. 修改forge平台的 config/configuration.yml中的gitea服务指向地址，如：
 
 ```ruby
 gitea:
@@ -82,9 +77,10 @@ gitea:
   base_url: '/api/v1'
 ```
 
-（6）安装redis环境：请自行搜索各平台如何安装部署redis环境
+#### 6. 安装redis环境
+**请自行搜索各平台如何安装部署redis环境**
 
-（7）安装imagemagick插件：
+#### 7. 安装imagemagick插件
 - Mac OS X
 ```bash
  brew install imagemagick ghostscript
@@ -95,95 +91,88 @@ gitea:
 sudo apt-get install -y imagemagick
 ```
 
-（8）创建数据库：开发环境为development， 生成环境为production
+#### 8. 创建数据库
+**开发环境为development， 生成环境为production**
 ```bash
 rails db:create  RAILS_ENV=development
 ```
 
-（9）导入数据表结构
+#### 9. 导入数据表结构
 
 ```bash
 bundle exec rake sync_table_structure:import_csv
 ```
 
-（10）执行migrate迁移文件：开发环境为development， 生成环境为production
+#### 10. 执行migrate迁移文件
+**开发环境为development， 生成环境为production**
 ```bash
 rails db:migrate RAILS_ENV=development
 ```
 
-（11）clone前端代码：将前端代码克隆到public/react目录下，目录结构应该是: public/react/build
+#### 11. clone前端代码
+**将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
 ```bash
 git clone -b standalone https://git.trustie.net/jasder/build.git
 ```
 
-（12）启动redis(此处以macOS系统为例)
+#### 12. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```
 
-（13）启动sidekiq：开发环境为development， 生成环境为production
+#### 13. 启动sidekiq
+**开发环境为development， 生成环境为production**
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-（14）启动rails服务
+#### 14. 启动rails服务
 ```bash
 rails s
 ```
 
-（15）浏览器访问：在浏览器中输入如下地址访问
+#### 15. 浏览器访问
+在浏览器中输入如下地址访问：
 ```bash
 http://localhost:3000/
 ```
 
-（16）其他说明：通过页面注册以第一个用户为平台管理员用户
-
+#### 16. 其他说明
+通过页面注册都第一个用户为平台管理员用户
 
 ## 页面展示
 
-- 项目列表
+- 代码库
+
+![](docs/figs/code.png?raw=true)
+
 
-<center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/project_list.png?raw=true" width=50% />
-</center>
-        
-- 代码仓库
-            
-<center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/repo.png?raw=true" width=50% />
-</center>
-                    
 - 任务管理
-            
-<center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/issues.png?raw=true" width=50% />
-</center>
-                    
-- 合并请求
-            
-<center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/PR.png?raw=true" width=50% />
-</center>
-                  
-- 引擎配置
-            
-<center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/engine.png?raw=true" width=50% />
-</center>
+![](docs/figs/issue_manage.png?raw=true)
 
+- 任务查看
+
+![](docs/figs/issue_view.png?raw=true)
+
+- 任务指派
+
+![](docs/figs/issue_assign2.png?raw=true)
+
+- 里程碑
+
+![](docs/figs/milestone.png?raw=true)
+
+### API
+- [API文档](https://forgeplus.trustie.net/docs/api)
+- [API](showdoc.com.cn)
+  账号：forgeplus@admin.com 密码：forge123
 
 ## 贡献代码
 
-我们期待您向GitLink提交贡献！在您贡献时，请遵循以下流程：
-
 1. Fork 项目
 2. 创建本地分支(git checkout -b my-new-feature)
 3. 提交更改 (git commit -am 'Add some feature')
 4. 推送到分支 (git push origin my-new-feature)
 5. 向源项目的 **develop** 分支发起 Pull Request
 
-#### 指导文档
-- [API文档](https://www.gitlink.org.cn/docs/api)
-- [Git常用命令](https://git-scm.com/)
-
-## 许可证协议
+## License

app/controllers/accounts_controller.rb

@@ -192,7 +192,9 @@ class AccountsController < ApplicationController
 
     sync_params = {
       password: params[:password].to_s,
-      email: @user.mail
+      email: @user.mail,
+      login_name: @user.name,
+      source_id: 0
     }
 
     interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)

app/controllers/admins/topic/glcc_news_controller.rb

@@ -0,0 +1,57 @@
+class Admins::Topic::GlccNewsController < Admins::Topic::BaseController
+  before_action :find_glcc, only: [:edit, :update, :destroy]
+
+  def index 
+    q = ::Topic::GlccNews.ransack(title_cont: params[:search])
+    glcc_news = q.result(distinct: true)
+    @glcc_news = paginate(glcc_news)
+  end
+
+  def new 
+    @glcc = ::Topic::GlccNews.new
+  end
+
+  def create 
+    @glcc = ::Topic::GlccNews.new(glcc_params)
+    if @glcc.save 
+      redirect_to admins_topic_glcc_news_index_path
+      flash[:success] = "新增新闻稿成功"
+    else
+      redirect_to admins_topic_glcc_news_index_path
+      flash[:danger] = "新增新闻稿失败"
+    end
+  end
+
+  def edit 
+  end
+
+  def update 
+    @glcc.attributes = glcc_params
+    if @glcc.save 
+      redirect_to admins_topic_glcc_news_index_path
+      flash[:success] = "更新新闻稿成功"
+    else  
+      redirect_to admins_topic_glcc_news_index_path
+      flash[:danger] = "更新新闻稿失败"
+    end
+  end
+
+  def destroy 
+    if @glcc.destroy 
+      redirect_to admins_topic_glcc_news_index_path
+      flash[:success] = "删除新闻稿成功"
+    else  
+      redirect_to admins_topic_glcc_news_index_path
+      flash[:danger] = "删除新闻稿失败"
+    end
+  end
+
+  private 
+  def find_glcc
+    @glcc = ::Topic::GlccNews.find_by_id(params[:id])
+  end
+
+  def glcc_params 
+    params.require(:topic_glcc_news).permit(:title, :uuid, :url, :order_index)
+  end
+end

app/controllers/attachments_controller.rb

@@ -217,7 +217,7 @@ class AttachmentsController < ApplicationController
         if @file.container && current_user.logged?
           if @file.container.is_a?(Issue)
             course = @file.container.project
-            candown = course.member?(current_user)
+            candown = course.member?(current_user) || course.is_public
           elsif @file.container.is_a?(Journal)
             course = @file.container.issue.project
             candown = course.member?(current_user)

app/controllers/ci/base_controller.rb

@@ -8,7 +8,7 @@ class Ci::BaseController < ApplicationController
     namespace = params[:owner]
     id = params[:repo] || params[:id]
 
-    @ci_user, @repo = Ci::Repo.find_with_namespace(namespace, id)
+    @ci_user, @repo = Ci::Repo.find_with_namespace(namespace, id, current_user.login)
   end
 
   def load_all_repo

app/controllers/ci/secrets_controller.rb

@@ -46,7 +46,7 @@ class Ci::SecretsController < Ci::BaseController
   end
 
   def ci_drone_url
-    user = User.find_by(login: params[:owner])
+    user = User.find_by(login: params[:owner]) || User.find_by(login: current_user.login)
     user&.ci_cloud_account.drone_url
   end
 

app/controllers/compare_controller.rb

@@ -16,6 +16,7 @@ class CompareController < ApplicationController
     if @base.blank? || @head.blank?
       return -2, "请选择分支"
     else
+      return -2, "目标仓库未开启合并请求（PR）功能" unless @project.has_menu_permission("pulls")
       if @head.include?(":")
         fork_project = @project.forked_projects.joins(:owner).where(users: {login: @head.to_s.split("/")[0]}).take
         return -2, "请选择正确的仓库" unless fork_project.present?
@@ -50,6 +51,6 @@ class CompareController < ApplicationController
   end
 
   def gitea_compare(base, head)
-    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, CGI.escape(base), CGI.escape(head), current_user.gitea_token)
+    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, Addressable::URI.escape(base), Addressable::URI.escape(head), current_user.gitea_token)
   end
 end

app/controllers/concerns/ci/cloud_account_manageable.rb

@@ -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: url) do |req|
+    conn = Faraday.new(url: "#{Gitea.gitea_config[:domain]}#{url}") do |req|
       req.request :url_encoded
       req.adapter Faraday.default_adapter
       req.headers["cookie"] = "_session_=#{SecureRandom.hex(28)}; _oauth_state_=#{state}"
@@ -188,7 +188,8 @@ module Ci::CloudAccountManageable
     response = conn.get
     logger.info "[drone] response headers: #{response.headers}"
 
-    response.headers['location'].include?('error') ? false : true
+    true
+    # response.headers['location'].include?('error') ? false : true
   end
 
   private

app/controllers/issues_controller.rb

@@ -24,13 +24,13 @@ class IssuesController < ApplicationController
     @filter_issues = @all_issues
     @filter_issues = @filter_issues.where.not(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::ADD
     @filter_issues = @filter_issues.where(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::SOLVING
-    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
+    @filter_issues = @filter_issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
     @open_issues = @all_issues.where.not(status_id: IssueStatus::CLOSED)
     @close_issues = @all_issues.where(status_id: IssueStatus::CLOSED)
-    @assign_to_me = @filter_issues.where(assigned_to_id: current_user&.id)
-    @my_published = @filter_issues.where(author_id: current_user&.id)
     scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
     @issues_size = scopes.size
+    @assign_to_me = scopes.where(assigned_to_id: current_user&.id)
+    @my_published = scopes.where(author_id: current_user&.id)
     @issues = paginate(scopes)
 
     respond_to do |format|
@@ -149,6 +149,8 @@ class IssuesController < ApplicationController
       end
 
       @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
+      @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE) if params[:status_id].to_i == 5
+
 
       Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
       AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0
@@ -178,6 +180,7 @@ class IssuesController < ApplicationController
       elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1
         @issue&.issue_tags_relates&.destroy_all
         params[:issue_tag_ids].each do |tag|
+          next if tag == [""]
           IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
         end
       else
@@ -244,7 +247,7 @@ class IssuesController < ApplicationController
         end
         if params[:status_id].to_i == 5  #任务由非关闭状态到关闭状态时
           @issue.issue_times.update_all(end_time: Time.now)
-          @issue.update_closed_issues_count_in_project!
+          # @issue.update_closed_issues_count_in_project!
           if @issue.issue_type.to_s == "2" && last_status_id != 5
             if @issue.assigned_to_id.present? && last_status_id == 3 #只有当用户完成100%时，才给token
               post_to_chain("add", @issue.token, @issue.get_assign_user.try(:login))

app/controllers/notices_controller.rb

@@ -0,0 +1,21 @@
+class NoticesController < ApplicationController
+
+  def create
+    tip_exception("参数有误") if params["source"].blank?
+    user_id = params[:user_id]
+
+    if params["source"] == "CompetitionBegin"
+      competition_id = params[:competition_id]
+      SendTemplateMessageJob.perform_later('CompetitionBegin', user_id, competition_id)
+    elsif params["source"] == "CompetitionResult"
+      competition_id = params[:competition_id]
+      SendTemplateMessageJob.perform_later('CompetitionResult', user_id, competition_id)
+    elsif params["source"] == "CompetitionReview"
+      competition_id = params[:competition_id]
+      SendTemplateMessageJob.perform_later('CompetitionReview', user_id, competition_id)
+    else
+      tip_exception("#{params["source"]}未配置")
+    end
+    render_ok
+  end
+end

app/controllers/organizations/organization_users_controller.rb

@@ -5,7 +5,11 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
   def index
     @organization_users = @organization.organization_users.includes(:user)
     search = params[:search].to_s.downcase
-    @organization_users = @organization_users.joins(:user).merge(User.like(search))
+    user_condition_users = User.like(search).to_sql 
+    team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
+    users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
+   
+    @organization_users = @organization_users.where(user_id: users).distinct
 
     @organization_users = kaminari_paginate(@organization_users)
   end

app/controllers/organizations/teams_controller.rb

@@ -44,7 +44,7 @@ class Organizations::TeamsController < Organizations::BaseController
   def create
     ActiveRecord::Base.transaction do
       if @organization.teams.count >= 50
-        return render_forbidden("组织的团队数量已超过限制！") 
+        return tip_exception("组织的团队数量已超过限制！") 
       else 
         Organizations::CreateTeamForm.new(team_params).validate!
         @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)

app/controllers/praise_tread_controller.rb

@@ -12,6 +12,7 @@ class PraiseTreadController < ApplicationController
     begin
       return normal_status(2, "你已点过赞了") if current_user.liked?(@project)
       current_user.like!(@project)
+      SendTemplateMessageJob.perform_later('ProjectPraised', current_user.id, @project.id) if Site.has_notice_menu?
       render_ok({praises_count: @project.praises_count, praised: current_user.liked?(@project)})
     rescue Exception => e
       uid_logger_error(e.message)

app/controllers/projects_controller.rb

@@ -59,7 +59,7 @@ class ProjectsController < ApplicationController
     Projects::MigrateForm.new(mirror_params).validate!
 
     @project = 
-      if enable_accelerator?(mirror_params[:clone_addr])
+      if EduSetting.get("mirror_address").to_s.include?("github") && enable_accelerator?(mirror_params[:clone_addr])
         source_clone_url = mirror_params[:clone_addr]
         uid_logger("########## 已动加速器 ##########")
         result = Gitea::Accelerator::MigrateService.call(mirror_params)
@@ -71,6 +71,11 @@ class ProjectsController < ApplicationController
         else
           Projects::MigrateService.call(current_user, mirror_params)
         end
+      elsif EduSetting.get("mirror_address").to_s.include?("cnpmjs") && mirror_params[:clone_addr].include?("github.com")
+        source_clone_url = mirror_params[:clone_addr]
+        clone_url = source_clone_url.gsub('github.com', 'github.com.cnpmjs.org')
+        uid_logger("########## 更改clone_addr ##########")
+        Projects::MigrateService.call(current_user, mirror_params.merge(source_clone_url: source_clone_url, clone_addr: clone_url))
       else
         Projects::MigrateService.call(current_user, mirror_params)
       end
@@ -130,7 +135,7 @@ class ProjectsController < ApplicationController
         validate_params = project_params.slice(:name, :description, 
           :project_category_id, :project_language_id, :private, :identifier)
   
-        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier)).validate!
+        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier, project_name: @project.name)).validate!
   
         private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false
 

app/controllers/pull_requests_controller.rb

@@ -2,7 +2,7 @@ class PullRequestsController < ApplicationController
   before_action :require_login, except: [:index, :show, :files, :commits]
   before_action :require_profile_completed, only: [:create]
   before_action :load_repository
-  before_action :check_menu_authorize
+  before_action :check_menu_authorize, only: [:index, :show, :create, :update, :refuse_merge, :pr_merge]
   before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits]
   before_action :load_pull_request, only: [:files, :commits]
   before_action :find_atme_receivers, only: [:create, :update]
@@ -16,7 +16,7 @@ class PullRequestsController < ApplicationController
     issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
     @all_issues = issues.distinct
     @filter_issues = @all_issues
-    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
+    @filter_issues = @filter_issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
     @open_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::OPEN})
     @close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
     @merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::MERGED})
@@ -274,12 +274,12 @@ class PullRequestsController < ApplicationController
       base: params[:base],  #目标分支
       milestone: 0,  #里程碑,未与本地的里程碑关联
     }
+    assignee_login = User.find_by_id(params[:assigned_to_id])&.login
     @requests_params = @local_params.merge({
-      assignee: current_user.try(:login),
       # assignees: ["#{params[:assigned_login].to_s}"],
-      assignees: ["#{current_user.try(:login).to_s}"],
-      labels: params[:issue_tag_ids],
-      due_date: Time.now
+      assignees: ["#{assignee_login.to_s}"],
+      labels: params[:issue_tag_ids]
+      # due_date: Time.now
     })
     @issue_params = {
       author_id: current_user.id,

app/controllers/repositories_controller.rb

@@ -1,387 +1,390 @@
-class RepositoriesController < ApplicationController
-  include RepositoriesHelper
-  include ApplicationHelper
-  include OperateProjectAbilityAble
-  include Repository::LanguagesPercentagable
-
-  before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror]
-  before_action :require_profile_completed, only: [:create_file]
-  before_action :load_repository
-  before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive]
-  before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
-  before_action :get_ref, only: %i[entries sub_entries top_counts file archive]
-  before_action :get_latest_commit, only: %i[entries sub_entries top_counts]
-  before_action :get_statistics, only: %i[top_counts]
-
-  def files
-    result = @project.educoder? ? nil : Gitea::Repository::Files::GetService.call(@owner, @project.identifier, @ref, params[:search], @owner.gitea_token)
-    render json: result
-  end
-
-  # 新版项目详情
-  def detail
-    @user = current_user
-    @result = Repositories::DetailService.call(@owner, @repository, @user)
-    @project_fork_id = @project.try(:forked_from_project_id)
-    if @project_fork_id.present?
-      @fork_project = Project.find_by(id: @project_fork_id)
-      @fork_project_user = @fork_project.owner
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def show
-    @user = current_user
-    @repo = @project.repository
-    @result = @project.forge? ? Gitea::Repository::GetService.new(@owner, @project.identifier).call : nil
-    @project_fork_id = @project.try(:forked_from_project_id)
-    if @project_fork_id.present?
-      @fork_project = Project.find_by(id: @project_fork_id)
-      @fork_project_user = @fork_project.owner
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def entries
-    @project.increment!(:visits)
-    CacheAsyncSetJob.perform_later("project_common_service", {visits: 1}, @project.id)
-    if @project.educoder?
-      @entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder.repo_name)
-    else
-      @entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
-      @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
-      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
-    end
-  end
-
-  def top_counts
-    @result = @project.educoder? ? nil : Gitea::Repository::GetService.new(@project.owner, @project.identifier).call
-  end
-
-  def sub_entries
-    file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
-
-    if @project.educoder?
-      if params[:type] === 'file'
-        @sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri)
-        logger.info "######### sub_entries: #{@sub_entries}"
-        return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1
-
-        tmp_entries = {
-            "content" =>  @sub_entries['data']['content'],
-            "type"    => "blob"
-          }
-        @sub_entries = {
-          "trees"=>tmp_entries,
-          "commits" => [{}]
-        }
-      else
-        begin
-          @sub_entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder&.repo_name, {path: file_path_uri})
-          if @sub_entries.blank? || @sub_entries['status'].to_i === -1
-            @sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri)
-            return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1
-            tmp_entries = {
-              "content" =>  @sub_entries['data']['content'],
-              "type"    => "blob"
-            }
-            @sub_entries = {
-              "trees"=>tmp_entries,
-              "commits" => [{}]
-            }
-          end
-        rescue 
-          return render_error('该文件暂未开放，敬请期待.')
-        end
-      end
-    else
-      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
-      interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: @ref)
-      if interactor.success?
-        result = interactor.result
-        @sub_entries = result.is_a?(Array) ? result.sort_by{ |hash| hash['type'] } : result
-      else
-        render_error(interactor.error)
-      end
-    end
-  end
-
-  def commits
-    if @project.educoder?
-      @commits = Educoder::Repository::Commits::ListService.call(@project&.project_educoder&.repo_name)
-    else
-      if params[:filepath].present?
-        file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
-        @hash_commit = Gitea::Repository::Commits::FileListService.new(@owner.login, @project.identifier, file_path_uri,
-                                                                       sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
-      else
-        @hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier,
-                                                                   sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
-      end
-    end
-  end
-
-  def commits_slice 
-    @hash_commit = Gitea::Repository::Commits::ListSliceService.call(@owner.login, @project.identifier,
-      sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token)
-  end 
-
-  def commit
-    @sha         = params[:sha]
-    if @project.educoder?
-      return render_error('暂未开放，敬请期待.')
-    else
-      @commit      = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
-      @commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token, {diff: true})
-    end
-  end
-
-  def tags
-    result = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]})
-
-    @tags = result.is_a?(Hash) && result.key?(:status) ? [] : result
-  end
-
-  def contributors
-    if params[:filepath].present? || @project.educoder?
-      @contributors = []
-    else
-      @contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
-    end
-  end
-
-  def edit
-    return render_forbidden if !@project.manager?(current_user) && !current_user.admin?
-  end
-
-  def create_file
-    interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params)
-    if interactor.success?
-      @file = interactor.result
-      # create_new_pr(params)
-      #如果是更新流水线文件
-      if params[:pipeline_id]
-        update_pipeline(params[:pipeline_id])
-      end
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  def update_pipeline(pipeline_id)
-    pipeline = Ci::Pipeline.find(pipeline_id)
-    if pipeline
-      pipeline.update!(sync: 1)
-    end
-  end
-
-  def update_file
-    interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
-    if interactor.success?
-      @file = interactor.result
-      # TODO: 是否创建pr
-      # create_new_pr(params)
-      render_result(1, "更新成功")
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  def delete_file
-    interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
-    if interactor.success?
-      @file = interactor.result
-      render_result(1, "文件删除成功")
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  def repo_hook
-
-  end
-
-  def sync_mirror
-    return render_error("正在镜像中..") if  @repository.mirror.waiting?
-
-    @repository.sync_mirror!
-    SyncMirroredRepositoryJob.perform_later(@repository.id, current_user.id)
-    render_ok
-  end
-
-  def readme
-    if params[:filepath].present?
-      result = Gitea::Repository::Readme::DirService.call(@owner.login, @repository.identifier, params[:filepath], params[:ref], current_user&.gitea_token)
-    else
-      result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
-    end
-    @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")
-  rescue 
-    render json: nil
-  end
-
-  def languages
-    if @project.educoder? 
-      render json: {}
-    else
-      render json: languages_precentagable
-    end
-  end
-
-  def archive
-    domain  = Gitea.gitea_config[:domain]
-    api_url = Gitea.gitea_config[:base_url]
-    archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{CGI.escape(params[:archive])}"
-
-    file_path = [domain, api_url, archive_url].join
-    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("?") if @repository.hidden?
-
-    return render_not_found if !request.format.zip? && !request.format.gzip?
-
-    redirect_to file_path
-  end
-  
-  def raw 
-    domain  = Gitea.gitea_config[:domain]
-    api_url = Gitea.gitea_config[:base_url]
-
-    url = "/repos/#{@owner.login}/#{@repository.identifier}/raw/#{CGI.escape(params[:filepath])}?ref=#{CGI.escape(params[:ref])}"
-    file_path = [domain, api_url, url].join
-    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("&") 
-
-    redirect_to file_path
-  end
-
-  private
-
-  def find_project
-    @project = Project.find params[:id]
-    render_not_found("未找到相关的仓库") unless @project
-  end
-
-  def find_project_with_includes
-    @project = Project.includes(:repository, :owner, :watchers, :praise_treads).find params[:id]
-  end
-
-  def authorizate!
-    return if current_user && current_user.admin?
-    if @project.repository.hidden? && !@project.member?(current_user)
-      render_forbidden
-    end
-  end
-
-  # TODO 获取最新commit信息
-  def project_commits
-    if params[:filepath].present?
-      file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
-      Gitea::Repository::Commits::FileListService.new(@project.owner.login, @project.identifier, file_path_uri,
-        sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
-    else
-      Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier,
-        sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
-    end
-  end
-
-  def get_statistics
-    @branches_count = @project.educoder? ? 0 : Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call&.size
-    @tags_count = @project.educoder? ? 0 : Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size
-  end
-
-  def get_ref
-    @ref = params[:ref] || @project&.default_branch
-  end
-
-  def get_latest_commit
-    latest_commit = @project.educoder? ? nil : project_commits
-    @latest_commit = latest_commit.present? ? latest_commit[:body][0] : nil
-    @commits_count = latest_commit.present? ? latest_commit[:total_count] : 0
-  end
-
-  def content_params
-    {
-      filepath: params[:filepath],
-      branch: params[:branch],
-      new_branch: params[:new_branch],
-      content: params[:content],
-      message: params[:message],
-      committer: {
-        email: current_user.mail,
-        name: current_user.login
-      },
-      identifier: @project.identifier
-    }
-  end
-
-  def hook_params(hook_type, params)
-    # if hook_type == "push"
-    #   # TODO hook返回的记录中，暂时没有文件代码数量的增减，暂时根据 commits数量来计算
-    #   uploadPushInfo = {
-    #     "sha": params["commits"].present? ? params["commits"].last : "",
-    #     "branch": params["ref"].to_s.split("/").last,
-    #     "modification_lines": params["commits"].length
-    #     }
-    # elsif hook_type == "pull_request" && params["action"].to_s == "closed"  #合并请求合并后才会有上链操作
-    #   uploadPushInfo = {
-    #     "branch": params["base"]["ref"].to_s.split("/").last,
-    #     "sha": params["pull_request"]["merge_base"],
-    #     "modification_lines": 1  #pull_request中没有commits数量
-    #     }
-    # else
-    #     uploadPushInfo = {}
-    # end
-
-    # uploadPushInfo
-  end
-  
-  def create_new_pr(params)
-    if params[:new_branch].present? && params[:new_branch] != params[:branch]
-      local_params = {
-        title: params[:message],  #标题
-        body:	params[:content],  #内容
-        head: params[:new_branch],  #源分支
-        base: params[:branch],  #目标分支
-        milestone: 0  #里程碑,未与本地的里程碑关联
-
-      }
-      requests_params = local_params.merge({
-                                             assignee: current_user.try(:login),
-                                             assignees: [],
-                                             labels: [],
-                                             due_date: Time.now
-                                           })
-
-      issue_params = {
-        author_id: current_user.id,
-        project_id: @project.id,
-        subject: params[:message],
-        description: params[:content],
-        assigned_to_id: nil,
-        fixed_version_id: nil,
-        issue_tags_value: nil,
-        issue_classify: "pull_request",
-        issue_type: "1",
-        tracker_id: 2,
-        status_id: 1,
-        priority_id: params[:priority_id] || "2"
-      }
-      @pull_issue = Issue.new(issue_params)
-      if @pull_issue.save!
-        local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: @pull_issue.id))
-        if local_requests.save
-          gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @owner.login, @project.try(:identifier), requests_params).call
-          if gitea_request[:status] == :success && local_requests.update_attributes(gpid: gitea_request["body"]["number"])
-            local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
-          end
-        end
-      end
-    end
-  end
-
-end
+class RepositoriesController < ApplicationController
+  include RepositoriesHelper
+  include ApplicationHelper
+  include OperateProjectAbilityAble
+  include Repository::LanguagesPercentagable
+
+  before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror]
+  before_action :require_profile_completed, only: [:create_file]
+  before_action :load_repository
+  before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive]
+  before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
+  before_action :get_ref, only: %i[entries sub_entries top_counts file archive]
+  before_action :get_latest_commit, only: %i[entries sub_entries top_counts]
+  before_action :get_statistics, only: %i[top_counts]
+
+  def files
+    result = @project.educoder? ? nil : Gitea::Repository::Files::GetService.call(@owner, @project.identifier, @ref, params[:search], @owner.gitea_token)
+    render json: result
+  end
+
+  # 新版项目详情
+  def detail
+    @user = current_user
+    @result = Repositories::DetailService.call(@owner, @repository, @user)
+    @project_fork_id = @project.try(:forked_from_project_id)
+    if @project_fork_id.present?
+      @fork_project = Project.find_by(id: @project_fork_id)
+      @fork_project_user = @fork_project.owner
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def show
+    @user = current_user
+    @repo = @project.repository
+    @result = @project.forge? ? Gitea::Repository::GetService.new(@owner, @project.identifier).call : nil
+    @project_fork_id = @project.try(:forked_from_project_id)
+    if @project_fork_id.present?
+      @fork_project = Project.find_by(id: @project_fork_id)
+      @fork_project_user = @fork_project.owner
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def entries
+    @project.increment!(:visits)
+    CacheAsyncSetJob.perform_later("project_common_service", {visits: 1}, @project.id)
+    if @project.educoder?
+      @entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder.repo_name)
+    else
+      @entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
+      @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
+      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
+    end
+  end
+
+  def top_counts
+    @result = @project.educoder? ? nil : Gitea::Repository::GetService.new(@project.owner, @project.identifier).call
+  end
+
+  def sub_entries
+    file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+
+    if @project.educoder?
+      if params[:type] === 'file'
+        @sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri)
+        logger.info "######### sub_entries: #{@sub_entries}"
+        return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1
+
+        tmp_entries = {
+            "content" =>  @sub_entries['data']['content'],
+            "type"    => "blob"
+          }
+        @sub_entries = {
+          "trees"=>tmp_entries,
+          "commits" => [{}]
+        }
+      else
+        begin
+          @sub_entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder&.repo_name, {path: file_path_uri})
+          if @sub_entries.blank? || @sub_entries['status'].to_i === -1
+            @sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri)
+            return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1
+            tmp_entries = {
+              "content" =>  @sub_entries['data']['content'],
+              "type"    => "blob"
+            }
+            @sub_entries = {
+              "trees"=>tmp_entries,
+              "commits" => [{}]
+            }
+          end
+        rescue 
+          return render_error('该文件暂未开放，敬请期待.')
+        end
+      end
+    else
+      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
+      interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: @ref)
+      if interactor.success?
+        result = interactor.result
+        @sub_entries = result.is_a?(Array) ? result.sort_by{ |hash| hash['type'] } : result
+      else
+        render_error(interactor.error)
+      end
+    end
+  end
+
+  def commits
+    if @project.educoder?
+      @commits = Educoder::Repository::Commits::ListService.call(@project&.project_educoder&.repo_name)
+    else
+      if params[:filepath].present?
+        file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+        @hash_commit = Gitea::Repository::Commits::FileListService.new(@owner.login, @project.identifier, file_path_uri,
+                                                                       sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
+      else
+        @hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier,
+                                                                   sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
+      end
+    end
+  end
+
+  def commits_slice 
+    @hash_commit = Gitea::Repository::Commits::ListSliceService.call(@owner.login, @project.identifier,
+      sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token)
+  end 
+
+  def commit
+    @sha         = params[:sha]
+    if @project.educoder?
+      return render_error('暂未开放，敬请期待.')
+    else
+      @commit      = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
+      @commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token, {diff: true})
+    end
+  end
+
+  def tags
+    result = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]})
+
+    @tags = result.is_a?(Hash) && result.key?(:status) ? [] : result
+  end
+
+  def contributors
+    if params[:filepath].present? || @project.educoder?
+      @contributors = []
+    else
+      result = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
+      @contributors = result.is_a?(Hash) && result.key?(:status) ? [] : result
+    end
+  rescue
+    @contributors = []
+  end
+
+  def edit
+    return render_forbidden if !@project.manager?(current_user) && !current_user.admin?
+  end
+
+  def create_file
+    interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params)
+    if interactor.success?
+      @file = interactor.result
+      # create_new_pr(params)
+      #如果是更新流水线文件
+      if params[:pipeline_id]
+        update_pipeline(params[:pipeline_id])
+      end
+    else
+      render_error(interactor.error)
+    end
+  end
+
+  def update_pipeline(pipeline_id)
+    pipeline = Ci::Pipeline.find(pipeline_id)
+    if pipeline
+      pipeline.update!(sync: 1)
+    end
+  end
+
+  def update_file
+    interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
+    if interactor.success?
+      @file = interactor.result
+      # TODO: 是否创建pr
+      # create_new_pr(params)
+      render_result(1, "更新成功")
+    else
+      render_error(interactor.error)
+    end
+  end
+
+  def delete_file
+    interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
+    if interactor.success?
+      @file = interactor.result
+      render_result(1, "文件删除成功")
+    else
+      render_error(interactor.error)
+    end
+  end
+
+  def repo_hook
+
+  end
+
+  def sync_mirror
+    return render_error("正在镜像中..") if  @repository.mirror.waiting?
+
+    @repository.sync_mirror!
+    SyncMirroredRepositoryJob.perform_later(@repository.id, current_user.id)
+    render_ok
+  end
+
+  def readme
+    if params[:filepath].present?
+      result = Gitea::Repository::Readme::DirService.call(@owner.login, @repository.identifier, params[:filepath], params[:ref], current_user&.gitea_token)
+    else
+      result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
+    end
+    @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")
+  rescue 
+    render json: nil
+  end
+
+  def languages
+    if @project.educoder? 
+      render json: {}
+    else
+      render json: languages_precentagable
+    end
+  end
+
+  def archive
+    domain  = Gitea.gitea_config[:domain]
+    api_url = Gitea.gitea_config[:base_url]
+    archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{Addressable::URI.escape(params[:archive])}"
+
+    file_path = [domain, api_url, archive_url].join
+    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("?") if @repository.hidden?
+
+    return render_not_found if !request.format.zip? && !request.format.gzip?
+
+    redirect_to file_path
+  end
+  
+  def raw 
+    domain  = Gitea.gitea_config[:domain]
+    api_url = Gitea.gitea_config[:base_url]
+
+    url = "/repos/#{@owner.login}/#{@repository.identifier}/raw/#{Addressable::URI.escape(params[:filepath])}?ref=#{Addressable::URI.escape(params[:ref])}"
+    file_path = [domain, api_url, url].join
+    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("&") 
+
+    redirect_to file_path
+  end
+
+  private
+
+  def find_project
+    @project = Project.find params[:id]
+    render_not_found("未找到相关的仓库") unless @project
+  end
+
+  def find_project_with_includes
+    @project = Project.includes(:repository, :owner, :watchers, :praise_treads).find params[:id]
+  end
+
+  def authorizate!
+    return if current_user && current_user.admin?
+    if @project.repository.hidden? && !@project.member?(current_user)
+      render_forbidden
+    end
+  end
+
+  # TODO 获取最新commit信息
+  def project_commits
+    if params[:filepath].present?
+      file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+      Gitea::Repository::Commits::FileListService.new(@project.owner.login, @project.identifier, file_path_uri,
+        sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
+    else
+      Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier,
+        sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
+    end
+  end
+
+  def get_statistics
+    @branches_count = @project.educoder? ? 0 : Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call&.size
+    @tags_count = @project.educoder? ? 0 : Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size
+  end
+
+  def get_ref
+    @ref = params[:ref] || @project&.default_branch
+  end
+
+  def get_latest_commit
+    latest_commit = @project.educoder? ? nil : project_commits
+    @latest_commit = latest_commit.present? ? latest_commit[:body][0] : nil
+    @commits_count = latest_commit.present? ? latest_commit[:total_count] : 0
+  end
+
+  def content_params
+    {
+      filepath: params[:filepath],
+      branch: params[:branch],
+      new_branch: params[:new_branch],
+      content: params[:content],
+      message: params[:message],
+      committer: {
+        email: current_user.mail,
+        name: current_user.login
+      },
+      identifier: @project.identifier
+    }
+  end
+
+  def hook_params(hook_type, params)
+    # if hook_type == "push"
+    #   # TODO hook返回的记录中，暂时没有文件代码数量的增减，暂时根据 commits数量来计算
+    #   uploadPushInfo = {
+    #     "sha": params["commits"].present? ? params["commits"].last : "",
+    #     "branch": params["ref"].to_s.split("/").last,
+    #     "modification_lines": params["commits"].length
+    #     }
+    # elsif hook_type == "pull_request" && params["action"].to_s == "closed"  #合并请求合并后才会有上链操作
+    #   uploadPushInfo = {
+    #     "branch": params["base"]["ref"].to_s.split("/").last,
+    #     "sha": params["pull_request"]["merge_base"],
+    #     "modification_lines": 1  #pull_request中没有commits数量
+    #     }
+    # else
+    #     uploadPushInfo = {}
+    # end
+
+    # uploadPushInfo
+  end
+  
+  def create_new_pr(params)
+    if params[:new_branch].present? && params[:new_branch] != params[:branch]
+      local_params = {
+        title: params[:message],  #标题
+        body:	params[:content],  #内容
+        head: params[:new_branch],  #源分支
+        base: params[:branch],  #目标分支
+        milestone: 0  #里程碑,未与本地的里程碑关联
+
+      }
+      requests_params = local_params.merge({
+                                             assignee: current_user.try(:login),
+                                             assignees: [],
+                                             labels: [],
+                                             due_date: Time.now
+                                           })
+
+      issue_params = {
+        author_id: current_user.id,
+        project_id: @project.id,
+        subject: params[:message],
+        description: params[:content],
+        assigned_to_id: nil,
+        fixed_version_id: nil,
+        issue_tags_value: nil,
+        issue_classify: "pull_request",
+        issue_type: "1",
+        tracker_id: 2,
+        status_id: 1,
+        priority_id: params[:priority_id] || "2"
+      }
+      @pull_issue = Issue.new(issue_params)
+      if @pull_issue.save!
+        local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: @pull_issue.id))
+        if local_requests.save
+          gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @owner.login, @project.try(:identifier), requests_params).call
+          if gitea_request[:status] == :success && local_requests.update_attributes(gpid: gitea_request["body"]["number"])
+            local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
+          end
+        end
+      end
+    end
+  end
+
+end

app/controllers/settings_controller.rb

@@ -1,6 +1,7 @@
 class SettingsController < ApplicationController
   def show
     @old_projects_url = nil
+    get_navbar
     get_add_menu
     get_common_menu
     get_personal_menu
@@ -9,6 +10,14 @@ class SettingsController < ApplicationController
   end
 
   private
+    def get_navbar 
+      @navbar = default_laboratory.navbar
+      if User.current.logged?
+        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("link", "/current_user"), "hidden"=>false}
+        @navbar << pernal_index
+      end
+    end
+    
     def get_add_menu
       @add = []
       Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|

app/controllers/users/statistics_controller.rb

@@ -12,7 +12,7 @@ class Users::StatisticsController < Users::BaseController
     @commit_data = []
     date_range.each do |date|
       @date_data << date.strftime("%Y.%m.%d")
-      @issue_data << observed_user.issues.where("DATE(created_on) = ?", date).size
+      @issue_data << observed_user.issues.issue_issue.where("DATE(created_on) = ?", date).size
       @pull_request_data << observed_user.pull_requests.where("DATE(created_at) = ?", date).size
       date_commit_data = commit_data.blank? ? nil : commit_data.select{|item| item["timestamp"] == date.to_time.to_i}
       @commit_data << (date_commit_data.blank? ? 0 : date_commit_data[0]["contributions"].to_i)

app/controllers/users/template_message_settings_controller.rb

@@ -23,6 +23,8 @@ class Users::TemplateMessageSettingsController < Users::BaseController
   def get_current_setting
     @current_setting = @_observed_user.user_template_message_setting
     @current_setting = UserTemplateMessageSetting.build(@_observed_user.id) if @current_setting.nil?
+    @current_setting.notification_body.merge!(UserTemplateMessageSetting.init_notification_body.except(*@current_setting.notification_body.keys))
+    @current_setting.email_body.merge!(UserTemplateMessageSetting.init_email_body.except(*@current_setting.email_body.keys))
   end
 
   def setting_params 

app/controllers/users_controller.rb

@@ -1,324 +1,324 @@
-class UsersController < ApplicationController
-  include ApplicationHelper
-  include Ci::DbConnectable
-
-  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard]
-  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard]
-  before_action :require_login, only: %i[me list sync_user_info]
-  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]
-
-  def connect_to_ci_db(options={})
-    if !(current_user && !current_user.is_a?(AnonymousUser) && current_user.devops_certification?)
-      return
-    end
-    if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-      connect_to_trustie_ci_database(options)
-    else
-      connect_to_ci_database(options)
-    end
-  end
-
-  def list
-    scope = User.active.recent.like(params[:search]).includes(:user_extension)
-    @total_count = scope.size
-    @users = paginate(scope)
-  end
-
-  def show
-      #待办事项，现在未做
-      if User.current.admin? || User.current.login == @user.login 
-        @waiting_applied_messages = @user.applied_messages.waiting
-        @common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common
-        @common_applied_projects = AppliedProject.where(project_id: @user.full_admin_projects).common
-        #@undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
-        @undo_events = @common_applied_transfer_projects.size + @common_applied_projects.size
-      else 
-        @waiting_applied_messages = AppliedMessage.none
-        @common_applied_transfer_projects = AppliedTransferProject.none
-        @common_applied_projects = AppliedProject.none
-        @undo_events = 0
-      end
-      #用户的组织数量
-      # @user_composes_count =  @user.composes.size
-      @user_composes_count = 0
-      user_organizations =  User.current.logged? ? @user.organizations.with_visibility(%w(common limited)) + @user.organizations.with_visibility("privacy").joins(:team_users).where(team_users: {user_id: current_user.id}) : @user.organizations.with_visibility("common")
-      @user_org_count = user_organizations.size
-      normal_projects = Project.members_projects(@user.id).to_sql
-      org_projects = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: @user.id}).to_sql
-      projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
-      user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? projects : projects.visible
-      @projects_common_count = user_projects.common.size
-      @projects_mirrior_count = user_projects.mirror.size
-      @projects_sync_mirrior_count = user_projects.sync_mirror.size
-      # 为了缓存活跃用户的基本信息，后续删除
-      Cache::V2::OwnerCommonService.new(@user.id).read
-  end
-
-  def watch_users
-    watchers = Watcher.watching_users(@user.id).includes(:user).order("watchers.created_at desc")
-    if params[:search].present?
-      search_user_ids = User.where(id: watchers.pluck(:watchable_id)).like(params[:search]).pluck(:id)
-      watchers = watchers.where(watchable_id: search_user_ids)
-    end
-    @watchers_count = watchers.size
-    @watchers = paginate(watchers)
-  end
-
-  def fan_users
-    watchers = @user.watchers.includes(:user).order("watchers.created_at desc")
-    watchers = watchers.joins(:user).merge(User.like(params[:search]))
-    @watchers_count = watchers.size
-    @watchers = paginate(watchers)
-  end
-
-  def hovercard
-  end
-
-  def update
-    return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) 
-    return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
-    Util.write_file(@image, avatar_path(@user)) if user_params[:image].present?
-    @user.attributes = user_params.except(:image)
-    unless @user.save
-      render_error(-1, @user.errors.full_messages.join(", "))
-    end
-  end
-
-  def update_image 
-    return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) 
-    return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
-
-    Util.write_file(@image, avatar_path(@user)) 
-    return render_ok({message: '头像修改成功'})
-  rescue Exception => e
-    uid_logger_error(e.message)
-    render_error(-1, '头像修改失败！')
-  end
-
-  def me
-    @user = current_user
-  end
-
-  # 贴吧获取用户信接口
-  def get_user_info
-    begin
-      @user = current_user
-      begin
-        result = Notice::Read::CountService.call(current_user.id)
-        @message_unread_total = result.nil? ? 0 : result[2]["unread_notification"]
-      rescue 
-        @message_unread_total = 0
-      end
-      # TODO 等消息上线再打开注释
-      #@tidding_count = unviewed_tiddings(current_user) if current_user.present?
-    rescue Exception => e
-      uid_logger_error(e.message)
-      missing_template
-    end
-
-  end
-
-  def attachment_show
-    file_name = params[:file_name]
-    path = params[:path] || file_storage_directory
-    send_file "#{path}/#{file_name}", :filename => "#{file_name}",
-              :type => 'game',
-              :disposition => 'attachment' #inline can open in browser
-  end
-
-  def html_show
-    @contents = File.read("#{params[:path]}")
-    respond_to do |format|
-      format.html {render :layout => false}
-    end
-  end
-
-  # Redo: 消息总数缓存
-  def get_navigation_info
-    # @old_domain = edu_setting('old_edu_host')
-    # @user = current_user
-    # # 新消息数
-    # @new_message = @user.tidings.where("created_at > '#{@user.click_time}'").count > 0 || @user.private_messages.where("created_at > '#{@user.click_time}'").count > 0
-    #
-    # @user_url = "/users/#{@user.login}"
-    # @career = Career.where(status: true).order("created_at asc").pluck(:id, :name)
-    # @auth =  User.current.ec_school.present? ? "#{@old_domain}/ecs/department?school_id=#{User.current.ec_school}" : nil
-  end
-
-  # 用户回复功能
-  def reply_message
-    message = JournalsForMessage.new(reply_message_params)
-    message.user_id = current_user.id
-    message.save!
-
-    render_ok(id: message.id)
-  end
-
-  # 搜索用户具有管理员角色的项目
-  def search_user_projects
-    projects = Project.where.not(status: 9)
-
-    projects = projects.joins(members: :member_roles).where(member_roles: { role_id: 3 })
-    projects = projects.where(members: { user_id: current_user.id })
-
-    search = params[:search].to_s.strip
-    projects = projects.where('projects.name LIKE ?', "%#{search}%") if search.present?
-
-    @projects = projects.select(:id, :name)
-  end
-
-  #TODO 个人主页信息，forge上弃用-hs, 0602
-  def homepage_info
-    #待办事项，现在未做
-    @undo_events = 10
-    #用户的组织数量
-    # @user_composes_count =  @user.composes.size
-    @user_composes_count = 10
-  end
-
-  def brief_introduction
-    content = params[:content].to_s.strip
-
-    current_user.user_extension.update!(brief_introduction: content)
-
-    render_ok
-  end
-
-  def attendance
-    attendance = Users::AttendanceService.call(current_user)
-    render_ok(grade: current_user.grade, next_gold: attendance.next_gold)
-  rescue Users::AttendanceService::Error => ex
-    render_error(ex.message)
-  end
-
-  # 其他平台登录后，必须将token同步到forge平台，实现sso登录功能
-  def sync_token
-    return render_error('未找相关用户!')  unless @user
-
-    token = Token.get_or_create_permanent_login_token(@user, 'autologin')
-    token.update_column(:value, params[:token])
-    render_ok
-  end
-
-  def trustie_related_projects
-    projects = Project.includes(:owner, :members, :project_score).where(id: params[:ids]).order("updated_on desc")
-    projects_json = []
-    domain_url = EduSetting.get('host_name')
-    if projects.present?
-      projects.each do |p|
-        project_url = "/#{p.owner.login}/#{p.identifier}"
-        pj = {
-          id: p.id,
-          name: p.name,
-          is_public: p.is_public,
-          updated_on: p.updated_on.strftime("%Y-%m-%d"),
-          status: p.status,
-          is_member: p.member?(current_user.try(:id)),
-          owner: {
-            name: p.owner.try(:show_real_name),
-            login: p.owner.login
-          },
-          members_count: p&.members.size,
-          issues_count: p.issues_count - p.pull_requests_count,
-          commits_count: p&.project_score&.changeset_num.to_i,
-          http_url: domain_url + project_url,
-          http_collaborator_url: domain_url + project_url + "/setting/collaborator",
-          http_issues_url: domain_url + project_url + "/issues",
-          http_commits_url: domain_url + project_url + "/commits",
-          project_score: p&.project_score.present? ? p&.project_score&.as_json(:except=>[:created_at, :updated_at]).merge!(commit_time: format_time(p&.project_score&.commit_time)) : {}
-        }
-        projects_json.push(pj)
-      end
-    end
-    Rails.logger.info("==========projects_json========+########{projects_json}")
-    render json: { projects: projects_json.present? ? projects_json : {} }
-  end
-
-  def trustie_projects
-    user_id = User.select(:id, :login).where(login: params[:login])&.first&.id
-    projects = Project.visible
-
-    projects = projects.joins(:members).where(members: { user_id: user_id })
-
-    search = params[:search].to_s.strip
-    projects = projects.where('projects.name LIKE ?', "%#{search}%") if search.present?
-
-    projects = projects.select(:id, :name).limit(10).as_json
-    render json: { projects: projects }
-  end
-
-  def projects
-    is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
-    scope = Projects::ListMyQuery.call(params, @user,is_current_admin_user)
-    @total_count = scope.size
-    @projects = paginate(scope)
-  end
-
-  # TODO 其他平台登录时同步修改gitea平台对应用户的密码
-  # 该方法主要用于：别的平台初次部署对接forge平台，同步用户后，gitea平台对应的用户密码与forge平台用户密码不一致是问题
-  def sync_gitea_pwd
-    return render_error("未找到相关的用户") if @user.blank?
-
-    flag = sync_pwd_to_gitea!(@user, {password: params[:password].to_s})
-    flag ? render_ok : render_error('同步失败!')
-  end
-
-  # TODO
-  # 同步trusite平台用户的salt信息，只需同步一次，同步完成后，该方法可以删除
-  def sync_salt
-    user = User.find_by_login params[:login]
-    return if user.blank?
-    user.update_column(:salt, params[:salt])
-    render_ok
-  end
-
-  def sync_user_info
-    user = User.find_by_login params[:login]
-    return render_forbidden unless user === current_user
-
-    sync_params = {
-      email: params[:email],
-      password: params[:password]
-    }
-
-    Users::UpdateInfoForm.new(sync_params.merge(login: params[:login])).validate!
-
-    interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
-    if interactor.success?
-      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_ACTIVE)
-      render_ok
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  private
-  def load_user
-    @user = User.find_by_login(params[:id]) || User.find_by(id: params[:id])
-  end
-
-  def user_params
-    params.require(:user).permit(:nickname, :image,
-                                  user_extension_attributes: [
-                                  :gender, :location, :location_city,
-                                  :occupation, :technical_title,
-                                  :school_id, :department_id, :province, :city,
-                                  :custom_department, :identity, :student_id, :description,
-                                  :show_email, :show_location, :show_department]
-                                )
-  end
-
-  def reply_message_params
-    normal_status(-1, "参数不对") if params[:journals_for_message][:jour_type].nil? || params[:journals_for_message][:jour_id].nil? ||
-        params[:journals_for_message][:notes].nil? || params[:journals_for_message][:reply_id].nil?
-    params.require(:journals_for_message).permit(:jour_type, :jour_id, :notes, :m_parent_id, :reply_id)
-  end
-
-  def check_user_exist
-    return if @user.present?
-    render_not_found
-  end
-
-end
+class UsersController < ApplicationController
+  include ApplicationHelper
+  include Ci::DbConnectable
+
+  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard]
+  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard]
+  before_action :require_login, only: %i[me sync_user_info]
+  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]
+
+  def connect_to_ci_db(options={})
+    if !(current_user && !current_user.is_a?(AnonymousUser) && current_user.devops_certification?)
+      return
+    end
+    if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
+      connect_to_trustie_ci_database(options)
+    else
+      connect_to_ci_database(options)
+    end
+  end
+
+  def list
+    scope = User.active.recent.like(params[:search]).includes(:user_extension)
+    @total_count = scope.size
+    @users = paginate(scope)
+  end
+
+  def show
+      #待办事项，现在未做
+      if User.current.admin? || User.current.login == @user.login 
+        @waiting_applied_messages = @user.applied_messages.waiting
+        @common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common
+        @common_applied_projects = AppliedProject.where(project_id: @user.full_admin_projects).common
+        #@undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
+        @undo_events = @common_applied_transfer_projects.size + @common_applied_projects.size
+      else 
+        @waiting_applied_messages = AppliedMessage.none
+        @common_applied_transfer_projects = AppliedTransferProject.none
+        @common_applied_projects = AppliedProject.none
+        @undo_events = 0
+      end
+      #用户的组织数量
+      # @user_composes_count =  @user.composes.size
+      @user_composes_count = 0
+      user_organizations =  User.current.logged? ? @user.organizations.with_visibility(%w(common limited)) + @user.organizations.with_visibility("privacy").joins(:team_users).where(team_users: {user_id: current_user.id}) : @user.organizations.with_visibility("common")
+      @user_org_count = user_organizations.size
+      normal_projects = Project.members_projects(@user.id).to_sql
+      org_projects = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: @user.id}).to_sql
+      projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
+      user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? projects : projects.visible
+      @projects_common_count = user_projects.common.size
+      @projects_mirrior_count = user_projects.mirror.size
+      @projects_sync_mirrior_count = user_projects.sync_mirror.size
+      # 为了缓存活跃用户的基本信息，后续删除
+      Cache::V2::OwnerCommonService.new(@user.id).read
+  end
+
+  def watch_users
+    watchers = Watcher.watching_users(@user.id).includes(:user).order("watchers.created_at desc")
+    if params[:search].present?
+      search_user_ids = User.where(id: watchers.pluck(:watchable_id)).like(params[:search]).pluck(:id)
+      watchers = watchers.where(watchable_id: search_user_ids)
+    end
+    @watchers_count = watchers.size
+    @watchers = paginate(watchers)
+  end
+
+  def fan_users
+    watchers = @user.watchers.includes(:user).order("watchers.created_at desc")
+    watchers = watchers.joins(:user).merge(User.like(params[:search]))
+    @watchers_count = watchers.size
+    @watchers = paginate(watchers)
+  end
+
+  def hovercard
+  end
+
+  def update
+    return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) 
+    return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
+    Util.write_file(@image, avatar_path(@user)) if user_params[:image].present?
+    @user.attributes = user_params.except(:image)
+    unless @user.save
+      render_error(-1, @user.errors.full_messages.join(", "))
+    end
+  end
+
+  def update_image 
+    return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) 
+    return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
+
+    Util.write_file(@image, avatar_path(@user)) 
+    return render_ok({message: '头像修改成功'})
+  rescue Exception => e
+    uid_logger_error(e.message)
+    render_error(-1, '头像修改失败！')
+  end
+
+  def me
+    @user = current_user
+  end
+
+  # 贴吧获取用户信接口
+  def get_user_info
+    begin
+      @user = current_user
+      begin
+        result = Notice::Read::CountService.call(current_user.id)
+        @message_unread_total = result.nil? ? 0 : result[2]["unread_notification"]
+      rescue 
+        @message_unread_total = 0
+      end
+      # TODO 等消息上线再打开注释
+      #@tidding_count = unviewed_tiddings(current_user) if current_user.present?
+    rescue Exception => e
+      uid_logger_error(e.message)
+      missing_template
+    end
+
+  end
+
+  def attachment_show
+    file_name = params[:file_name]
+    path = params[:path] || file_storage_directory
+    send_file "#{path}/#{file_name}", :filename => "#{file_name}",
+              :type => 'game',
+              :disposition => 'attachment' #inline can open in browser
+  end
+
+  def html_show
+    @contents = File.read("#{params[:path]}")
+    respond_to do |format|
+      format.html {render :layout => false}
+    end
+  end
+
+  # Redo: 消息总数缓存
+  def get_navigation_info
+    # @old_domain = edu_setting('old_edu_host')
+    # @user = current_user
+    # # 新消息数
+    # @new_message = @user.tidings.where("created_at > '#{@user.click_time}'").count > 0 || @user.private_messages.where("created_at > '#{@user.click_time}'").count > 0
+    #
+    # @user_url = "/users/#{@user.login}"
+    # @career = Career.where(status: true).order("created_at asc").pluck(:id, :name)
+    # @auth =  User.current.ec_school.present? ? "#{@old_domain}/ecs/department?school_id=#{User.current.ec_school}" : nil
+  end
+
+  # 用户回复功能
+  def reply_message
+    message = JournalsForMessage.new(reply_message_params)
+    message.user_id = current_user.id
+    message.save!
+
+    render_ok(id: message.id)
+  end
+
+  # 搜索用户具有管理员角色的项目
+  def search_user_projects
+    projects = Project.where.not(status: 9)
+
+    projects = projects.joins(members: :member_roles).where(member_roles: { role_id: 3 })
+    projects = projects.where(members: { user_id: current_user.id })
+
+    search = params[:search].to_s.strip
+    projects = projects.where('projects.name LIKE ?', "%#{search}%") if search.present?
+
+    @projects = projects.select(:id, :name)
+  end
+
+  #TODO 个人主页信息，forge上弃用-hs, 0602
+  def homepage_info
+    #待办事项，现在未做
+    @undo_events = 10
+    #用户的组织数量
+    # @user_composes_count =  @user.composes.size
+    @user_composes_count = 10
+  end
+
+  def brief_introduction
+    content = params[:content].to_s.strip
+
+    current_user.user_extension.update!(brief_introduction: content)
+
+    render_ok
+  end
+
+  def attendance
+    attendance = Users::AttendanceService.call(current_user)
+    render_ok(grade: current_user.grade, next_gold: attendance.next_gold)
+  rescue Users::AttendanceService::Error => ex
+    render_error(ex.message)
+  end
+
+  # 其他平台登录后，必须将token同步到forge平台，实现sso登录功能
+  def sync_token
+    return render_error('未找相关用户!')  unless @user
+
+    token = Token.get_or_create_permanent_login_token(@user, 'autologin')
+    token.update_column(:value, params[:token])
+    render_ok
+  end
+
+  def trustie_related_projects
+    projects = Project.includes(:owner, :members, :project_score).where(id: params[:ids]).order("updated_on desc")
+    projects_json = []
+    domain_url = EduSetting.get('host_name')
+    if projects.present?
+      projects.each do |p|
+        project_url = "/#{p.owner.login}/#{p.identifier}"
+        pj = {
+          id: p.id,
+          name: p.name,
+          is_public: p.is_public,
+          updated_on: p.updated_on.strftime("%Y-%m-%d"),
+          status: p.status,
+          is_member: p.member?(current_user.try(:id)),
+          owner: {
+            name: p.owner.try(:show_real_name),
+            login: p.owner.login
+          },
+          members_count: p&.members.size,
+          issues_count: p.issues_count - p.pull_requests_count,
+          commits_count: p&.project_score&.changeset_num.to_i,
+          http_url: domain_url + project_url,
+          http_collaborator_url: domain_url + project_url + "/setting/collaborator",
+          http_issues_url: domain_url + project_url + "/issues",
+          http_commits_url: domain_url + project_url + "/commits",
+          project_score: p&.project_score.present? ? p&.project_score&.as_json(:except=>[:created_at, :updated_at]).merge!(commit_time: format_time(p&.project_score&.commit_time)) : {}
+        }
+        projects_json.push(pj)
+      end
+    end
+    Rails.logger.info("==========projects_json========+########{projects_json}")
+    render json: { projects: projects_json.present? ? projects_json : {} }
+  end
+
+  def trustie_projects
+    user_id = User.select(:id, :login).where(login: params[:login])&.first&.id
+    projects = Project.visible
+
+    projects = projects.joins(:members).where(members: { user_id: user_id })
+
+    search = params[:search].to_s.strip
+    projects = projects.where('projects.name LIKE ?', "%#{search}%") if search.present?
+
+    projects = projects.select(:id, :name).limit(10).as_json
+    render json: { projects: projects }
+  end
+
+  def projects
+    is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
+    scope = Projects::ListMyQuery.call(params, @user,is_current_admin_user)
+    @total_count = scope.size
+    @projects = paginate(scope)
+  end
+
+  # TODO 其他平台登录时同步修改gitea平台对应用户的密码
+  # 该方法主要用于：别的平台初次部署对接forge平台，同步用户后，gitea平台对应的用户密码与forge平台用户密码不一致是问题
+  def sync_gitea_pwd
+    return render_error("未找到相关的用户") if @user.blank?
+
+    flag = sync_pwd_to_gitea!(@user, {password: params[:password].to_s})
+    flag ? render_ok : render_error('同步失败!')
+  end
+
+  # TODO
+  # 同步trusite平台用户的salt信息，只需同步一次，同步完成后，该方法可以删除
+  def sync_salt
+    user = User.find_by_login params[:login]
+    return if user.blank?
+    user.update_column(:salt, params[:salt])
+    render_ok
+  end
+
+  def sync_user_info
+    user = User.find_by_login params[:login]
+    return render_forbidden unless user === current_user
+
+    sync_params = {
+      email: params[:email],
+      password: params[:password]
+    }
+
+    Users::UpdateInfoForm.new(sync_params.merge(login: params[:login])).validate!
+
+    interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
+    if interactor.success?
+      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_ACTIVE)
+      render_ok
+    else
+      render_error(interactor.error)
+    end
+  end
+
+  private
+  def load_user
+    @user = User.find_by_login(params[:id]) || User.find_by(id: params[:id])
+  end
+
+  def user_params
+    params.require(:user).permit(:nickname, :image,
+                                  user_extension_attributes: [
+                                  :gender, :location, :location_city,
+                                  :occupation, :technical_title,
+                                  :school_id, :department_id, :province, :city,
+                                  :custom_department, :identity, :student_id, :description,
+                                  :show_email, :show_location, :show_department]
+                                )
+  end
+
+  def reply_message_params
+    normal_status(-1, "参数不对") if params[:journals_for_message][:jour_type].nil? || params[:journals_for_message][:jour_id].nil? ||
+        params[:journals_for_message][:notes].nil? || params[:journals_for_message][:reply_id].nil?
+    params.require(:journals_for_message).permit(:jour_type, :jour_id, :notes, :m_parent_id, :reply_id)
+  end
+
+  def check_user_exist
+    return if @user.present?
+    render_not_found
+  end
+
+end

app/docs/slate/source/includes/_users.md

@@ -91,10 +91,9 @@ await octokit.request('GET /api/users/:login/messages.json')
 类型|说明
 --------- | -----------
 |IssueAssigned              | 有新指派给我的疑修  | 
-|IssueAssignerExpire        | 我负责的疑修截止日期到达最后一天  | 
+|IssueExpire                | 我创建或负责的疑修截止日期到达最后一天  | 
 |IssueAtme                  | 在疑修中@我  | 
 |IssueChanged               | 我创建或负责的疑修状态变更  | 
-|IssueCreatorExpire         | 我创建的疑修截止日期到达最后一天  | 
 |IssueDeleted               | 我创建或负责的疑修删除  | 
 |IssueJournal               | 我创建或负责的疑修有新的评论  | 
 |LoginIpTip                 | 登录异常提示  | 
@@ -109,6 +108,7 @@ await octokit.request('GET /api/users/:login/messages.json')
 |ProjectLeft                | 账号被移出项目  | 
 |ProjectMemberJoined        | 我管理的仓库有成员加入  | 
 |ProjectMemberLeft          | 我管理的仓库有成员移出  | 
+|ProjectMilestoneCompleted  | 我管理的仓库有里程碑完成度100%  | 
 |ProjectMilestone           | 我管理的仓库有新的里程碑  | 
 |ProjectPraised             | 我管理的仓库被点赞  | 
 |ProjectPullRequest         | 我管理/关注的仓库有新的合并请求  |

app/forms/base_form.rb

@@ -49,7 +49,7 @@ class BaseForm
 
   def check_verifi_code(verifi_code, code)
     code = strip(code)
-    # return if code == "123123" # TODO 万能验证码，用于测试
+    return if code == "123123" && EduSetting.get("code_debug") # 万能验证码，用于测试 # TODO 万能验证码，用于测试
     raise VerifiCodeError, "验证码已失效" if !verifi_code&.effective?
     raise VerifiCodeError, "验证码不正确" if verifi_code&.code != code
   end

app/forms/projects/update_form.rb

@@ -1,5 +1,5 @@
 class Projects::UpdateForm < BaseForm
-  attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id, :project_identifier
+  attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id, :project_identifier, :project_name
   validates :name, presence: true
   validates :name, length: { maximum: 50 }
   validates :description, length: { maximum: 200 }
@@ -10,6 +10,7 @@ class Projects::UpdateForm < BaseForm
     check_project_language(project_language_id)
 
     check_repository_name(user_id, identifier) unless identifier.blank? || identifier == project_identifier
+    check_project_name(user_id, name) unless name.blank? || name == project_name
   end
 
 end

app/forms/register/form.rb

@@ -9,11 +9,9 @@ module Register
     validate :check!
     
     def check!
-      Rails.logger.info "Register::Form params: code: #{code}; login: #{login}; 
-        namespace: #{namespace}; password: #{password}; password_confirmation: #{password_confirmation}"
-      
+      Rails.logger.info "Register::Form params: code: #{code}; login: #{login}; namespace: #{namespace}; password: #{password}; type: #{type}"
       type = phone_mail_type(strip(login))
-      db_verifi_code = 
+      db_verifi_code =
         if type == 1
           check_phone(login)
           VerificationCode.where(phone: login, code: code, code_type: 1).last

app/helpers/repositories_helper.rb

@@ -1,148 +1,170 @@
-module RepositoriesHelper
-  def render_permission(user, project)
-    return "Admin" if user&.admin?
-    project.get_premission(user)
-  end
-
-  def render_decode64_content(str)
-    return nil if str.blank?
-    Base64.decode64(str).force_encoding("UTF-8").encode("UTF-8", invalid: :replace)
-  end
-
-  def download_type(str)
-    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv)
-    default_type.include?(str&.downcase)
-  end
-
-  def image_type?(str)
-    default_type = %w(png jpg gif tif psd svg bmp webp jpeg ico psd)
-    default_type.include?(str&.downcase)
-  end
-
-  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)
-  end
-
-  def render_commit_author(author_json)
-    return nil if author_json.blank? || (author_json["id"].blank? && author_json['name'].blank?)
-    if author_json["id"].present?
-      return find_user_by_gitea_uid author_json['id']
-    end
-    if author_json["id"].nil? && (author_json["name"].present? && author_json["email"].present?)
-      return find_user_by_login_and_mail(author_json['name'], author_json["email"])
-    end
-  end
-
-  def render_cache_commit_author(author_json)
-    Rails.logger.info author_json['Email'] 
-    if author_json["name"].present? && author_json["email"].present?
-      return find_user_in_redis_cache(author_json['name'], author_json['email']) 
-    end
-    if author_json["Name"].present? && author_json["Email"].present?
-      return find_user_in_redis_cache(author_json['Name'], author_json['Email']) 
-    end
-  end
-
-  def readme_render_decode64_content(str, owner, repo, ref)
-    return nil if str.blank?
-    begin
-      content = Base64.decode64(str).force_encoding('UTF-8')
-
-      c_regex = /\!\[.*?\]\((.*?)\)/
-      src_regex = /src=\"(.*?)\"/
-      ss = content.to_s.scan(c_regex)
-      ss_src = content.to_s.scan(src_regex)
-      total_images = ss + ss_src
-      if total_images.length > 0
-        total_images.each do |s|
-          image_title = /\"(.*?)\"/
-          r_content = s[0]
-          remove_title = r_content.to_s.scan(image_title)
-          if remove_title.length > 0
-            r_content = r_content.gsub(/#{remove_title[0]}/, "").strip
-          end
-          # if r_content.include?("?")
-          #   new_r_content = r_content + "&raw=true"
-          # else
-          #   new_r_content = r_content + "?raw=true"
-          # end
-          new_r_content = r_content
-
-          unless r_content.include?("http://") || r_content.include?("https://") || r_content.include?("mailto:")
-            # new_r_content = "#{path}" + new_r_content
-            new_r_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{r_content}&ref=#{ref}"].join
-          end
-          content = content.gsub(/#{r_content}/, new_r_content)
-        end
-      end
-  
-      return content
-    rescue
-      return str
-    end
-  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")
-  end
-
-  # date for example: 2020-11-01T19:57:27+08:00
-  def render_format_time_with_date(date)
-    date.to_time.strftime("%Y-%m-%d %H:%M")
-  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']
-      readme_render_decode64_content(content, owner, repo, ref)
-    else
-      file_type = File.extname(entry['name'].to_s)[1..-1]
-      if image_type?(file_type)
-        return entry['content'].nil? ? Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content'] : entry['content']  
-      end
-      if download_type(file_type)
-        return entry['content']
-      end
-      render_decode64_content(entry['content'])
-    end
-  end
-
-  def base64_to_image(path, content)
-    # generate to https://git.trusite.net/pawm36ozq/-/raw/branch/master/entrn.png"
-    content      = Base64.decode64(content)
-    File.open(path, 'wb') { |f| f.write(content) }
-  end
-  
-  def render_download_image_url(dir_path, file_path, content)
-    full_path = file_path.starts_with?("/") ? [dir_path, file_path].join("") : [dir_path, file_path].join("/")
-    file_name = full_path.split("/")[-1]
-    # 用户名/项目标识/文件路径
-    dir_path = generate_dir_path(full_path.split("/"+file_name)[0])
-
-    file_path = [dir_path, file_name].join('/')
-
-    puts "##### render_download_image_url file_path: #{file_path}"
-    base64_to_image(file_path, content)
-    file_path = file_path[6..-1]
-    File.join(base_url, file_path)
-  end
-  
-  def generate_dir_path(dir_path)
-    # tmp_dir_path
-    # eg: jasder/forgeplus/raw/branch/ref
-    dir_path = ["public", tmp_dir, dir_path].join('/')
-    puts "#### dir_path: #{dir_path}"
-    unless Dir.exists?(dir_path)
-      FileUtils.mkdir_p(dir_path) ##不成功这里会抛异常
-    end
-    dir_path
-  end
-
-  def tmp_dir
-    "repo"
-  end
-  
-end
+module RepositoriesHelper
+  def render_permission(user, project)
+    return "Admin" if user&.admin?
+    project.get_premission(user)
+  end
+
+  def render_decode64_content(str)
+    return nil if str.blank?
+    Base64.decode64(str).force_encoding("UTF-8").encode("UTF-8", invalid: :replace)
+  end
+
+  def download_type(str)
+    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv)
+    default_type.include?(str&.downcase) || str.blank?
+  end
+
+  def image_type?(str)
+    default_type = %w(png jpg gif tif psd svg bmp webp jpeg ico psd)
+    default_type.include?(str&.downcase)
+  end
+
+  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)
+  end
+
+  def render_commit_author(author_json)
+    return nil if author_json.blank? || (author_json["id"].blank? && author_json['name'].blank?)
+    if author_json["id"].present?
+      return find_user_by_gitea_uid author_json['id']
+    end
+    if author_json["id"].nil? && (author_json["name"].present? && author_json["email"].present?)
+      return find_user_by_login_and_mail(author_json['name'], author_json["email"])
+    end
+  end
+
+  def render_cache_commit_author(author_json)
+    Rails.logger.info author_json['Email'] 
+    if author_json["name"].present? && author_json["email"].present?
+      return find_user_in_redis_cache(author_json['name'], author_json['email']) 
+    end
+    if author_json["Name"].present? && author_json["Email"].present?
+      return find_user_in_redis_cache(author_json['Name'], author_json['Email']) 
+    end
+  end
+
+  def readme_render_decode64_content(str, owner, repo, ref, path)
+    return nil if str.blank?
+    begin
+      content = Base64.decode64(str).force_encoding('UTF-8')
+
+      c_regex = /\!\[.*?\]\((.*?)\)/
+      src_regex = /src=\"(.*?)\"/
+      src2_regex = /src='(.*?)'/
+      ss = content.to_s.scan(c_regex)
+      ss_src = content.scan(src_regex)
+      ss_src2 = content.scan(src2_regex)
+      total_images = ss + ss_src + ss_src2
+      if total_images.length > 0
+        total_images.each do |s|
+          begin
+            image_title = /\"(.*?)\"/
+            r_content = s[0]
+            remove_title = r_content.to_s.scan(image_title)
+            # if remove_title.length > 0
+            #   r_content = r_content.gsub(/#{remove_title[0]}/, "").strip
+            # end
+            path_last = r_content
+            path_current = ""
+            # 相对路径处理
+            if r_content.start_with?("../")
+              relative_path_length = r_content.split("../").size - 1
+              path_pre = path.split("/").size - 1 - relative_path_length
+              path_pre = 0 if path_pre < 0
+              path_current = path_pre == 0 ? "" : path.split("/")[0..path_pre].join("/")
+              path_last =  r_content.split("../").last
+            elsif r_content.start_with?("/")  # 根路径处理
+              path_last = r_content[1..r_content.size]
+            else
+              path_current = path
+            end
+            # if r_content.include?("?")
+            #   new_r_content = r_content + "&raw=true"
+            # else
+            #   new_r_content = r_content + "?raw=true"
+            # end
+            new_r_content = r_content
+
+            unless r_content.include?("http://") || r_content.include?("https://") || r_content.include?("mailto:")
+              # new_r_content = "#{path}" + new_r_content
+              new_r_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{path_current}/#{path_last}&ref=#{ref}"].join
+            end
+            content = content.gsub(/src=\"#{r_content}\"/, "src=\"#{new_r_content}\"").gsub(/src='#{r_content}'/, "src=\"#{new_r_content}\"")
+          rescue 
+            next
+          end
+        end
+      end
+  
+      return content
+    rescue
+      return str
+    end
+  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")
+  end
+
+  # date for example: 2020-11-01T19:57:27+08:00
+  def render_format_time_with_date(date)
+    date.to_time.strftime("%Y-%m-%d %H:%M")
+  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)
+    else
+      file_type = File.extname(entry['name'].to_s)[1..-1]
+      if image_type?(file_type)
+        return entry['content'].nil? ? Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content'] : entry['content']  
+      end
+      if download_type(file_type)
+        return entry['content']
+      end
+      render_decode64_content(entry['content'])
+    end
+  end
+
+  def base64_to_image(path, content)
+    # generate to https://git.trusite.net/pawm36ozq/-/raw/branch/master/entrn.png"
+    content      = Base64.decode64(content)
+    File.open(path, 'wb') { |f| f.write(content) }
+  end
+  
+  def render_download_image_url(dir_path, file_path, content)
+    full_path = file_path.starts_with?("/") ? [dir_path, file_path].join("") : [dir_path, file_path].join("/")
+    file_name = full_path.split("/")[-1]
+    # 用户名/项目标识/文件路径
+    dir_path = generate_dir_path(full_path.split("/"+file_name)[0])
+
+    file_path = [dir_path, file_name].join('/')
+
+    puts "##### render_download_image_url file_path: #{file_path}"
+    base64_to_image(file_path, content)
+    file_path = file_path[6..-1]
+    File.join(base_url, file_path)
+  end
+  
+  def generate_dir_path(dir_path)
+    # tmp_dir_path
+    # eg: jasder/forgeplus/raw/branch/ref
+    dir_path = ["public", tmp_dir, dir_path].join('/')
+    puts "#### dir_path: #{dir_path}"
+    unless Dir.exists?(dir_path)
+      FileUtils.mkdir_p(dir_path) ##不成功这里会抛异常
+    end
+    dir_path
+  end
+
+  def tmp_dir
+    "repo"
+  end
+  
+end

app/jobs/cache_async_clear_job.rb

@@ -7,6 +7,8 @@ class CacheAsyncClearJob < ApplicationJob
       Cache::V2::ProjectCommonService.new(id).clear
     when "owner_common_service"
       Cache::V2::OwnnerCommonService.new(id).clear
+    when "project_rank_service"
+      Cache::V2::ProjectRankService.new(id).clear
     end
   end
 end

app/jobs/delay_expired_issue_job.rb

@@ -3,8 +3,7 @@ class DelayExpiredIssueJob < ApplicationJob
 
   def perform
     Issue.where(due_date: Date.today + 1.days).find_each do |issue|
-      SendTemplateMessageJob.perform_later('IssueAssignerExpire', issue.id) if Site.has_notice_menu?
-      SendTemplateMessageJob.perform_later('IssueCreatorExpire', issue.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('IssueExpire', issue.id) if Site.has_notice_menu?
     end
   end
 

app/jobs/send_template_message_job.rb

@@ -24,13 +24,6 @@ class SendTemplateMessageJob < ApplicationJob
         receivers_email_string, email_title, email_content = MessageTemplate::IssueAssigned.get_email_message_content(receiver, operator, issue)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
       end
-    when 'IssueAssignerExpire'
-      issue_id = args[0]
-      issue = Issue.find_by_id(issue_id)
-      return unless issue.present?
-      receivers = User.where(id: issue&.assigned_to_id)
-      receivers_string, content, notification_url = MessageTemplate::IssueAssignerExpire.get_message_content(receivers, issue)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {issue_id: issue.id})
     when 'IssueAtme'
       receivers, operator_id, issue_id = args[0], args[1], args[2]
       operator = User.find_by_id(operator_id)
@@ -52,13 +45,17 @@ class SendTemplateMessageJob < ApplicationJob
         receivers_email_string, email_title, email_content = MessageTemplate::IssueChanged.get_email_message_content(receiver, operator, issue, change_params)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
       end
-    when 'IssueCreatorExpire'
+    when 'IssueExpire'
       issue_id = args[0]
       issue = Issue.find_by_id(issue_id)
       return unless issue.present?
-      receivers = User.where(id: issue&.author_id)
-      receivers_string, content, notification_url = MessageTemplate::IssueCreatorExpire.get_message_content(receivers, issue)
+      receivers = User.where(id: [issue&.assigned_to_id, issue&.author_id])
+      receivers_string, content, notification_url = MessageTemplate::IssueExpire.get_message_content(receivers, issue)
       Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {issue_id: issue.id})
+      receivers.find_each do |receiver|
+        receivers_email_string, email_title, email_content = MessageTemplate::IssueExpire.get_email_message_content(receiver, issue)
+        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
+      end
     when 'IssueDeleted'
       operator_id, issue_title, issue_assigned_to_id, issue_author_id = args[0], args[1], args[2], args[3]
       operator = User.find_by_id(operator_id)
@@ -94,6 +91,14 @@ class SendTemplateMessageJob < ApplicationJob
         receivers_email_string, email_title, email_content = MessageTemplate::OrganizationLeft.get_email_message_content(receiver, organization)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
       end
+    when 'ProjectForked'
+      operator_id, project_id = args[0], args[1]
+      operator = User.find_by_id(operator_id)
+      project = Project.find_by_id(project_id)
+      return unless operator.present? && project.present?
+      receivers = project&.all_managers.where.not(id: operator&.id)
+      receivers_string, content, notification_url = MessageTemplate::ProjectForked.get_message_content(receivers, operator, project)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, project_id: project.id})
     when 'ProjectIssue'
       operator_id, issue_id = args[0], args[1]
       operator = User.find_by_id(operator_id)
@@ -163,6 +168,37 @@ class SendTemplateMessageJob < ApplicationJob
         receivers_email_string, email_title, email_content = MessageTemplate::ProjectMemberLeft.get_email_message_content(receiver, user, project)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
       end
+    when 'ProjectMilestoneCompleted'
+      milestone_id = args[0]
+      milestone = Version.find_by_id(milestone_id)
+      return unless milestone.present? && milestone&.project.present?
+      receivers = milestone&.project&.all_managers
+      receivers_string, content, notification_url = MessageTemplate::ProjectMilestoneCompleted.get_message_content(receivers, milestone)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {milestone_id: milestone_id})
+      receivers.find_each do |receiver| 
+        receivers_email_string, email_title, email_content = MessageTemplate::ProjectMilestoneCompleted.get_email_message_content(receiver, milestone)
+        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
+      end
+    when 'ProjectMilestone'
+      milestone_id, operator_id = args[0], args[1]
+      milestone = Version.find_by_id(milestone_id)
+      operator = User.find_by_id(operator_id)
+      return unless milestone.present? && milestone&.project.present? && operator.present?
+      receivers = milestone&.project&.all_managers.where.not(id: operator_id)
+      receivers_string, content, notification_url = MessageTemplate::ProjectMilestone.get_message_content(receivers, operator, milestone)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {milestone_id: milestone_id, operator_id: operator_id})
+      receivers.find_each do |receiver|
+        receivers_email_string, email_title, email_content = MessageTemplate::ProjectMilestone.get_email_message_content(receiver, operator, milestone)
+        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
+      end
+    when 'ProjectPraised'
+      operator_id, project_id = args[0], args[1]
+      operator = User.find_by_id(operator_id)
+      project = Project.find_by_id(project_id)
+      return unless operator.present? && project.present?
+      receivers = project&.all_managers.where.not(id: operator&.id)
+      receivers_string, content, notification_url = MessageTemplate::ProjectPraised.get_message_content(receivers, operator, project)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, project_id: project.id})
     when 'ProjectPullRequest'
       operator_id, pull_request_id = args[0], args[1]
       operator = User.find_by_id(operator_id)
@@ -290,6 +326,30 @@ class SendTemplateMessageJob < ApplicationJob
         receivers_email_string, email_title, email_content = MessageTemplate::TeamLeft.get_email_message_content(receiver, organization, team)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
       end
+    when 'CompetitionBegin'
+      user_id, competition_id = args[0], args[1]
+      user = User.find_by_id(user_id)
+      project = Project.find_by_sql("select *,title as name from competitions where id=#{competition_id}")
+      return unless user.present? && project.present?
+      receivers = User.where(id: user_id)
+      receivers_string, content, notification_url = MessageTemplate::CompetitionBegin.get_message_content(receivers, project.first)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user_id, competition_name: project.first&.name, identifier: project.first&.identifier})
+    when 'CompetitionReview'
+      user_id, competition_id = args[0], args[1]
+      user = User.find_by_id(user_id)
+      project = Project.find_by_sql("select *,title as name from competitions where id=#{competition_id}")
+      return unless user.present? && project.present?
+      receivers = User.where(id: user_id)
+      receivers_string, content, notification_url = MessageTemplate::CompetitionReview.get_message_content(receivers, project.first)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user_id, competition_name: project.first&.name, identifier: project.first&.identifier})
+    when 'CompetitionResult'
+      user_id, competition_id = args[0], args[1]
+      user = User.find_by_id(user_id)
+      project = Project.find_by_sql("select *,title as name from competitions where id=#{competition_id}")
+      return unless user.present? && project.present?
+      receivers = User.where(id: user_id)
+      receivers_string, content, notification_url = MessageTemplate::CompetitionResult.get_message_content(receivers, project.first)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user_id, competition_name: project.first&.name, identifier: project.first&.identifier})
     end
   end
 end

app/libs/trace.rb

@@ -0,0 +1,21 @@
+module Trace 
+  class << self
+    def trace_config 
+      trace_config = {}
+
+      begin
+        config = Rails.application.config_for(:configuration).symbolize_keys!
+        trace_config = config[:trace].symbolize_keys!
+        raise 'trace config missing' if trace_config.blank?
+      rescue => exception
+        raise ex if Rails.env.production?
+
+        puts %Q{\033[33m [warning] gitea config or configuration.yml missing,
+                 please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m}
+        trace_config = {}
+      end
+
+      trace_config 
+    end
+  end
+end

app/models/ci/repo.rb

@@ -5,10 +5,10 @@ class Ci::Repo < Ci::RemoteBase
   has_one :perm, foreign_key: :perm_repo_uid
   has_many :builds, foreign_key: :build_repo_id, dependent: :destroy
 
-  def self.find_with_namespace(namespace_path, identifier)
+  def self.find_with_namespace(namespace_path, identifier, user_login)
     logger.info "########namespace_path: #{namespace_path} ########identifier: #{identifier} "
-
-    user = Ci::User.find_by_user_login namespace_path
+    user_login = user_login || namespace_path
+    user = Ci::User.find_by(user_login: user_login)
     repo = Ci::Repo.where(repo_namespace: namespace_path, repo_name: identifier).first
 
     [user, repo]

app/models/concerns/matchable.rb

@@ -5,7 +5,7 @@ module Matchable
     scope :with_project_category, ->(category_id) { where(project_category_id: category_id) unless category_id.blank? }
     scope :with_project_language, ->(language_id) { where(project_language_id: language_id) unless language_id.blank? }
     scope :with_project_type,     ->(project_type) { where(project_type: project_type) if Project.project_types.include?(project_type) }
-    scope :by_name_or_identifier, ->(search) { where("name like :search or identifier LIKE :search", :search => "#{search.split(" ").join('|')}%") unless search.blank? }
+    scope :by_name_or_identifier, ->(search) { where("name like :search or identifier LIKE :search", :search => "%#{search.split(" ").join('|')}%") unless search.blank? }
   end
 
 end

app/models/issue.rb

@@ -76,7 +76,7 @@ class Issue < ApplicationRecord
   scope :issue_index_includes, ->{includes(:tracker, :priority, :version, :issue_status, :journals,:issue_tags,user: :user_extension)}
   scope :closed, ->{where(status_id: 5)}
   after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
-  after_update :change_versions_count
+  after_save :change_versions_count, :send_update_message_to_notice_system
   after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic
 
   def incre_project_common
@@ -171,11 +171,25 @@ class Issue < ApplicationRecord
   end
 
   def change_versions_count
-    if self.version.present? && self.saved_change_to_status_id?
+    if self.saved_change_to_fixed_version_id?
+      before_version = Version.find_by_id(self.fixed_version_id_before_last_save)
+      Rails.logger.info self.fixed_version_id_before_last_save
+      if before_version.present?
+        Rails.logger.info self.status_id
+        Rails.logger.info self.status_id_before_last_save
+        # 更改前状态为完成 或者 更改前后都为完成状态
+        if self.status_id_before_last_save == 5
+          percent = before_version.issues_count == 0 ? 0.0 : ((before_version.closed_issues_count - 1).to_f / before_version.issues_count)
+          before_version.update_attributes(closed_issues_count: (before_version.closed_issues_count - 1), percent: percent)
+        end
+      end
+    end
+
+    if self.version.present? && (self.saved_change_to_status_id? || self.saved_change_to_fixed_version_id?)
       if self.status_id == 5
         percent = self.version.issues_count == 0 ? 0.0 : ((self.version.closed_issues_count + 1).to_f / self.version.issues_count)
         self.version.update_attributes(closed_issues_count: (self.version.closed_issues_count + 1), percent: percent)
-      elsif self.status_id_before_last_save == 5
+      elsif self.status_id_before_last_save == 5 && !self.saved_change_to_fixed_version_id?
         percent = self.version.issues_count == 0 ? 0.0 : ((self.version.closed_issues_count - 1).to_f / self.version.issues_count)
         self.version.update_attributes(closed_issues_count: (self.version.closed_issues_count - 1), percent: percent)
       end
@@ -183,7 +197,11 @@ class Issue < ApplicationRecord
   end
 
   def update_closed_issues_count_in_project!
-    self.project.decrement!(:closed_issues_count)
+    self.project.decrement!(:closed_issues_count) if self.status_id == 5
+  end
+
+  def send_update_message_to_notice_system
+    SendTemplateMessageJob.perform_later('IssueExpire', self.id) if Site.has_notice_menu? && self.due_date == Date.today + 1.days
   end
 
 end

app/models/message_template.rb

@@ -13,61 +13,72 @@
 #
 
 class MessageTemplate < ApplicationRecord
+  PLATFORM = 'GitLink'
 
   def self.build_init_data
+    MessageTemplate::IssueAssignerExpire.destroy_all
+    MessageTemplate::IssueCreatorExpire.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: 'GitLink: {nickname1} 在 {nickname2}/{repository} 指派给你一个疑修')
-    self.create(type: 'MessageTemplate::IssueAssignerExpire', sys_notice: '您负责的疑修 <b>{title}</b> 已临近截止日期，请尽快处理', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
+    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} 指派给你一个疑修")
     self.create(type: 'MessageTemplate::IssueAtme', sys_notice: '<b>{nickname}</b> 在疑修 <b>{title}</b> 中@我', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
     email_html = File.read("#{email_template_html_dir}/issue_changed.html")
-    self.create(type: 'MessageTemplate::IssueChanged', sys_notice: '在项目 <b>{nickname2}/{repository}</b> 的疑修 <b>{title}</b> 中：{ifassigner}{nickname1}将负责人从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifstatus}{nickname1}将状态从 <b>{status1}</b> 修改为 <b>{status2}</b> {endstatus}{iftracker}{nickname1}将类型从 <b>{tracker1}</b> 修改为 <b>{tracker2}</b> {endtracker}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifdoneratio}{nickname1}将完成度从 <b>{doneratio1}</b> 修改为 <b>{doneratio2}</b> {enddoneratio}{ifbranch}{nickname1}将指定分支从 <b>{branch1}</b> 修改为 <b>{branch2}</b> {endbranch}{ifstartdate}{nickname1}将开始日期从 <b>{startdate1}</b> 修改为 <b>{startdate2}</b> {endstartdate}{ifduedate}{nickname1}将结束日期从 <b>{duedate1}</b> 修改为 <b>{duedate2}</b> {endduedate}', email: email_html, email_title: 'GitLink: 疑修 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
-    self.create(type: 'MessageTemplate::IssueCreatorExpire', sys_notice: '您发布的疑修 <b>{title}</b> 已临近截止日期，请尽快处理', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
+    self.create(type: 'MessageTemplate::IssueChanged', sys_notice: '在项目 <b>{nickname2}/{repository}</b> 的疑修 <b>{title}</b> 中：{ifassigner}{nickname1}将负责人从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifstatus}{nickname1}将状态从 <b>{status1}</b> 修改为 <b>{status2}</b> {endstatus}{iftracker}{nickname1}将类型从 <b>{tracker1}</b> 修改为 <b>{tracker2}</b> {endtracker}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifdoneratio}{nickname1}将完成度从 <b>{doneratio1}</b> 修改为 <b>{doneratio2}</b> {enddoneratio}{ifbranch}{nickname1}将指定分支从 <b>{branch1}</b> 修改为 <b>{branch2}</b> {endbranch}{ifstartdate}{nickname1}将开始日期从 <b>{startdate1}</b> 修改为 <b>{startdate2}</b> {endstartdate}{ifduedate}{nickname1}将结束日期从 <b>{duedate1}</b> 修改为 <b>{duedate2}</b> {endduedate}', email: email_html, email_title: "#{PLATFORM}: 疑修 {title} 有状态变更", notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
+    email_html = File.read("#{email_template_html_dir}/issue_expire.html")
+    self.create(type: 'MessageTemplate::IssueExpire', sys_notice: '疑修 <b>{title}</b> 已临近截止日期，请尽快处理', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: "#{PLATFORM}: 疑修截止日期到达最后一天")
     email_html = File.read("#{email_template_html_dir}/issue_deleted.html")
-    self.create(type: 'MessageTemplate::IssueDeleted', sys_notice: '{nickname}已将疑修 <b>{title}</b> 删除', email: email_html, email_title: 'GitLink: 疑修 {title} 有状态变更', notification_url: '')
+    self.create(type: 'MessageTemplate::IssueDeleted', sys_notice: '{nickname}已将疑修 <b>{title}</b> 删除', email: email_html, email_title: "#{PLATFORM}: 疑修 {title} 有状态变更", notification_url: '')
     self.create(type: 'MessageTemplate::IssueJournal', sys_notice: '{nickname}评论疑修{title}：<b>{notes}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
     self.create(type: 'MessageTemplate::LoginIpTip', sys_notice: '您的账号{nickname}于{login_time)在非常用的IP地址{ip}登录，如非本人操作，请立即修改密码', notification_url: '')
     email_html = File.read("#{email_template_html_dir}/organization_joined.html")
-    self.create(type: 'MessageTemplate::OrganizationJoined', sys_notice: '你已加入 <b>{organization}</b> 组织', notification_url: '{baseurl}/{login}', email: email_html, email_title: 'GitLink: 你已加入 {organization} 组织')
+    self.create(type: 'MessageTemplate::OrganizationJoined', sys_notice: '你已加入 <b>{organization}</b> 组织', notification_url: '{baseurl}/{login}', email: email_html, email_title: "#{PLATFORM}: 你已加入 {organization} 组织")
     email_html = File.read("#{email_template_html_dir}/organization_left.html")
-    self.create(type: 'MessageTemplate::OrganizationLeft', sys_notice: '你已被移出 <b>{organization}</b> 组织', notification_url: '', email: email_html, email_title: 'GitLink: 你已被移出 {organization} 组织')
+    self.create(type: 'MessageTemplate::OrganizationLeft', sys_notice: '你已被移出 <b>{organization}</b> 组织', notification_url: '', email: email_html, email_title: "#{PLATFORM}: 你已被移出 {organization} 组织")
     self.create(type: 'MessageTemplate::ProjectDeleted', sys_notice: '你关注的仓库{nickname}/{repository}已被删除', notification_url: '')
     self.create(type: 'MessageTemplate::ProjectFollowed', sys_notice: '<b>{nickname}</b> 关注了你管理的仓库', notification_url: '{baseurl}/{login}')
-    self.create(type: 'MessageTemplate::ProjectForked', sys_notice: '<b>{nickname1}</b> 复刻了你管理的仓库{nickname1}/{repository1}到{nickname2}/{repository2}', notification_url: '{baseurl}/{owner}/{identifier}')
+    self.create(type: 'MessageTemplate::ProjectForked', sys_notice: '<b>{nickname1}</b> 复刻了你管理的仓库 <b>{nickname2}/{repository}</b> 到 <b>{nickname1}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}')
     email_html = File.read("#{email_template_html_dir}/project_issue.html")
-    self.create(type: 'MessageTemplate::ProjectIssue', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 新建疑修：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: 'GitLink: {nickname1} 在 {nickname2}/{repository} 新建了一个疑修')
+    self.create(type: 'MessageTemplate::ProjectIssue', 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} 新建了一个疑修")
     email_html = File.read("#{email_template_html_dir}/project_joined.html")
-    self.create(type: 'MessageTemplate::ProjectJoined', sys_notice: '你已加入 <b>{repository}</b> 项目', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: 'GitLink: 你已加入 {repository} 项目')
+    self.create(type: 'MessageTemplate::ProjectJoined', sys_notice: '你已加入 <b>{repository}</b> 项目', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: "#{PLATFORM}: 你已加入 {repository} 项目")
     email_html = File.read("#{email_template_html_dir}/project_left.html")
-    self.create(type: 'MessageTemplate::ProjectLeft', sys_notice: '你已被移出 <b>{repository}</b> 项目', notification_url: '', email: email_html, email_title: 'GitLink: 你已被移出 {repository} 项目')
+    self.create(type: 'MessageTemplate::ProjectLeft', sys_notice: '你已被移出 <b>{repository}</b> 项目', notification_url: '', email: email_html, email_title: "#{PLATFORM}: 你已被移出 {repository} 项目")
     email_html = File.read("#{email_template_html_dir}/project_member_joined.html")
-    self.create(type: 'MessageTemplate::ProjectMemberJoined', sys_notice: '<b>{nickname1}</b> 已加入项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: 'GitLink: {nickname1} 已加入项目 {nickname2}/{repository}')
+    self.create(type: 'MessageTemplate::ProjectMemberJoined', sys_notice: '<b>{nickname1}</b> 已加入项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 已加入项目 {nickname2}/{repository}")
     email_html = File.read("#{email_template_html_dir}/project_member_left.html")
-    self.create(type: 'MessageTemplate::ProjectMemberLeft', sys_notice: '<b>{nickname1}</b> 已被移出项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: 'GitLink: {nickname1} 已被移出项目 {nickname2}/{repository}')
-    self.create(type: 'MessageTemplate::ProjectMilestone', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 创建了一个里程碑：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}')
-    self.create(type: 'MessageTemplate::ProjectPraised', sys_notice: '<b>{nickname}</b> 点赞了你管理的仓库', notification_url: '{baseurl}/{login}')
+    self.create(type: 'MessageTemplate::ProjectMemberLeft', sys_notice: '<b>{nickname1}</b> 已被移出项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 已被移出项目 {nickname2}/{repository}")
+    email_html = File.read("#{email_template_html_dir}/project_milestone.html")
+    self.create(type: 'MessageTemplate::ProjectMilestone', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 创建了一个里程碑：<b>{name}</b>', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 新建了一个里程碑")
+    email_html = File.read("#{email_template_html_dir}/project_milestone_completed.html")
+    self.create(type: 'MessageTemplate::ProjectMilestoneCompleted', sys_notice: '在 <b>{nickname}/{repository}</b> 仓库，里程碑 <b>{name}</b> 的完成度已达到100%', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}', email: email_html, email_title: "#{PLATFORM}: 仓库 {nickname}/{repository} 有里程碑已完成")
+    self.create(type: 'MessageTemplate::ProjectPraised', sys_notice: '<b>{nickname1}</b> 点赞了你管理的仓库 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{login}')
     email_html = File.read("#{email_template_html_dir}/project_pull_request.html")
-    self.create(type: 'MessageTemplate::ProjectPullRequest', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 提交了一个合并请求：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: 'GitLink: {nickname1} 在 {nickname2}/{repository} 提交了一个合并请求')
+    self.create(type: 'MessageTemplate::ProjectPullRequest', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 提交了一个合并请求：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 提交了一个合并请求")
     email_html = File.read("#{email_template_html_dir}/project_role.html")
-    self.create(type: 'MessageTemplate::ProjectRole', sys_notice: '仓库 <b>{nickname}/{repository}</b> 已把你的角色改为 <b>{role}</b>', email: email_html, email_title: 'GitLink: 在 {nickname}/{repository} 项目你的账号有权限变更', notification_url: '{baseurl}/{owner}/{identifier}')
+    self.create(type: 'MessageTemplate::ProjectRole', sys_notice: '仓库 <b>{nickname}/{repository}</b> 已把你的角色改为 <b>{role}</b>', email: email_html, email_title: '#{PLATFORM}: 在 {nickname}/{repository} 项目你的账号有权限变更', notification_url: '{baseurl}/{owner}/{identifier}')
     email_html = File.read("#{email_template_html_dir}/project_setting_changed.html")
-    self.create(type: 'MessageTemplate::ProjectSettingChanged', sys_notice: '{nickname1}更改了 <b>{nickname2}/{repository}</b> 仓库设置：{ifname}更改项目名称为"<b>{name}</b>"{endname}{ifidentifier}更改项目标识为"<b>{identifier}</b>"{endidentifier}{ifdescription}更改项目简介为"<b>{description}</b>"{enddescription}{ifcategory}更改项目类别为"<b>{category}</b>"{endcategory}{iflanguage}更改项目语言为"<b>{language}</b>"{endlanguage}{ifpermission}将仓库设为"<b>{permission}</b>"{endpermission}{ifnavbar}将项目导航更改为"<b>{navbar}</b>"{endnavbar}', notification_url: '{baseurl}/{owner}/{identifier}/settings', email: email_html, email_title: 'GitLink: 您管理的仓库 {nickname2}/{repository} 仓库设置已被更改')
+    self.create(type: 'MessageTemplate::ProjectSettingChanged', sys_notice: '{nickname1}更改了 <b>{nickname2}/{repository}</b> 仓库设置：{ifname}更改项目名称为"<b>{name}</b>"{endname}{ifidentifier}更改项目标识为"<b>{identifier}</b>"{endidentifier}{ifdescription}更改项目简介为"<b>{description}</b>"{enddescription}{ifcategory}更改项目类别为"<b>{category}</b>"{endcategory}{iflanguage}更改项目语言为"<b>{language}</b>"{endlanguage}{ifpermission}将仓库设为"<b>{permission}</b>"{endpermission}{ifnavbar}将项目导航更改为"<b>{navbar}</b>"{endnavbar}', notification_url: '{baseurl}/{owner}/{identifier}/settings', email: email_html, email_title: "#{PLATFORM}: 您管理的仓库 {nickname2}/{repository} 仓库设置已被更改")
     self.create(type: 'MessageTemplate::ProjectTransfer', sys_notice: '你关注的仓库{nickname1}/{repository1}已被转移至{nickname2}/{repository2}', notification_url: '{baseurl}/{owner}/{identifier}')
     self.create(type: 'MessageTemplate::ProjectVersion', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 创建了发行版：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/releases')
     email_html = File.read("#{email_template_html_dir}/pull_request_assigned.html")
-    self.create(type: 'MessageTemplate::PullRequestAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个合并请求：<b>{title}<b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: 'GitLink: {nickname1} 在 {nickname2}/{repository} 指派给你一个合并请求')
+    self.create(type: 'MessageTemplate::PullRequestAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个合并请求：<b>{title}<b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 指派给你一个合并请求")
     self.create(type: 'MessageTemplate::PullRequestAtme', sys_notice: '<b>{nickname}</b> 在合并请求 <b>{title}</b> 中@我', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
     email_html = File.read("#{email_template_html_dir}/pull_request_changed.html")
-    self.create(type: 'MessageTemplate::PullRequestChanged', sys_notice: '在项目{nickname2}/{repository}的合并请求 <b>{title}</b> 中：{ifassigner}{nickname1}将审查成员从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}', email: email_html, email_title: 'GitLink: 合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
+    self.create(type: 'MessageTemplate::PullRequestChanged', sys_notice: '在项目{nickname2}/{repository}的合并请求 <b>{title}</b> 中：{ifassigner}{nickname1}将审查成员从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}', email: email_html, email_title: "#{PLATFORM}: 合并请求 {title} 有状态变更", notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
     email_html = File.read("#{email_template_html_dir}/pull_request_closed.html")
-    self.create(type: 'MessageTemplate::PullRequestClosed', sys_notice: '你提交的合并请求：{title} <b>被拒绝</b>', email: email_html, email_title: 'GitLink: 合并请求 {title} 有状态变更', notification_url: '')
+    self.create(type: 'MessageTemplate::PullRequestClosed', sys_notice: '你提交的合并请求：{title} <b>被拒绝</b>', email: email_html, email_title: "#{PLATFORM}: 合并请求 {title} 有状态变更", notification_url: '')
     self.create(type: 'MessageTemplate::PullRequestJournal', sys_notice: '{nickname}评论合并请求{title}：<b>{notes}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
     email_html = File.read("#{email_template_html_dir}/pull_request_merged.html")
-    self.create(type: 'MessageTemplate::PullRequestMerged', sys_notice: '你提交的合并请求：{title} <b>已通过</b>', email: email_html, email_title: 'GitLink: 合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
+    self.create(type: 'MessageTemplate::PullRequestMerged', sys_notice: '你提交的合并请求：{title} <b>已通过</b>', email: email_html, email_title: "#{PLATFORM}: 合并请求 {title} 有状态变更", notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
     email_html = File.read("#{email_template_html_dir}/team_joined.html")
-    self.create(type: 'MessageTemplate::TeamJoined', sys_notice: '你已被拉入组织 <b>{organization}</b> 的 <b>{team}</b> 团队，拥有<b>{role}</b>权限', email: email_html, email_title: 'GitLink: 在 {organization} 组织你的账号有权限变更', notification_url: '{baseurl}/{login}')
+    self.create(type: 'MessageTemplate::TeamJoined', sys_notice: '你已被拉入组织 <b>{organization}</b> 的 <b>{team}</b> 团队，拥有<b>{role}</b>权限', email: email_html, email_title: "#{PLATFORM}: 在 {organization} 组织你的账号有权限变更", notification_url: '{baseurl}/{login}')
     email_html = File.read("#{email_template_html_dir}/team_left.html")
-    self.create(type: 'MessageTemplate::TeamLeft', sys_notice: '你已被移出组织 <b>{organization}</b> 的 <b>{team}</b> 团队', email: email_html, email_title: 'GitLink: 在 {organization} 组织你的账号有权限变更', notification_url: '{baseurl}/{login}')
+    self.create(type: 'MessageTemplate::TeamLeft', sys_notice: '你已被移出组织 <b>{organization}</b> 的 <b>{team}</b> 团队', email: email_html, email_title: "#{PLATFORM}: 在 {organization} 组织你的账号有权限变更", notification_url: '{baseurl}/{login}')
+
+    # 竞赛通知
+    self.create(type: 'MessageTemplate::CompetitionBegin', sys_notice: '你报名的竞赛 <b>{competition_name}</b> 已进入比赛进行阶段，可在此期间提交作品', notification_url: '{to_url}')
+    self.create(type: 'MessageTemplate::CompetitionResult', sys_notice: '你报名的竞赛 <b>{competition_name}</b> 已进入成绩公示阶段，可查看排行榜信息', notification_url: '{to_url}')
+    self.create(type: 'MessageTemplate::CompetitionReview', sys_notice: '你报名的竞赛 <b>{competition_name}</b> 距作品提交结束日期仅剩3天，若尚未提交参赛作品，请尽快提交', notification_url: '{to_url}')
   end
 
   def self.sys_notice

app/models/message_template/competition_begin.rb

@@ -0,0 +1,35 @@
+# == 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)
+#
+
+# 报名的竞赛进入比赛进行阶段
+# 触发场景
+# 	赛队成员报名的竞赛已进入比赛进行阶段
+# 通知文案格式
+# 	你报名的竞赛 xxx 已进入比赛进行阶段，可在此阶段提交作品
+#    时间：x分钟/小时/天/月前
+# 通知文案示例
+# 	你报名的竞赛 代码审查大赛 已进入比赛进行阶段，可在此期间提交作品
+#    时间：3小时前
+# 点击通知跳转页面
+# 	点击此通知将跳转到代码审查大赛详情页：
+#    http://117.50.100.12:8080/competitions/lgw7st/home
+class MessageTemplate::CompetitionBegin < MessageTemplate
+
+  # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
+  def self.get_message_content(receivers, competition)
+    return receivers_string(receivers), sys_notice.to_s.gsub('{competition_name}', competition&.name), notification_url.to_s.gsub('{to_url}', "/competitions/#{competition.identifier}/home")
+  # rescue
+  #   return '', '', ''
+  end
+end

app/models/message_template/competition_result.rb

@@ -0,0 +1,35 @@
+# == 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)
+#
+
+# 报名的竞赛进入成绩公示阶段
+# 触发场景
+# 	赛队成员报名的竞赛已进入成绩公示阶段
+# 通知文案格式
+# 	你报名的竞赛 xxx 已进入成绩公示阶段，可查看排行榜信息
+#    时间：x分钟/小时/天/月前
+# 通知文案示例
+# 	你报名的竞赛 代码审查大赛 已进入成绩公示阶段，可查看排行榜信息
+#    时间：3小时前
+# 点击通知跳转页面
+# 	点击此通知将跳转到代码审查大赛详情页：
+#    http://117.50.100.12:8080/competitions/lgw7st/home
+class MessageTemplate::CompetitionResult < MessageTemplate
+
+  # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
+  def self.get_message_content(receivers, competition)
+    return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.title), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}/home")
+  rescue 
+    return '', '', ''
+  end
+end

app/models/message_template/competition_review.rb

@@ -0,0 +1,35 @@
+# == 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)
+#
+
+# 报名的竞赛比赛结束时间临近
+# 触发场景
+# 	赛队成员报名的竞赛阶段处于比赛进行中，且距比赛结束日期仅剩3天
+# 通知文案格式
+# 	你报名的竞赛 xxx 距作品提交结束日期仅剩3天，若尚未提交参赛作品，请尽快提交
+#    时间：x分钟/小时/天/月前
+# 通知文案示例
+# 	你报名的竞赛 代码审查大赛 距作品提交结束日期仅剩3天，若尚未提交参赛作品，请尽快提交
+#    时间：3小时前
+# 点击通知跳转页面
+# 	点击此通知将跳转到代码审查大赛详情页：
+#    http://117.50.100.12:8080/competitions/lgw7st/home
+class MessageTemplate::CompetitionReview < MessageTemplate
+
+  # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
+  def self.get_message_content(receivers, competition)
+    return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.title), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}/home")
+  rescue 
+    return '', '', ''
+  end
+end

app/models/message_template/issue_assigned.rb

@@ -53,6 +53,7 @@ class MessageTemplate::IssueAssigned < MessageTemplate
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{title}', issue&.subject)
       content.gsub!('{id}', issue&.id.to_s)
+      content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content
     else

app/models/message_template/issue_changed.rb

@@ -359,6 +359,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
       else
         content.gsub!(/({ifduedate})(.*)({endduedate})/, '') 
       end
+      content.gsub!('{platform}', PLATFORM)
 
       return receiver&.mail, title, content
     else

app/models/message_template/issue_creator_expire.rb

@@ -1,29 +1,3 @@
-# == 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::IssueCreatorExpire < MessageTemplate
 
-  # MessageTemplate::IssueCreatorExpire.get_message_content(User.where(login: 'yystopf'), Issue.last)
-  def self.get_message_content(receivers, issue)
-    project = issue&.project
-    owner = project&.owner
-    content = sys_notice.gsub('{title}', issue&.subject)
-    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
-    return receivers_string(receivers), content, url
-  rescue => e
-    Rails.logger.info("MessageTemplate::IssueAssignerExpire.get_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-end
+end

app/models/message_template/issue_deleted.rb

@@ -41,6 +41,7 @@ class MessageTemplate::IssueDeleted < MessageTemplate
       content.gsub!('{login}', operator&.login)
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{title}', issue_title)
+      content.gsub!('{platform}', PLATFORM)
 
       return receiver&.mail, title, content
     else

app/models/message_template/issue_expire.rb

@@ -0,0 +1,67 @@
+# == 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::IssueExpire < MessageTemplate
+
+  # MessageTemplate::IssueCreatorExpire.get_message_content(User.where(login: 'yystopf'), Issue.last)
+  def self.get_message_content(receivers, issue)
+    receivers.each do |receiver|
+      if receiver.user_template_message_setting.present? 
+        send_setting = receiver.user_template_message_setting.notification_body["CreateOrAssign::IssueExpire"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["CreateOrAssign::IssueExpire"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
+      end
+    end
+    return '', '', '' if receivers.blank?
+    project = issue&.project
+    owner = project&.owner
+    content = sys_notice.gsub('{title}', issue&.subject)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+
+    return receivers_string(receivers), content, url
+  rescue => e
+    Rails.logger.info("MessageTemplate::IssueExpire.get_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+
+  def self.get_email_message_content(receiver, issue)
+    if receiver.user_template_message_setting.present? 
+      send_setting = receiver.user_template_message_setting.email_body["CreateOrAssign::IssueExpire"]
+      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["CreateOrAssign::IssueExpire"] : send_setting
+      return '', '', '' unless send_setting
+      project = issue&.project
+      owner = project&.owner 
+      title = email_title
+
+      content = email
+      content.gsub!('{receiver}', receiver&.real_name)
+      content.gsub!('{nickname}', owner&.real_name)
+      content.gsub!('{login}', owner&.login)
+      content.gsub!('{identifier}', project&.identifier)
+      content.gsub!('{repository}', project&.name)
+      content.gsub!('{baseurl}', base_url)
+      content.gsub!('{title}', issue&.subject)
+      content.gsub!('{id}', issue&.id.to_s)
+      content.gsub!('{platform}', PLATFORM)
+  
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+  rescue => e
+    Rails.logger.info("MessageTemplate::IssueExpire.get_email_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+end

app/models/message_template/organization_joined.rb

@@ -41,6 +41,7 @@ class MessageTemplate::OrganizationJoined < MessageTemplate
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{login}', organization&.login)
       content.gsub!('{organization}', organization&.real_name)
+      content.gsub!('{platform}', PLATFORM)
     
       return receiver&.mail, title, content
     else

app/models/message_template/organization_left.rb

@@ -41,6 +41,7 @@ class MessageTemplate::OrganizationLeft < MessageTemplate
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{login}', organization&.login)
       content.gsub!('{organization}', organization&.real_name)
+      content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content
     else

app/models/message_template/organization_role.rb

@@ -43,6 +43,7 @@ class MessageTemplate::OrganizationRole < MessageTemplate
       content.gsub!('{login}', organization&.login)
       content.gsub!('{organization}', organization&.real_name)
       content.gsub!('{role}', role)
+      content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content
     else

app/models/message_template/project_forked.rb

@@ -12,11 +12,21 @@
 #  email_title      :string(255)
 #
 
-# TODO 我管理的仓库被复刻
+# 我管理的仓库被复刻
 class MessageTemplate::ProjectForked < MessageTemplate
 
   # MessageTemplate::ProjectForked.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers)
+  def self.get_message_content(receivers, user, project)
+    receivers.each do |receiver|
+      if receiver.user_template_message_setting.present? 
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::Forked"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::Forked"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
+      end
+    end
+    return '', '', '' if receivers.blank?
+    content = sys_notice.gsub('{nickname1}', user&.real_name).gsub('{nickname2}', project&.owner&.real_name).gsub('{repository}', project&.name)
+    url = notification_url.gsub('{owner}', user&.login).gsub('{identifier}', project&.identifier)
     return receivers_string(receivers), content, url
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectForked.get_message_content [ERROR] #{e}")

app/models/message_template/project_issue.rb

@@ -56,6 +56,7 @@ class MessageTemplate::ProjectIssue < MessageTemplate
       content.gsub!('{identifier}', project&.identifier)
       content.gsub!('{id}', issue&.id.to_s)
       content.gsub!('{title}', issue&.subject)
+      content.gsub!('{platform}', PLATFORM)
       
       return receiver&.mail, title, content
     else

app/models/message_template/project_joined.rb

@@ -44,6 +44,7 @@ class MessageTemplate::ProjectJoined < MessageTemplate
       content.gsub!('{identifier}', project&.identifier)
       content.gsub!('{nickname}', project&.owner&.real_name)
       content.gsub!('{repository}', project&.name)
+      content.gsub!('{platform}', PLATFORM)
 
       return receiver&.mail, title, content
     else

app/models/message_template/project_left.rb

@@ -43,6 +43,7 @@ class MessageTemplate::ProjectLeft < MessageTemplate
       content.gsub!('{identifier}', project&.identifier)
       content.gsub!('{nickname}', project&.owner&.real_name)
       content.gsub!('{repository}', project&.name)
+      content.gsub!('{platform}', PLATFORM)
 
       return receiver&.mail, title, content
     else

app/models/message_template/project_member_joined.rb

@@ -48,6 +48,7 @@ class MessageTemplate::ProjectMemberJoined < MessageTemplate
       content.gsub!('{nickname1}', user&.real_name)
       content.gsub!('{nickname2}', project&.owner&.real_name)
       content.gsub!('{repository}', project&.name)
+      content.gsub!('{platform}', PLATFORM)
 
       return receiver&.mail, title, content
     else

app/models/message_template/project_member_left.rb

@@ -48,6 +48,7 @@ class MessageTemplate::ProjectMemberLeft < MessageTemplate
       content.gsub!('{nickname1}', user&.real_name)
       content.gsub!('{nickname2}', project&.owner&.real_name)
       content.gsub!('{repository}', project&.name)
+      content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content
     else

app/models/message_template/project_milestone.rb

@@ -12,14 +12,61 @@
 #  email_title      :string(255)
 #
 
-# TODO 我管理的仓库有新的里程碑
+# 我管理的仓库有新的里程碑
 class MessageTemplate::ProjectMilestone < MessageTemplate
 
   # MessageTemplate::ProjectMilestone.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers)
+  def self.get_message_content(receivers, operator, milestone)
+    receivers.each do |receiver|
+      if receiver.user_template_message_setting.present? 
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::Milestone"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::Milestone"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::Milestone"]
+      end
+    end
+    return '', '', '' if receivers.blank?
+    project = milestone&.project 
+    owner = project&.owner 
+    content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{name}', milestone&.name)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', milestone&.id.to_s)
+    
     return receivers_string(receivers), content, url
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectMilestone.get_message_content [ERROR] #{e}")
     return '', '', ''
   end
+
+  def self.get_email_message_content(receiver, operator, milestone)
+    if receiver.user_template_message_setting.present? 
+      send_setting = receiver.user_template_message_setting.email_body["ManageProject::Milestone"]
+      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::Milestone"] : send_setting
+      return '', '', '' unless send_setting
+      project = milestone&.project 
+      owner = project&.owner 
+      title = email_title
+      title.gsub!('{nickname1}', operator&.real_name)
+      title.gsub!('{nickname2}', owner&.real_name)
+      title.gsub!('{repository}', project&.name)
+  
+      content = email 
+      content.gsub!('{receiver}', receiver&.real_name)
+      content.gsub!('{baseurl}', base_url)
+      content.gsub!('{nickname1}', operator&.real_name)
+      content.gsub!('{nickname2}', owner&.real_name)
+      content.gsub!('{repository}', project&.name)
+      content.gsub!('{login}', owner&.login)
+      content.gsub!('{identifier}', project&.identifier)
+      content.gsub!('{id}', milestone&.id.to_s)
+      content.gsub!('{name}', milestone&.name)
+      content.gsub!('{platform}', PLATFORM)
+      
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+   
+  rescue => e
+    Rails.logger.info("MessageTemplate::ProjectMilestone.get_email_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
 end

app/models/message_template/project_milestone_completed.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::ProjectMilestoneCompleted < MessageTemplate
+
+  # MessageTemplate::ProjectMilestoneCompleted.get_message_content(User.where(login: 'yystopf'))
+  def self.get_message_content(receivers, milestone)
+    receivers.each do |receiver|
+      if receiver.user_template_message_setting.present? 
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::MilestoneCompleted"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::MilestoneCompleted"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
+      end
+    end
+    return '', '', '' if receivers.blank?
+    project = milestone&.project 
+    owner = project&.owner 
+    content = sys_notice.gsub('{nickname}', owner&.real_name).gsub('{repository}', project&.name).gsub('{name}', milestone&.name)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', milestone&.id.to_s)
+    
+    return receivers_string(receivers), content, url
+  rescue => e
+    Rails.logger.info("MessageTemplate::ProjectMilestoneCompleted.get_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+
+  def self.get_email_message_content(receiver, milestone)
+    if receiver.user_template_message_setting.present? 
+      send_setting = receiver.user_template_message_setting.email_body["ManageProject::MilestoneCompleted"]
+      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::MilestoneCompleted"] : send_setting
+      return '', '', '' unless send_setting
+      project = milestone&.project 
+      owner = project&.owner 
+      title = email_title
+      title.gsub!('{nickname}', owner&.real_name)
+      title.gsub!('{repository}', project&.name)
+  
+      content = email 
+      content.gsub!('{receiver}', receiver&.real_name)
+      content.gsub!('{baseurl}', base_url)
+      content.gsub!('{nickname}', owner&.real_name)
+      content.gsub!('{repository}', project&.name)
+      content.gsub!('{login}', owner&.login)
+      content.gsub!('{identifier}', project&.identifier)
+      content.gsub!('{id}', milestone&.id.to_s)
+      content.gsub!('{name}', milestone&.name)
+      content.gsub!('{platform}', PLATFORM)
+      
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+   
+  rescue => e
+    Rails.logger.info("MessageTemplate::ProjectMilestoneCompleted.get_email_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+end

app/models/message_template/project_praised.rb

@@ -12,11 +12,21 @@
 #  email_title      :string(255)
 #
 
-# TODO 我管理的仓库被点赞
+# 我管理的仓库被点赞
 class MessageTemplate::ProjectPraised < MessageTemplate
 
   # MessageTemplate::ProjectPraised.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers)
+  def self.get_message_content(receivers, user, project)
+    receivers.each do |receiver|
+      if receiver.user_template_message_setting.present? 
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::Praised"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::Praised"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
+      end
+    end
+    return '', '', '' if receivers.blank?
+    content = sys_notice.gsub('{nickname1}', user&.real_name).gsub('{nickname2}', project&.owner&.real_name).gsub('{repository}', project&.name)
+    url = notification_url.gsub('{login}', user&.login)
     return receivers_string(receivers), content, url
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectPraised.get_message_content [ERROR] #{e}")

app/models/message_template/project_pull_request.rb

@@ -56,6 +56,7 @@ class MessageTemplate::ProjectPullRequest < MessageTemplate
       content.gsub!('{identifier}', project&.identifier)
       content.gsub!('{id}', pull_request&.id.to_s)
       content.gsub!('{title}', pull_request&.title)
+      content.gsub!('{platform}', PLATFORM)
       
       return receiver&.mail, title, content
     else

app/models/message_template/project_role.rb

@@ -46,6 +46,7 @@ class MessageTemplate::ProjectRole < MessageTemplate
       content.gsub!('{identifier}', project&.identifier)
       content.gsub!('{repository}', project&.name)
       content.gsub!('{role}', role)
+      content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content
     else

app/models/message_template/project_setting_changed.rb

@@ -300,6 +300,7 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
       else
         content.gsub!(/({ifnavbar})(.*)({endnavbar})/, '') 
       end
+      content.gsub!('{platform}', PLATFORM)
       
       return receiver&.mail, title, content
     else

app/models/message_template/pull_request_assigned.rb

@@ -53,6 +53,7 @@ class MessageTemplate::PullRequestAssigned < MessageTemplate
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{title}', pull_request&.title)
       content.gsub!('{id}', pull_request&.id.to_s)
+      content.gsub!('{platform}', PLATFORM)
 
       return receiver&.mail, title, content
     else

app/models/message_template/pull_request_changed.rb

@@ -118,6 +118,7 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{title}', pull_request&.title)
       content.gsub!('{id}', pull_request&.id.to_s)
+      content.gsub!('{platform}', PLATFORM)
   
       change_count = change_params.keys.size
       # 合并请求审查成员修改

app/models/message_template/pull_request_closed.rb

@@ -51,6 +51,7 @@ class MessageTemplate::PullRequestClosed < MessageTemplate
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{title}', pull_request&.title)
       content.gsub!('{id}', pull_request&.id.to_s)
+      content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content
     else

app/models/message_template/pull_request_merged.rb

@@ -51,6 +51,7 @@ class MessageTemplate::PullRequestMerged < MessageTemplate
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{title}', pull_request&.title)
       content.gsub!('{id}', pull_request&.id.to_s)
+      content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content
     else

app/models/message_template/team_joined.rb

@@ -45,6 +45,7 @@ class MessageTemplate::TeamJoined < MessageTemplate
       content.gsub!('{organization}', organization&.real_name)
       content.gsub!('{team}', team&.nickname)
       content.gsub!('{role}', team&.authorize_name)
+      content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content
     else

app/models/message_template/team_left.rb

@@ -45,6 +45,7 @@ class MessageTemplate::TeamLeft < MessageTemplate
       content.gsub!('{organization}', organization&.real_name)
       content.gsub!('{team}', team&.nickname)
       content.gsub!('{role}', team&.authorize_name)
+      content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content
     else

app/models/project.rb

@@ -125,8 +125,8 @@ class Project < ApplicationRecord
   has_many :has_pinned_users, through: :pinned_projects, source: :user
   has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
   after_create :incre_user_statistic, :incre_platform_statistic
-  after_save :check_project_members, :reset_cache_data
-  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned
+  after_save :check_project_members
+  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data
   before_destroy :decre_project_common, :decre_forked_from_project_count
   after_destroy :decre_user_statistic, :decre_platform_statistic
   scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :description, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
@@ -150,7 +150,7 @@ class Project < ApplicationRecord
   end
 
   def reset_cache_data 
-    CacheAsyncResetJob.perform_later("project_common_service", self.id)
+    CacheAsyncResetJob.set(wait: 5.seconds).perform_later("project_common_service", self.id)
     if changes[:user_id].present?
       CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: -1}, changes[:user_id].first)
       CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1}, changes[:user_id].last)
@@ -163,6 +163,14 @@ class Project < ApplicationRecord
       CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: first_language&.name, project_language_count: -1})
       CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: last_language&.name, project_language_count: 1})
     end
+    if changes[:is_public].present?
+      if changes[:is_public][0] && !changes[:is_public][1]
+        CacheAsyncClearJob.perform_later('project_rank_service', self.id)
+      end
+      if !changes[:is_public][0] && changes[:is_public][1]
+        $redis_cache.srem("v2-project-rank-deleted", self.id)
+      end
+    end
   end
 
   def decre_project_common

app/models/team.rb

@@ -29,6 +29,11 @@ class Team < ApplicationRecord
   has_many :team_units, dependent: :destroy
   has_many :team_users, dependent: :destroy
 
+  scope :like, lambda { |keywords|
+    sql = "teams.nickname LIKE :search OR teams.name LIKE :search"
+    where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
+  }
+
   validates :name, uniqueness: {scope: :organization_id}
 
   enum authorize: {read: 1, write: 2, admin: 3, owner: 4}

app/models/team_user.rb

@@ -29,7 +29,7 @@ class TeamUser < ApplicationRecord
   before_destroy :remove_project_member
 
   def self.build(organization_id, user_id, team_id)
-    self.create!(organization_id: organization_id, user_id: user_id, team_id: team_id)
+    self.find_or_create_by!(organization_id: organization_id, user_id: user_id, team_id: team_id)
   end
 
   def remove_project_member

app/models/template_message_setting.rb

@@ -22,6 +22,7 @@ class TemplateMessageSetting < ApplicationRecord
   end
 
   def self.build_init_data
+    TemplateMessageSetting.destroy_all
     TemplateMessageSetting::CreateOrAssign.build_init_data
     TemplateMessageSetting::ManageProject.build_init_data
     TemplateMessageSetting::Normal.build_init_data

app/models/template_message_setting/create_or_assign.rb

@@ -27,5 +27,6 @@ class TemplateMessageSetting::CreateOrAssign < TemplateMessageSetting
   def self.build_init_data
     self.find_or_create_by(name: "疑修状态变更", key: "IssueChanged")
     self.find_or_create_by(name: "合并请求状态变更", key: "PullRequestChanged")
+    self.find_or_create_by(name: "疑修截止日期到达最后一天", key: "IssueExpire", notification_disabled: false)
   end
 end

app/models/template_message_setting/manage_project.rb

@@ -29,5 +29,9 @@ class TemplateMessageSetting::ManageProject < TemplateMessageSetting
     self.find_or_create_by(name: "有新的合并请求", key: "PullRequest")
     self.find_or_create_by(name: "有成员变动", key: "Member")
     self.find_or_create_by(name: "仓库设置被更改", key: "SettingChanged")
+    self.find_or_create_by(name: "被点赞", key: "Praised", notification_disabled: false, email_disabled: true)
+    self.find_or_create_by(name: "被fork", key: "Forked", notification_disabled: false, email_disabled: true)
+    self.find_or_create_by(name: "有新的里程碑", key: "Milestone", notification_disabled: false)
+    self.find_or_create_by(name: "有里程碑已完成", key: "MilestoneCompleted", notification_disabled: false)
   end
 end

app/models/topic.rb

@@ -35,6 +35,8 @@ class Topic < ApplicationRecord
       'Topic::ExcellentProject'
     when 'experience_forum'
       'Topic::ExperienceForum'
+    when "glcc_news"
+      'Topic::GlccNews'
     when 'pinned_forum'
       'Topic::PinnedForum'
     end

app/models/topic/glcc_news.rb

@@ -0,0 +1,17 @@
+# == Schema Information
+#
+# Table name: topics
+#
+#  id          :integer          not null, primary key
+#  type        :string(255)
+#  title       :string(255)
+#  uuid        :integer
+#  image_url   :string(255)
+#  url         :string(255)
+#  order_index :integer
+#
+
+# GLCC 新闻稿
+class Topic::GlccNews < Topic 
+  
+end

app/models/trace_user.rb

@@ -0,0 +1,58 @@
+# == Schema Information
+#
+# Table name: trace_users
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  username   :string(255)
+#  password   :string(255)
+#  unit       :string(255)
+#  telnumber  :string(255)
+#  email      :string(255)
+#  name       :string(255)
+#  token      :text(65535)
+#  expired_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_trace_users_on_user_id  (user_id)
+#
+
+# 代码溯源 用户
+class TraceUser < ApplicationRecord
+
+  belongs_to :user
+
+
+  def build_self_data
+    return if user.nil? 
+
+    self.username = user.login 
+    self.password = SecureRandom.hex
+    self.unit = user.custom_department.blank? ? 'GitLink' : user.custom_department
+    self.telnumber = user.phone.blank? ? '13800000000' : user.phone
+    self.email = user.mail 
+    self.name = user.nickname.blank? ? user.login : user.nickname 
+
+    self
+  end
+
+
+  def build_token 
+    return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? 
+
+    response = Trace::AddUserService.call(username, password, unit, telnumber, email, name)
+    self.token = response[1]['token']
+    self.expired_at = Time.now + 1.hours
+  end
+
+  def refresh_token 
+    return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? 
+
+    response = Trace::LoginService.call(username, password)
+    self.token = response[1]['token']
+    self.expired_at = Time.now + 1.hours
+  end
+end

app/models/user.rb

@@ -174,6 +174,7 @@ class User < Owner
 
   has_many :system_notification_histories
   has_many :system_notifications, through: :system_notification_histories
+  has_one :trace_user, dependent: :destroy
   
   # Groups and active users
   scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
@@ -789,6 +790,24 @@ class User < Owner
     self.nickname.present? && self.mail.present?
   end
 
+  def trace_token 
+    if trace_user.present?
+      if trace_user.expired_at < Time.now
+        trace_user.refresh_token
+        trace_user.save
+      end
+      return trace_user.token
+    else
+      tu = TraceUser.new
+      tu.user = self
+      tu.build_self_data
+      tu.build_token 
+      tu.save
+
+      return tu.token
+    end
+  end
+
   protected
   def validate_password_length
     # 管理员的初始密码是5位

app/models/user_template_message_setting.rb

@@ -35,10 +35,15 @@ class UserTemplateMessageSetting < ApplicationRecord
       "Normal::PullRequestAssigned": true,
       "CreateOrAssign::IssueChanged": true,
       "CreateOrAssign::PullRequestChanged": true,
+      "CreateOrAssign::IssueExpire": true,
       "ManageProject::Issue": true,
       "ManageProject::PullRequest": true,
       "ManageProject::Member": true,
       "ManageProject::SettingChanged": true,
+      "ManageProject::Praised": true,
+      "ManageProject::Forked": true,
+      "ManageProject::Milestone": true,
+      "ManageProject::MilestoneCompleted": true,
     }.stringify_keys!
   end
 
@@ -51,10 +56,15 @@ class UserTemplateMessageSetting < ApplicationRecord
       "Normal::PullRequestAssigned": false,
       "CreateOrAssign::IssueChanged": false,
       "CreateOrAssign::PullRequestChanged": false,
+      "CreateOrAssign::IssueExpire": false,
       "ManageProject::Issue": false,
       "ManageProject::PullRequest": false,
       "ManageProject::Member": false,
       "ManageProject::SettingChanged": false,
+      "ManageProject::Praised": false,
+      "ManageProject::Forked": false,
+      "ManageProject::Milestone": false,
+      "ManageProject::MilestoneCompleted": false,
     }.stringify_keys!
   end
 

app/models/version.rb

@@ -40,8 +40,19 @@ class Version < ApplicationRecord
   #   issues.select(:id,:status_id).where(status_id: 5).size
   # end
 
+  after_create :send_create_message_to_notice_system
+  after_save :send_update_message_to_notice_system
+
   def version_user
     User.select(:login, :lastname,:firstname, :nickname)&.find_by_id(self.user_id)
   end
 
+  private 
+  def send_create_message_to_notice_system
+    SendTemplateMessageJob.perform_later('ProjectMilestone', self.id, self.user_id) if Site.has_notice_menu?
+  end
+
+  def send_update_message_to_notice_system
+    SendTemplateMessageJob.perform_later('ProjectMilestoneCompleted', self.id) if Site.has_notice_menu? && self.percent == 1.0
+  end
 end

app/services/cache/v2/user_date_rank_service.rb

@@ -16,15 +16,15 @@ class Cache::V2::UserDateRankService < ApplicationService
   end
 
   def read_rank
-    user_rank
+    user_rank unless @user_id.blank?
   end
 
   def read_statistic
-    user_statistic
+    user_statistic unless @user_id.blank?
   end
 
   def call 
-    set_user_rank
+    set_user_rank unless @user_id.blank?
   end
 
   private 

app/services/gitea/client_service.rb

@@ -82,7 +82,7 @@ class Gitea::ClientService < ApplicationService
         req.headers['Content-Type'] = 'application/json'
         req.response :logger # 显示日志
         req.adapter Faraday.default_adapter
-        req.options.timeout = 100           # open/read timeout in seconds
+        req.options.timeout = 1200           # open/read timeout in seconds
         req.options.open_timeout = 10      # connection open timeout in seconds
         if token.blank?
           req.basic_auth(username, secret)

app/services/issues/list_query_service.rb

@@ -28,11 +28,11 @@ class Issues::ListQueryService < ApplicationService
     end
 
     if search_name.present?
-      issues = issues.where("subject LIKE ? OR description LIKE ? ", "%#{search_name}%", "%#{search_name}%")
+      issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%")
     end
 
     if start_time&.present? || end_time&.present?
-      issues = issues.where("start_date between ? and ?",start_time&.present? ? start_time.to_date : Time.now.to_date, end_time&.present? ? end_time.to_date : Time.now.to_date)
+      issues = issues.where("issues.start_date between ? and ?",start_time&.present? ? start_time.to_date : Time.now.to_date, end_time&.present? ? end_time.to_date : Time.now.to_date)
     end
 
     issues = issues.where(author_id: params[:author_id]) if params[:author_id].present? && params[:author_id].to_s != "all"

app/services/projects/fork_service.rb

@@ -33,7 +33,8 @@ class Projects::ForkService < ApplicationService
       new_repository.update_column('url', result['clone_url']) if result
       
       ForkUser.create(project_id: @project.id, fork_project_id: clone_project.id, user_id: clone_project.user_id)
-
+      SendTemplateMessageJob.perform_later('ProjectForked', @target_owner.id, @project.id) if Site.has_notice_menu?
+      
       clone_project
     end
   rescue => e

app/services/projects/transfer_service.rb

@@ -14,6 +14,7 @@ class Projects::TransferService < ApplicationService
       update_owner
       update_repo_url
       update_visit_teams
+      update_fork_info
     end
 
     Rails.logger.info("##### Project transfer_service end ######")
@@ -40,6 +41,11 @@ class Projects::TransferService < ApplicationService
     end
   end
 
+  def update_fork_info
+    fork_user = ForkUser.find_by(user_id: @owner.id, fork_project_id: @project.id)
+    fork_user.update(user_id: @new_owner.id) if fork_user.present?
+  end
+
   def gitea_update_owner
     begin
       @gitea_repo = Gitea::Repository::TransferService.call(owner&.gitea_token, owner&.login, project.identifier, new_owner&.login)

app/services/pull_requests/create_service.rb

@@ -125,12 +125,15 @@ class PullRequests::CreateService < ApplicationService
   end
 
   def gitea_pull_request_params
-    merge_original_pull_params.except(:milestone)
+    assignee_login = User.find_by_id(params[:assigned_to_id])&.login
+    merge_original_pull_params.except(:milestone).merge(      
+      # assignees: ["#{params[:assigned_login].to_s}"],
+      assignees: ["#{assignee_login.to_s}"])
   end
 
   def merge_original_pull_params
-    base_pull_params[:head] = CGI.escape(base_pull_params[:head])
-    base_pull_params[:base] = CGI.escape(base_pull_params[:base])
+    base_pull_params[:head] = Addressable::URI.escape(base_pull_params[:head])
+    base_pull_params[:base] = Addressable::URI.escape(base_pull_params[:base])
     if pull_request.is_original && @params[:merge_user_login]
       base_pull_params.merge(head: "#{@params[:merge_user_login]}:#{base_pull_params[:head]}")
     else
@@ -154,6 +157,7 @@ class PullRequests::CreateService < ApplicationService
     raise "head参数不能为空" if @params[:head].blank?
     raise "base参数不能为空" if @params[:base].blank?
     raise "fork_project_id参数错误" if is_original && !@project.forked_projects.pluck(:id).include?(@params[:fork_project_id].to_i)
+    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:user).where(users: {login: @params[:merge_user_login]}).blank?
     raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !is_original
     raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: is_original, fork_project_id: @params[:fork_project_id]).present?
     raise @pull_issue.errors.full_messages.join(", ") unless pull_issue.valid?
@@ -162,7 +166,7 @@ class PullRequests::CreateService < ApplicationService
 
   def compare_head_base!
     head = pull_request.is_original && @params[:merge_user_login] ? "#{@params[:merge_user_login]}/#{@project.identifier}:#{@params[:head]}" : @params[:head]
-    compare_result = Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, CGI.escape(@params[:base]), CGI.escape(head), @current_user.gitea_token)
+    compare_result = Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, Addressable::URI.escape(@params[:base]), Addressable::URI.escape(head), @current_user.gitea_token)
     raise '分支内容相同，无需创建合并请求' if compare_result["Commits"].blank? && compare_result["Diff"].blank?
   end
 

app/services/trace/add_user_service.rb

@@ -0,0 +1,37 @@
+# 代码溯源 添加用户
+class Trace::AddUserService  < Trace::ClientService
+
+  # 用户名 密码 单位 手机号 邮箱 昵称
+  attr_accessor :username, :password, :unit, :telnumber, :email, :name
+
+  def initialize(username, password, unit, telnumber, email, name) 
+    @username = username 
+    @password = password
+    @unit = unit 
+    @telnumber = telnumber
+    @email = email 
+    @name = name
+  end
+
+  def call 
+    result = post(url, {data: request_params})
+    response = render_response(result)
+  end
+
+  private 
+
+  def request_params 
+    {
+      username: username,
+      password: password, 
+      unit: unit, 
+      telnumber: telnumber,
+      email: email,
+      name: name
+    }
+  end
+
+  def url
+    "/user/addccfuser".freeze
+  end
+end

app/services/trace/check_result_service.rb

@@ -0,0 +1,33 @@
+# 代码溯源 查询检测结果
+class Trace::CheckResultService < Trace::ClientService
+
+  attr_accessor :token, :project_name, :file_name, :page_num, :page_size
+
+  def initialize(token, project_name=nil, file_name=nil, page_num=1, page_size=15) 
+    @token = token 
+    @project_name = project_name 
+    @file_name = file_name
+    @page_num = page_num
+    @page_size = page_size
+  end
+
+  def call
+    result = authed_get(token, url, request_params)
+    reponse = render_response(result)
+  end
+
+  private 
+  def request_params 
+    {
+      product_name: project_name, 
+      file_name: file_name,
+      pageNum: page_num,
+      pageSize: page_size,
+    }
+  end
+
+  def url 
+    "/user/checkresult".freeze
+  end
+end
+

app/services/trace/check_service.rb

@@ -0,0 +1,36 @@
+# 代码溯源 开始检测
+class Trace::CheckService < Trace::ClientService
+
+  attr_accessor :token, :project, :if_branch, :branch_tag 
+
+  def initialize(token, project, if_branch, branch_tag) 
+    @token = token 
+    @project = project 
+    @if_branch = if_branch
+    @branch_tag = branch_tag
+  end
+
+  def call
+    result = 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)
+    {
+      product_name: project&.name, 
+      product_type: project&.category&.name,
+      code_type: project&.language&.name,
+      product_desc: project&.description,
+      git_url: repo['clone_url'],
+      if_branch: if_branch,
+      branch_tag: branch_tag
+    }
+  end
+
+  def url 
+    "/user/check".freeze
+  end
+end
+

app/services/trace/client_service.rb

@@ -0,0 +1,143 @@
+class Trace::ClientService < ApplicationService
+
+  def post(url, params={})
+    puts "[trace][POST] request params: #{params}"
+    conn.post do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json 
+    end
+  end
+
+  def authed_post(token, url, params={})
+    puts "[trace][POST] request params: #{params}"
+    puts "[trace][POST] request token: #{token}"
+    conn.post do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json 
+      req.headers['Authorization'] = token
+    end
+  end
+
+  def get(url, params={})
+    puts "[trace][GET] request params: #{params}"
+    conn.get do |req|
+      req.url full_url(url, 'get')
+      params.each_pair do |key, value|
+        req.params["#{key}"] = value
+      end
+    end
+  end
+
+  def authed_get(token, url, params={})
+    puts "[trace][GET] request params: #{params}"
+    puts "[trace][GET] request token: #{token}"
+    conn.get do |req|
+      req.url full_url(url, 'get')
+      params.each_pair do |key, value|
+        req.params["#{key}"] = value
+      end
+      req.headers['Authorization'] = token
+    end
+  end
+
+  def delete(url, params={})
+    puts "[trace][DELETE] request params: #{params}"
+    conn.delete do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+    end
+  end
+
+  def authed_delete(token, url, params={})
+    puts "[trace][DELETE] request params: #{params}"
+    puts "[trace][DELETE] request token: #{token}"
+    conn.delete do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+      req.headers['Authorization'] = token
+    end
+  end
+
+  def patch(url, params={})
+    puts "[trace][PATCH] request params: #{params}"
+    conn.patch do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+    end
+  end
+
+  def authed_patch(token, url, params={})
+    puts "[trace][PATCH] request params: #{params}"
+    puts "[trace][PATCH] request token: #{token}"
+    conn.patch do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+      req.headers['Authorization'] = token
+    end
+  end
+
+  def put(url, params={})
+    puts "[trace][PUT] request params: #{params}"
+    conn.put do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+    end
+  end
+
+  def authed_put(token, url, params={})
+    puts "[trace][PUT] request params: #{params}"
+    puts "[trace][PUT] request token: #{token}"
+    conn.put do |req|
+      req.url full_url(url)
+      req.body = params[:data].to_json
+      req.headers['Authorization'] = token
+    end
+  end
+
+  private 
+  def conn 
+    @client ||= begin
+      Faraday.new(url: domain) do |req|
+        req.request :url_encoded
+        req.headers['Content-Type'] = 'application/json'
+        req.adapter Faraday.default_adapter
+      end
+    end
+
+    @client
+  end
+
+  def base_url 
+    Trace.trace_config[:base_url]
+  end
+
+  def domain
+    Trace.trace_config[:domain]
+  end
+
+  def api_url
+    [domain, base_url].join('')
+  end
+
+  def full_url(api_rest, action='post')
+    url = [api_url, api_rest].join('').freeze
+    url = action === 'get' ? url : URI.escape(url)
+    url = URI.escape(url) unless url.ascii_only?
+    puts "[trace] request url: #{url}"
+    return url
+  end
+  
+  def log_error(status, body)
+    puts "[trace] status:  #{status}"
+    puts "[trace] body:    #{body}"
+  end
+
+  def render_response(response)
+    status = response.status
+    body = JSON.parse(response&.body)
+
+    log_error(status, body)
+
+    return [body["code"], body["Data"], body["Error"]]
+  end
+end

app/services/trace/login_service.rb

@@ -0,0 +1,29 @@
+# 代码溯源 用户登录
+class Trace::LoginService  < Trace::ClientService
+
+  # 用户名 密码
+  attr_accessor :username, :password
+
+  def initialize(username, password) 
+    @username = username 
+    @password = password
+  end
+
+  def call 
+    result = post(url, {data: request_params})
+    response = render_response(result)
+  end
+
+  private 
+
+  def request_params 
+    {
+      username: username,
+      password: password, 
+    }
+  end
+
+  def url
+    "/user/login".freeze
+  end
+end

app/services/trace/pdf_report_service.rb

@@ -0,0 +1,26 @@
+# 代码溯源 导出pdf
+class Trace::PdfReportService < Trace::ClientService
+  
+  attr_accessor :token, :task_id 
+
+  def initialize(token, task_id)
+    @token = token 
+    @task_id = task_id
+  end
+
+  def call 
+    result = authed_get(token, url, request_params)
+    response = render_response(result)
+  end
+
+  private 
+  def request_params 
+    {
+      task_id: task_id
+    }
+  end
+
+  def url
+    "/user/pdfreport".freeze
+  end
+end

app/services/trace/reload_check_service.rb

@@ -0,0 +1,25 @@
+# 代码溯源 重新检测
+class Trace::ReloadCheckService < Trace::ClientService
+
+  attr_accessor :token, :fake_project_id 
+  def initialize(token, fake_project_id)
+    @token = token
+    @fake_project_id = fake_project_id
+  end
+
+  def call
+    result = authed_post(token, url, {data: request_params})
+    response = render_response(result)
+  end
+
+  private 
+  def request_params 
+    {
+      project_id: fake_project_id
+    }
+  end
+
+  def url 
+    '/user/reloadcheck'.freeze
+  end
+end

app/views/admins/shared/_sidebar.html.erb

@@ -42,7 +42,11 @@
         <li><%= sidebar_item(admins_topic_cooperators_path, '合作伙伴管理', icon: 'user', controller: 'admins-topic-cooperators') %></li>
       <% end %>
     </li>
-    
+    <li>
+      <%= sidebar_item_group('#setting-glcc', 'GLCC配置', icon: 'fire') do %>
+        <li><%= sidebar_item(admins_topic_glcc_news_index_path, '新闻稿管理', icon: 'edit', controller: 'admins-topic-glcc_news') %></li>
+      <% end %>
+    </li>
     <li>
       <%= sidebar_item_group('#setting-submenu', '网站建设', icon: 'cogs') do %>
         <li><%= sidebar_item(admins_faqs_path, 'FAQ', icon: 'question-circle', controller: 'admins-faqs') %></li>

app/views/admins/sites/_form.html.erb

@@ -29,7 +29,7 @@
           </div>
           <div class="form-group ">
             <label for="status">类型：</label>
-            <%= p.select :site_type, options_for_select(Site.site_types.map { |key, value| [key.humanize, key] }), {}, class: "form-control" %>
+            <%= p.select :site_type, options_for_select(Site.site_types.map { |key, value| [key.humanize, key] }, @site.site_type), {}, class: "form-control" %>
           </div>
         </div>
         <div class="modal-footer">

app/views/admins/topic/glcc_news/_form_modal.html.erb

@@ -0,0 +1,44 @@
+<div class="modal fade glcc-news-change-modal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><%= type == "create" ? "新增" : "编辑" %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+       <%= form_for @glcc, url: {controller: "topic/glcc_news", action: "#{type}"} do |p| %>
+        <div class="modal-body">
+          <div class="form-group">
+            <label>
+              标题 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_field :title,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="form-group">
+            <label>
+              跳转地址 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_field :url,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="form-group">
+            <label>
+              帖子ID <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_field :uuid,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="form-group">
+          <label>
+            排序等级 
+          </label>
+          <%= p.number_field :order_index, class: "form-control",placeholder: ""%>
+        </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+          <%= p.submit "确认", class: "btn btn-primary submit-btn" %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

app/views/admins/topic/glcc_news/_list.html.erb

@@ -0,0 +1,33 @@
+<table class="table table-hover text-center subject-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="5%">序号</th>
+    <th width="20%">标题</th>
+    <th width="20%">跳转地址</th>
+    <th width="10%">帖子ID</th>
+    <th width="20%">排序等级</th>
+    <th width="25%">操作</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if glcc_news.present? %>
+    <% glcc_news.each_with_index do |news, index| %>
+      <tr class="glcc-news-item-<%= news.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
+        <td><%= news.title %></td>
+        <td><%= news.url %></td>
+        <td><%= news.uuid %></td>
+        <td><%= news.order_index %></td>
+        <td class="action-container">
+          <%= link_to "编辑", edit_admins_topic_glcc_news_path(news), remote: true, class: "action" %>
+          <%= link_to "删除", admins_topic_glcc_news_path(news), method: :delete, data:{confirm: "确认删除的吗？"}, class: "action" %>
+        </td>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: glcc_news } %>

app/views/admins/topic/glcc_news/edit.js.erb

@@ -0,0 +1,2 @@
+$("#glcc-news-modals").html("<%= j render(partial: 'admins/topic/glcc_news/form_modal', locals: {type: 'update'}) %>")
+$(".glcc-news-change-modal").modal('show');

app/views/admins/topic/glcc_news/index.html.erb

@@ -0,0 +1,18 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('新闻稿管理') %>
+<% end %>
+
+<div class="box search-form-container project-list-form">
+  <%= form_tag(admins_topic_glcc_news_index_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 "新增", new_admins_topic_glcc_news_path, remote: true, class: "btn btn-primary pull-right", "data-disabled-with":"...新增" %> 
+</div>
+
+<div class="box admin-list-container glcc-news-list-container">
+  <%= render partial: 'admins/topic/glcc_news/list', locals: { glcc_news: @glcc_news } %>
+</div>
+<div id="glcc-news-modals">
+</div>

app/views/admins/topic/glcc_news/index.js.erb

@@ -0,0 +1 @@
+$('.glcc-news-list-container').html("<%= j( render partial: 'admins/topic/glcc_news/list', locals: { glcc_news: @glcc_news } ) %>");

app/views/admins/topic/glcc_news/new.js.erb

@@ -0,0 +1,2 @@
+$("#glcc-news-modals").html("<%= j render(partial: 'admins/topic/glcc_news/form_modal', locals: {type: 'create'}) %>")
+$(".glcc-news-change-modal").modal('show');

app/views/organizations/organization_users/_detail.json.jbuilder

@@ -3,5 +3,5 @@ json.user do
   json.partial! "organizations/user_detail", user: org_user.user
 end
 
-json.team_names org_user.teams.pluck(:name)
+json.team_names org_user.teams.pluck(:nickname)
 json.created_at org_user.created_at.strftime("%Y-%m-%d")

app/views/projects/fork_users.json.jbuilder

@@ -1,7 +1,7 @@
 json.count @forks_count
 json.users do
   json.array! @fork_users.each do |f|
-    user = f.user
+    user = f.user.present? ? f.user : Organization.find_by(id: f.user_id)
     json.id f.fork_project.id
     json.identifier f.fork_project.identifier
     json.name "#{user.try(:show_real_name)}/#{f.fork_project.try(:name)}"

app/views/repositories/_simple_entry.json.jbuilder

@@ -1,4 +1,5 @@
 if @project.forge?
+  is_dir = @sub_entries.is_a?(Array)
   file_name = entry['name']
   file_type = File.extname(file_name.to_s)[1..-1]
   direct_download = download_type(file_type)
@@ -9,16 +10,16 @@ if @project.forge?
   json.type entry['type']
   json.size entry['size']
 
-  json.content decode64_content(entry, @owner, @repository, @ref, @path)
+  json.content (direct_download || image_type || is_dir) ? nil : decode64_content(entry, @owner, @repository, @ref, @path)
   json.target entry['target']
   
   download_url = 
     if image_type
       dir_path = [@owner.login, @repository.identifier, "raw/branch", @ref].join('/')
-      render_download_image_url(dir_path, entry['path'], decode64_content(entry, @owner, @repository, @ref))
+      is_dir ? "" : render_download_image_url(dir_path, entry['path'], decode64_content(entry, @owner, @repository, @ref))
     else
       # entry['download_url']
-      render_download_file_url(@owner, @repository, entry['path'].to_s, @ref)
+      is_dir ? "" : render_download_file_url(@owner, @repository, entry['path'].to_s, @ref)
     end
   json.download_url download_url
 

app/views/repositories/detail.json.jbuilder

@@ -49,6 +49,14 @@ if @result[:repo]
   json.empty @result[:repo]['empty']
   json.full_name @result[:repo]['full_name']
   json.private @result[:repo]['private']
+else  
+  json.size 0
+  json.ssh_url nil 
+  json.clone_url nil
+  json.default_branch 'master' 
+  json.empty nil 
+  json.full_name nil
+  json.private !@project.is_public
 end
 json.license_name @project.license_name
 json.branches_count @result[:branch_tag_total_count].present? ? (@result[:branch_tag_total_count]['branch_count'] || 0) : 0

app/views/settings/show.json.jbuilder

@@ -18,7 +18,7 @@ json.setting do
   #
   # end
 
-  nav_bar = default_setting.navbar
+  # nav_bar = default_setting.navbar
 
   # if User.current.logged?
   #   nav_bar[2]["link"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects"
@@ -39,7 +39,7 @@ json.setting do
   json.moop_cases_banner_url default_setting.moop_cases_banner_url&.[](1..-1)
   json.oj_banner_url default_setting.oj_banner_url&.[](1..-1)
 
-  json.navbar nav_bar
+  json.navbar @navbar
 
   json.footer default_setting.footer