Merge pull request '20240326版本' (#344) from develop into master

新增：删除者信息

.gitignore

@@ -10,7 +10,7 @@
 
 # Ignore lock config file
 *.log
-
+.env
 # mac
 *.DS_Store
 .bashrc
@@ -84,4 +84,5 @@ redis_data/
 dump.rdb
 .tags*
 ceshi_user.xlsx
-public/trace_task_results
+public/trace_task_results
+public/项目活跃度排行.xls

Dockerfile

@@ -41,11 +41,19 @@ RUN /bin/bash -l -c 'gem install puma -v 5.6.5'
 RUN rm -rf Gemfile.lock
 
 RUN cp config/configuration.yml.example config/configuration.yml
-RUN cp config/database.yml.example config/database.yml
+RUN cp config/database-docker.yml.example config/database.yml
 RUN touch config/redis.yml
 RUN touch config/elasticsearch.yml
 
 RUN /bin/bash -l -c 'bundle install'
 
-#EXPOSE 4000
-#RUN /bin/bash -l -c 'RAILS_ENV=production puma'
+RUN redis-server &
+
+RUN /bin/bash -l -c 'bundle exec rake sync_table_structure:import_csv'
+
+RUN /bin/bash -l -c 'rails db:migrate RAILS_ENV=development'
+
+RUN /bin/bash -l -c 'bundle exec sidekiq -C config/sidekiq.yml -e production -d'
+
+EXPOSE 4000
+RUN /bin/bash -l -c 'RAILS_ENV=production puma -C config/puma.rb'

Gemfile

@@ -141,4 +141,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.4.2'
+gem 'gitea-client', '~> 1.4.6'

Gemfile.lock

@@ -245,13 +245,12 @@ GEM
     powerpack (0.1.2)
     prettier (0.18.2)
     public_suffix (4.0.3)
-    puma (3.12.2)
+    puma (5.6.5)
+      nio4r (~> 2.0)
     raabro (1.4.0)
     rack (2.0.9)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-mini-profiler (2.0.1)
-      rack (>= 1.2.0)
     rack-protection (2.0.8.1)
       rack
     rack-test (1.1.0)
@@ -514,9 +513,8 @@ DEPENDENCIES
   parallel (~> 1.19, >= 1.19.1)
   pdfkit
   prettier
-  puma (~> 3.11)
+  puma (~> 5.6.5)
   rack-cors
-  rack-mini-profiler
   rails (~> 5.2.0)
   rails-i18n (~> 5.1)
   ransack
@@ -538,7 +536,7 @@ DEPENDENCIES
   sidekiq-cron (= 1.2.0)
   sidekiq-failures
   simple_form
-  simple_xlsx_reader
+  simple_xlsx_reader (~> 1.0.4)
   sinatra
   solargraph (~> 0.38.0)
   spreadsheet

README.md

@@ -3,7 +3,8 @@
 GitLink（确实开源）是中国计算机学会（CCF）官方指定的开源创新服务平台，旨在以“为开源创新服务”为使命，以“成为开源创新的汇聚地”为愿景，秉承“创新、开放、协作、共享”的价值观，致力于为大规模开源开放协同创新助力赋能，打造创新成果孵化和新工科人才培养的开源创新生态！
 
 <center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/master/docs/figs/gitlink.png?raw=true" width=80% /></center>
+<img src="docs/figs/gitlink.png" width=80% /></center>
+
     
 ## 特色功能
 
@@ -174,31 +175,31 @@ http://localhost:3000/
 - 项目列表
 
 <center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/master/docs/figs/project_list.png?raw=true" width=50% />
+<img src="docs/figs/project_list.png" width=80% />
 </center>
         
 - 代码仓库
             
 <center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/master/docs/figs/repo.png?raw=true" width=50% />
+<img src="docs/figs/repo.png" width=80% />
 </center>
                     
 - 任务管理
             
 <center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/master/docs/figs/issues.png?raw=true" width=50% />
+<img src="docs/figs/issues.png" width=80% />
 </center>
                     
 - 合并请求
             
 <center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/master/docs/figs/PR.png?raw=true" width=50% />
+<img src="docs/figs/PR.png" width=80% />
 </center>
                   
 - 引擎配置
             
 <center>
-<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/master/docs/figs/engine.png?raw=true" width=50% />
+<img src="docs/figs/engine.png" width=80% />
 </center>
 
 

app/assets/javascripts/admins/glcc_pr_check.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/admins/identity_verifications.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/admins/laboratories/edit.js

@@ -63,7 +63,7 @@ $(document).on('turbolinks:load', function() {
 
       if(!valid) return;
       $.ajax({
-        method: 'PATCH',
+        method: 'PUT',
         dataType: 'json',
         url: $form.attr('action'),
         data: new FormData($form[0]),

app/assets/javascripts/admins/organizations/index.js

@@ -0,0 +1,65 @@
+$(document).on('turbolinks:load', function(){
+  if ($('body.admins-organizations-index-page').length > 0) {
+    var showSuccessNotify = function() {
+      $.notify({
+        message: '操作成功'
+      },{
+        type: 'success'
+      });
+    }
+
+    //  organizations open cla
+    $('.organizations-list-container').on('click', '.open-cla-action', function(){
+      var $openClaAction = $(this);
+      var $closeClaAction = $openClaAction.siblings('.close-cla-action');
+
+      var userId = $openClaAction.data('id');
+      customConfirm({
+        content: '确认开通吗？',
+        ok: function () {
+          $.ajax({
+            url: '/admins/organizations/' + userId + '/open_cla',
+            method: 'POST',
+            dataType: 'json',
+            success: function() {
+              showSuccessNotify();
+              $closeClaAction.show();
+              $openClaAction.hide();
+            },
+            error: function(res){
+              $.notify({ message: res.responseJSON.message }, { type: 'danger' });
+            }
+          });
+        }
+      })
+    });
+
+     //  organizations close cla
+    $('.organizations-list-container').on('click', '.close-cla-action', function(){
+      var $closeClaAction  = $(this);
+      var $openClaAction= $closeClaAction.siblings('.open-cla-action');
+
+      var userId = $openClaAction.data('id');
+      customConfirm({
+        content: '确认关闭吗？',
+        ok: function () {
+          $.ajax({
+            url: '/admins/organizations/' + userId + '/close_cla',
+            method: 'POST',
+            dataType: 'json',
+            success: function() {
+              showSuccessNotify();
+              $openClaAction.show();
+              $closeClaAction.hide();
+            },
+            error: function(res){
+              $.notify({ message: res.responseJSON.message }, { type: 'danger' });
+            }
+          });
+        }
+      })
+    });
+
+    
+  }
+});

app/assets/javascripts/admins/page_themes.js

@@ -0,0 +1,3 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
+

app/assets/javascripts/admins/site_pages.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/identity_verifications.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/organizations/clas.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/pages.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/users/clas.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/stylesheets/admins/glcc_pr_check.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the admins/glcc_pr_check controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/admins/identity_verifications.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the admins/identity_verifications controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/admins/page_themes.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the admins/page_themes controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/admins/site_pages.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the admins/site_pages controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/identity_verifications.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the identity_verifications controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/organizations/clas.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the organizations/clas controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/pages.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the pages controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/users/clas.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the users/clas controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/accounts_controller.rb

@@ -4,15 +4,16 @@ class AccountsController < ApplicationController
 
   #skip_before_action :check_account, :only => [:logout]
 
-  def simple_update 
+  def simple_update
     simple_update_params.merge!(username: params[:username]&.gsub(/\s+/, ""))
     simple_update_params.merge!(email: params[:email]&.gsub(/\s+/, ""))
     simple_update_params.merge!(platform: (params[:platform] || 'forge')&.gsub(/\s+/, ""))
-    Register::RemoteForm.new(simple_update_params).validate!
+    Register::RemoteForm.new(simple_update_params.merge(user_id: current_user.id)).validate!
 
     ActiveRecord::Base.transaction do 
       result = auto_update(current_user, simple_update_params)
       if result[:message].blank?
+        UserAction.create(:action_id => current_user.id, :action_type => "sync_educoder_user", :user_id => current_user.id, :ip => request.remote_ip) if params[:platform] == "educoder"
         render_ok
       else
         render_error(result[:message])
@@ -160,8 +161,11 @@ class AccountsController < ApplicationController
           successful_authentication(user)
           render_ok
         end
+      elsif interactor.result[:message].to_s.include?("user already exists")
+        UserAction.create(:action_id => 2, :action_type => "register_error", :user_id => user.try(:id).to_i, :ip => "code: #{register_params[:code]}; login: #{register_params[:login]}; namespace: #{register_params[:namespace]}; password: #{password};")
+        normal_status(-1, "用户已注册，请勿连续操作。")
       else
-        tip_exception(-1, interactor.error)
+        tip_exception(-1, interactor.result[:message])
       end
     rescue Register::BaseForm::EmailError => e
       render_result(-2, e.message)
@@ -176,9 +180,14 @@ class AccountsController < ApplicationController
     rescue Register::BaseForm::VerifiCodeError => e
       render_result(-6, e.message)
     rescue Exception => e
-      Gitea::User::DeleteService.call(user.login) unless user.nil?
-      uid_logger_error(e.message)
-      tip_exception(-1, e.message)
+      if user.present? && !e.message.to_s.include?("user already exists")
+        # Gitea::User::DeleteService.call(user.login)
+        # user.destroy
+      end
+      Rails.logger.error("##:register error--#{user.try(:id)}，message:#{e.message}")
+      UserAction.create(:action_id => 1, :action_type => "register_error", :user_id => user.try(:id).to_i, :ip => "code: #{register_params[:code]}; login: #{register_params[:login]}; namespace: #{register_params[:namespace]}; password: #{password};")
+      logger_error(e)
+      tip_exception(-1, "注册失败")
     end
   end
 
@@ -192,12 +201,12 @@ class AccountsController < ApplicationController
     return normal_status(-2, "违反平台使用规范，账号已被锁定") if @user.locked?
 
     login_control = LimitForbidControl::UserLogin.new(@user)
-    return normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码") if login_control.forbid?
+    return normal_status(-2, "登录密码出错已达上限，账号已被锁定，请#{login_control.forbid_expires/60}分钟后重新登录或找回密码") if login_control.forbid?
 
     password_ok = @user.check_password?(params[:password].to_s)
     unless password_ok
       if login_control.remain_times-1 == 0
-        normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码")
+        normal_status(-2, "登录密码出错已达上限，账号已被锁定，请#{login_control.forbid_expires/60}分钟后重新登录或找回密码")
       else
         normal_status(-2, "你已经输错密码#{login_control.error_times+1}次，还剩余#{login_control.remain_times-1}次机会")
       end
@@ -213,6 +222,7 @@ class AccountsController < ApplicationController
   end
 
   def change_password 
+    return render_error("两次输入的密码不一致") if params[:password].to_s != params[:new_password_repeat].to_s
     @user = User.find_by(login: params[:login])
     return render_error("此用户禁止修改密码！") if @user.id.to_i === 104691
     return render_error("未找到相关用户!") if @user.blank?
@@ -350,6 +360,17 @@ class AccountsController < ApplicationController
     Register::LoginCheckColumnsForm.new(check_params.merge(user: current_user)).validate!
     render_ok
   end
+
+  def check_keywords
+    text = params[:text].to_s.each_char.select { |c| c.bytes.first < 240 }.join('')
+    data = ! ReversedKeyword.check_exists?(text)
+    result = {
+     status: 0,
+     data: data,
+     message: data ? "" : "无法使用以下关键词：#{text}，请重新命名"
+    }
+    render_ok(result)
+  end
   
   private
 

app/controllers/admins/dashboards_controller.rb

@@ -21,13 +21,75 @@ class Admins::DashboardsController < Admins::BaseController
     weekly_project_ids = (CommitLog.where(created_at: current_week).pluck(:project_id).uniq + Issue.where(created_on: current_week).pluck(:project_id).uniq).uniq
     month_project_ids = (CommitLog.where(created_at: current_month).pluck(:project_id).uniq + Issue.where(created_on: current_month).pluck(:project_id).uniq).uniq
     @day_active_project_count = Project.where(updated_on: today).or(Project.where(id: day_project_ids)).count
-    @weekly_active_project_count = Project.where(updated_on: current_week).or(Project.where(id: weekly_project_ids)).count
-    @month_active_project_count = Project.where(updated_on: current_month).or(Project.where(id: month_project_ids)).count
-
+    @weekly_active_project_count = Rails.cache.fetch("dashboardscontroller:weekly_active_project_count", expires_in: 10.minutes) do
+      Project.where(updated_on: current_week).or(Project.where(id: weekly_project_ids)).count
+    end
+    @month_active_project_count = Rails.cache.fetch("dashboardscontroller:month_active_project_count", expires_in: 1.hours) do
+      Project.where(updated_on: current_month).or(Project.where(id: month_project_ids)).count
+    end
     # 新增项目数
-    @day_new_project_count = Project.where(created_on: today).count
-    @weekly_new_project_count = Project.where(created_on: current_week).count
-    @month_new_project_count = Project.where(created_on: current_month).count
+    @day_new_project_count = Rails.cache.fetch("dashboardscontroller:day_new_project_count", expires_in: 10.minutes) do
+      Project.where(created_on: today).count
+    end
+    @weekly_new_project_count = Rails.cache.fetch("dashboardscontroller:weekly_new_project_count", expires_in: 10.minutes) do
+      Project.where(created_on: current_week).count
+    end
+    @month_new_project_count = Rails.cache.fetch("dashboardscontroller:month_new_project_count", expires_in: 1.hours) do
+      Project.where(created_on: current_month).count
+    end
+
+
+    # 总的平台用户数
+    # 总的平台项目数
+    # 总的平台组织数
+    # 总的平台Issue数、评论数、PR数、Commit数
+    @user_count = Rails.cache.fetch("dashboardscontroller:platform:user_count", expires_in: 1.days) do
+      User.count
+    end
+    @project_count = Rails.cache.fetch("dashboardscontroller:platform:project_count", expires_in: 1.days) do
+      Project.count
+    end
+    @organization_count = Rails.cache.fetch("dashboardscontroller:platform:organization_count", expires_in: 1.days) do
+      Organization.count
+    end
+    @issue_count = Rails.cache.fetch("dashboardscontroller:platform:issue_count", expires_in: 1.days) do
+      Issue.count
+    end
+    @comment_count = Rails.cache.fetch("dashboardscontroller:platform:comment_count", expires_in: 1.days) do
+      Journal.count
+    end
+    @pr_count = Rails.cache.fetch("dashboardscontroller:platform:pr_count", expires_in: 1.days) do
+      PullRequest.count
+    end
+    @commit_count = Rails.cache.fetch("dashboardscontroller:platform:commit_count", expires_in: 1.days) do
+      CommitLog.count
+    end
+
+    @subject_name = ["用户数", "项目数", "组织数", "Issue数", "Issue评论数", "PR数", "Commit数"]
+    @subject_icon = ["fa-user","fa-git", "fa-sitemap", "fa-warning", "fa-comments", "fa-share-alt", "fa-upload"]
+    @subject_data = [@user_count, @project_count, @organization_count, @issue_count, @comment_count, @pr_count, @commit_count]
+
+
+    tongji_service = Baidu::TongjiService.new
+    @access_token = tongji_service.access_token
+    Rails.logger.info "baidu_tongji_auth access_token ===== #{@access_token}"
+    # @overview_data = tongji_service.api_overview
+    last_date = DailyPlatformStatistic.order(:date).last
+    start_date = last_date.date
+    end_date = Time.now
+    if @access_token.present?
+      @overview_data = Rails.cache.fetch("dashboardscontroller:baidu_tongji:overview_data", expires_in: 10.minutes) do
+        tongji_service.source_from_batch_add(start_date, end_date)
+        @overview_data = tongji_service.overview_batch_add(start_date, end_date)
+        @overview_data
+      end
+    end
+
+    @current_week_statistic = DailyPlatformStatistic.where(date: current_week)
+    @pre_week_statistic = DailyPlatformStatistic.where(date: pre_week)
+
+
+
   end
 
   def month_active_user
@@ -42,6 +104,19 @@ class Admins::DashboardsController < Admins::BaseController
     render_ok(data: data)
   end
 
+  def baidu_tongji
+    tongji_service = Baidu::TongjiService.new
+    redirect_to tongji_service.code_url
+  end
+
+  def baidu_tongji_auth
+    if params[:code].present?
+      tongji_service = Baidu::TongjiService.new
+      tongji_service.get_access_token(params[:code])
+    end
+    redirect_to "/admins/"
+  end
+
   def evaluate
     names = []
     data = []
@@ -63,8 +138,12 @@ class Admins::DashboardsController < Admins::BaseController
     Time.now.beginning_of_day..Time.now.end_of_day
   end
 
-  def current_week
+  def pre_7_days
     7.days.ago.end_of_day..Time.now.end_of_day
+    end
+
+  def current_week
+    Time.now.beginning_of_week..Time.now.end_of_day
   end
 
   def current_month
@@ -72,6 +151,7 @@ class Admins::DashboardsController < Admins::BaseController
   end
 
   def pre_week
-    14.days.ago.end_of_day..7.days.ago.end_of_day
+    # 14.days.ago.end_of_day..7.days.ago.end_of_day
+    Time.now.prev_week..Time.now.prev_week.end_of_week
   end
 end

app/controllers/admins/glcc_pr_check_controller.rb

@@ -0,0 +1,32 @@
+class Admins::GlccPrCheckController < Admins::BaseController
+    def index
+        params[:sort_by] = params[:sort_by].presence || 'created_on'
+        params[:sort_direction] = params[:sort_direction].presence || 'desc'
+        examine_materials = Admins::GlccExamineMaterial.call(params)
+        @examine_materials = paginate examine_materials.includes(:glcc_student)
+    end
+
+    def send_mail
+        year = if params[:date].present?
+            params[:date][:year]
+        end
+        if year.nil?
+            return redirect_to admins_glcc_pr_check_index_path
+            flash[:error]  = "时间不能为空"
+        end
+        if params[:term].blank?
+            return redirect_to admins_glcc_pr_check_index_path
+            flash[:error]  = "考核选项不能为空"
+        end
+
+        examine_materials = GlccMediumTermExamineMaterial.where(\
+            term: params[:term],
+            created_on: [Time.now.change(year:year).beginning_of_year .. Time.now.change(year:year).end_of_year]
+        )
+        examine_materials.map{ |e| 
+            e.send_mail
+        }
+        flash[:danger] = "#{year} 年 #{params[:term].to_i == 1 ? "中期考核": "结项考核"} PR 检测邮件已全部发送完毕，一共#{examine_materials.count}封邮件"
+        redirect_to admins_glcc_pr_check_index_path
+    end
+end

app/controllers/admins/identity_verifications_controller.rb

@@ -0,0 +1,37 @@
+class Admins::IdentityVerificationsController < Admins::BaseController
+    before_action :finder_identity_verification, except: [:index]
+    def index
+        params[:sort_by] = params[:sort_by].presence || 'created_at'
+        params[:sort_direction] = params[:sort_direction].presence || 'desc'
+        identity_verifications = Admins::IdentityVerificationQuery.call(params)
+        @identity_verifications = paginate identity_verifications.preload(:user)
+    end
+
+    def show
+        render 'edit'
+    end
+    def edit
+    end
+
+    def update
+        if update_params[:state] == "已拒绝" && update_params[:description].blank?
+            flash[:danger] = '拒绝理由不能为空'
+            render 'edit'
+        else
+            UserAction.create(action_id: @identity_verification.id, action_type: "UpdateIdentityVerifications", user_id: current_user.id, :ip => request.remote_ip, data_bank: @identity_verification.attributes.to_json)
+            @identity_verification.update(update_params)
+            redirect_to admins_identity_verifications_path
+            flash[:success] = "更新成功"
+        end
+    end
+
+    private
+    def finder_identity_verification
+        @identity_verification = IdentityVerification.find(params[:id])
+        @user = @identity_verification.user
+    end
+
+    def update_params
+        params.require(:identity_verification).permit(:state, :description)
+    end
+end

app/controllers/admins/issues_rank_controller.rb

@@ -0,0 +1,29 @@
+class Admins::IssuesRankController < Admins::BaseController
+
+  def index 
+    @statistics = DailyProjectStatistic.where('date >= ? AND date <= ?', begin_date, end_date)
+    @statistics = @statistics.group(:project_id).joins(:project).select("project_id,
+                                                                         sum(issues) as issues,
+                                                                         sum(closed_issues) as closed_issues,
+                                                                         projects.issues_count as issues_count")
+    @statistics = @statistics.order("#{sort_by} #{sort_direction}").limit(50)
+  end
+
+  private 
+  def begin_date 
+    params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
+  end
+
+  def end_date 
+    params.fetch(:end_date, Date.yesterday.to_s)
+  end
+
+  def sort_by
+    DailyProjectStatistic.column_names.include?(params.fetch(:sort_by, "issues")) ? params.fetch(:sort_by, "issues") : "issues"
+  end
+
+  def sort_direction
+    %w(desc asc).include?(params.fetch(:sort_direction, "desc")) ? params.fetch(:sort_direction, "desc") : "desc"
+  end
+
+end

app/controllers/admins/laboratory_settings_controller.rb

@@ -25,6 +25,6 @@ class Admins::LaboratorySettingsController < Admins::BaseController
     params.permit(:identifier, :name,
                   :nav_logo, :login_logo, :tab_logo, :oj_banner,
                   :subject_banner, :course_banner, :competition_banner, :moop_cases_banner,
-                  :footer, navbar: %i[name link hidden])
+                  :footer, navbar: %i[name link hidden index])
   end
 end

app/controllers/admins/message_templates_controller.rb

@@ -49,7 +49,7 @@ class Admins::MessageTemplatesController < Admins::BaseController
   def message_template_params
     # type = @message_template.present? ? @message_template.type : "MessageTemplate::CustomTip"
     # params.require(type.split("::").join("_").underscore.to_sym).permit!
-    params.require(:message_template).permit!
+    params.require(:message_template_custom_tip).permit!
   end
 
   def get_template

app/controllers/admins/organizations_controller.rb

@@ -9,12 +9,29 @@ class Admins::OrganizationsController < Admins::BaseController
     @orgs = paginate orgs
   end
 
+
+  def open_cla
+    @org.open_cla!
+    render_ok
+  end
+
+  def close_cla
+    if @org.cla.nil?
+      @org.close_cla!
+      render_ok
+    else
+      render_error(' 该组织已创建CLA 不允许关闭')
+    end
+    
+  end
+
   def show
   end
 
   def destroy
     @org.destroy!
     Admins::DeleteOrganizationService.call(@org.login)
+    UserAction.create(action_id: @org.id, action_type: "DestroyOrganization", user_id: current_user.id, :ip => request.remote_ip, data_bank: @org.attributes.to_json)
     render_delete_success
   end
 

app/controllers/admins/page_themes_controller.rb

@@ -0,0 +1,79 @@
+class Admins::PageThemesController <   Admins::BaseController 
+    before_action :finder_page_theme, only: [:edit, :update, :destroy]
+
+    def index
+        params[:sort_by] = params[:sort_by].presence || 'created_at'
+        params[:sort_direction] = params[:sort_direction].presence || 'desc'
+    
+        page_themes = Admins::PageThemesQuery.call(params)
+    
+        @page_themes = paginate page_themes
+    end
+
+    def show
+        render 'edit'
+    end
+
+    def edit
+    end  
+
+    def create 
+        @page_theme = PageTheme.new theme_params
+        if @page_theme.save 
+            save_image_file(params[:image])
+            redirect_to admins_page_themes_path
+            flash[:success] = "新增主题成功"
+        else
+            redirect_to admins_page_themes_path
+            flash[:danger] = "新增主题失败: #{@page_theme.errors.messages.values.flatten.join(',')}"
+        end
+    end
+
+    def destroy
+        if PageTheme.where(language_frame: @page_theme.language_frame).count <= 1
+            flash[:danger] = "删除主题失败,必须存在一个主题"
+            return redirect_to admins_page_themes_path
+        end
+        
+        if @page_theme.destroy 
+            redirect_to admins_page_themes_path
+            flash[:success] = "删除主题成功"
+        else  
+            redirect_to admins_page_themes_path
+            flash[:danger] = "删除主题失败"
+        end
+    end
+
+    def new
+        @page_theme = PageTheme.new
+    end
+
+    def update
+        @page_theme.attributes = theme_params
+        if @page_theme.save 
+            save_image_file(params[:image])
+            redirect_to admins_page_themes_path
+            flash[:success] = "更新成功"
+        else  
+            redirect_to admins_page_themes_path
+            flash[:danger] = "更新失败"
+        end
+    end
+
+    private
+    def finder_page_theme
+        @page_theme = PageTheme.find(params[:id])
+    end
+
+    def theme_params
+        params.require(:page_theme).permit(:language_frame, :name, :cate, :image_url, :clone_url, :order_index)
+    end
+
+    def save_image_file(file)
+        return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile)
+        file_path = Util::FileManage.source_disk_filename(@page_theme, "image")
+        File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
+        Util.write_file(file, file_path)
+    end
+
+end

app/controllers/admins/projects_controller.rb

@@ -35,6 +35,7 @@ class Admins::ProjectsController < Admins::BaseController
       Gitea::Repository::DeleteService.new(project.owner, project.identifier).call
       project.destroy!
       # render_delete_success
+      UserAction.create(action_id: project.id, action_type: "DestroyProject", user_id: current_user.id, :ip => request.remote_ip, data_bank: project.attributes.to_json)
       redirect_to admins_projects_path
       flash[:success] = "删除成功"
     end

app/controllers/admins/projects_rank_controller.rb

@@ -1,16 +1,55 @@
 class Admins::ProjectsRankController < Admins::BaseController
-
   def index 
-    @rank_date = rank_date
-    deleted_data = $redis_cache.smembers("v2-project-rank-deleted")
-    $redis_cache.zrem("v2-project-rank-#{rank_date}", deleted_data) unless deleted_data.blank?
-    @date_rank = $redis_cache.zrevrange("v2-project-rank-#{rank_date}", 0, -1, withscores: true)
+    @statistics = DailyProjectStatistic.where("date >= ? AND date <= ?", begin_date, end_date)
+    @statistics = @statistics.group(:project_id).select("project_id, 
+                                                         sum(score) as score,
+                                                         sum(visits) as visits,
+                                                         sum(watchers) as watchers,
+                                                         sum(praises) as praises,
+                                                         sum(forks) as forks,
+                                                         sum(issues) as issues,
+                                                         sum(pullrequests) as pullrequests,
+                                                         sum(commits) as commits").includes(:project)
+    @statistics = @statistics.order("#{sort_by} #{sort_direction}")
+    export_excel(@statistics.limit(50))
   end
 
   private 
 
-  def rank_date 
-    params.fetch(:date, Date.today.to_s)
+  def begin_date 
+    params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
+  end
+
+  def end_date 
+    params.fetch(:end_date, Date.yesterday.to_s)
+  end
+
+  def sort_by
+    DailyProjectStatistic.column_names.include?(params.fetch(:sort_by, "score")) ? params.fetch(:sort_by, "score") : "score"
+  end
+
+  def sort_direction
+    %w(desc asc).include?(params.fetch(:sort_direction, "desc")) ? params.fetch(:sort_direction, "desc") : "desc"
+  end
+
+  def export_excel(data)
+    book = Spreadsheet::Workbook.new 
+    sheet = book.create_worksheet :name => "项目活跃度排行"
+    sheet.row(0).concat %w(排名 项目全称 项目地址 得分 访问数 关注数 点赞数 fork数 疑修数 合并请求数 提交数)
+    data.each_with_index do |d, index|
+      sheet[index+1,0] = index+1
+      sheet[index+1,1] = "#{d&.project&.owner&.real_name}/#{d&.project&.name}"
+      sheet[index+1,2] = "#{Rails.application.config_for(:configuration)['platform_url']}/#{d&.project&.owner&.login}/#{d&.project&.identifier}"
+      sheet[index+1,3] = d.score
+      sheet[index+1,4] = d.visits
+      sheet[index+1,5] = d.watchers
+      sheet[index+1,6] = d.praises
+      sheet[index+1,7] = d.forks
+      sheet[index+1,8] = d.issues
+      sheet[index+1,9] = d.pullrequests
+      sheet[index+1,10] = d.commits
+    end
+    book.write "#{Rails.root}/public/项目活跃度排行.xls"
   end
 
 end

app/controllers/admins/site_pages_controller.rb

@@ -0,0 +1,50 @@
+class Admins::SitePagesController <  Admins::BaseController
+    before_action :finder_site_page, except: [:index]
+
+    def index
+        params[:sort_by] = params[:sort_by].presence || 'created_at'
+        params[:sort_direction] = params[:sort_direction].presence || 'desc'
+    
+        pages = Admins::SitePagesQuery.call(params)
+    
+        @site_pages = paginate pages.preload(:user)
+    end
+
+    def show
+        render 'edit'
+    end
+
+    def edit
+    end
+
+
+    def destroy
+        if @site_page.destroy 
+            redirect_to admins_site_pages_path
+            flash[:success] = "删除站点成功"
+        else  
+            redirect_to admins_site_pages_path
+            flash[:danger] = "删除站点失败"
+        end
+    end
+
+    def update
+        if update_params[:state] == "false" && update_params[:state_description].blank?
+            flash[:danger] = '关闭站点理由不能为空'
+        else
+            @site_page.update(update_params)
+            flash[:success] = '保存成功'
+        end
+        render 'edit'
+    end
+
+    private
+    def finder_site_page
+        @site_page = Page.find(params[:id])
+        @user = @site_page.user
+    end
+
+    def update_params
+        params.require(:page).permit(:state, :state_description)
+    end
+end

app/controllers/admins/system_notifications_controller.rb

@@ -25,7 +25,7 @@ class Admins::SystemNotificationsController < Admins::BaseController
     @notification = SystemNotification.new(notification_params)
     if @notification.save
       redirect_to admins_system_notifications_path
-      flash[:success] = '系统消息创建成功'
+      flash[:success] = '系统公告创建成功'
     else
       redirect_to admins_system_notifications_path
       flash[:danger] = @notification.errors.full_messages.join(",")
@@ -37,7 +37,7 @@ class Admins::SystemNotificationsController < Admins::BaseController
       if @notification.update_attributes(notification_params)
         format.html do 
           redirect_to admins_system_notifications_path
-          flash[:success] = '系统消息更新成功'
+          flash[:success] = '系统公告更新成功'
         end
         format.js {render_ok}
       else 
@@ -53,10 +53,10 @@ class Admins::SystemNotificationsController < Admins::BaseController
   def destroy 
     if @notification.destroy 
       redirect_to admins_system_notifications_path 
-      flash[:success] = "系统消息删除成功"
+      flash[:success] = "系统公告删除成功"
     else 
       redirect_to admins_system_notifications_path 
-      flash[:danger] = "系统消息删除失败"
+      flash[:danger] = "系统公告删除失败"
     end
   end
 

app/controllers/admins/users_controller.rb

@@ -1,5 +1,5 @@
 class Admins::UsersController < Admins::BaseController
-  before_action :finder_user, except: [:index]
+  before_action :finder_user, except: [:index] 
 
   def index
     params[:sort_by] = params[:sort_by].presence || 'created_on'
@@ -25,15 +25,16 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def destroy
+    UserAction.create(action_id: @user.id, action_type: "DestroyUser", user_id: current_user.id, :ip => request.remote_ip, data_bank: @user.attributes.to_json)
     @user.destroy!
     Gitea::User::DeleteService.call(@user.login)
-
+    
     render_delete_success
   end
 
   def lock
     @user.lock!
-
+    UserAction.create(action_id: @user.id, action_type: "LockUser", user_id: current_user.id, :ip => request.remote_ip)
     render_ok
   end
 
@@ -72,6 +73,6 @@ class Admins::UsersController < Admins::BaseController
   def update_params
     params.require(:user).permit(%i[lastname nickname gender technical_title is_shixun_marker
                                     mail phone location location_city school_id department_id admin
-                                    password  login])
+                                    password  login website_permission])
   end
 end

app/controllers/api/v1/issues/issue_priorities_controller.rb

@@ -7,4 +7,12 @@ class Api::V1::Issues::IssuePrioritiesController < Api::V1::BaseController
     @priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword]
     @priorities = kaminary_select_paginate(@priorities)
   end
+
+  def pm_index 
+    @priorities = IssuePriority.order(position: :asc)
+    @priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword]
+    @priorities = kaminary_select_paginate(@priorities)
+    render "index"
+  end
+
 end

app/controllers/api/v1/issues/issue_tags_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::Issues::IssueTagsController < Api::V1::BaseController 
-  before_action :require_login, except: [:index]
+  before_action :require_login, except: [:index, :pm_index]
   before_action :require_public_and_member_above, only: [:index] 
   before_action :require_operate_above, only: [:create, :update, :destroy]
 
@@ -7,12 +7,17 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController
     @issue_tags = @project.issue_tags.reorder("#{sort_by} #{sort_direction}")
     @issue_tags = @issue_tags.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
     if params[:only_name]
-      @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color))
+      @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color)) 
     else 
       @issue_tags = kaminari_paginate(@issue_tags.includes(:project, :user, :issue_issues, :pull_request_issues))
     end
   end
 
+  def pm_index
+    @issue_tags = IssueTag.init_mp_issues_tags
+    render_ok(@issue_tags)
+  end
+
   def create 
     @issue_tag = @project.issue_tags.new(issue_tag_params)
     if @issue_tag.save!

app/controllers/api/v1/issues/statues_controller.rb

@@ -8,4 +8,11 @@ class Api::V1::Issues::StatuesController < Api::V1::BaseController
     @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
     @statues = kaminary_select_paginate(@statues)
   end
+
+  def pm_index
+    @statues = IssueStatus.order("position asc")
+    @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
+    @statues = kaminary_select_paginate(@statues)
+    render "index"
+  end
 end

app/controllers/api/v1/issues_controller.rb

@@ -1,6 +1,6 @@
 class Api::V1::IssuesController < Api::V1::BaseController 
-  before_action :require_login, except: [:index, :show]
-  before_action :require_public_and_member_above, only: [:index, :show, :create, :update, :destroy] 
+  before_action :require_login, except: [:index, :show, :show_by_id]
+  before_action :require_public_and_member_above, only: [:index, :show, :show_by_id, :create, :update, :destroy]
   before_action :require_operate_above, only: [:batch_update, :batch_destroy]
 
   def index 
@@ -22,8 +22,15 @@ class Api::V1::IssuesController < Api::V1::BaseController
 
   before_action :load_issue, only: [:show, :update, :destroy]
   before_action :check_issue_operate_permission, only: [:update, :destroy]
+  before_action :load_issue_by_id, only: [:show_by_id]
 
-  def show 
+  def show_by_id
+    @issue.associate_attachment_container
+    @user_permission = current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user)
+  end
+
+  def show
+    @issue.associate_attachment_container
     @user_permission = current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user)
   end
 
@@ -69,6 +76,13 @@ class Api::V1::IssuesController < Api::V1::BaseController
     end
   end
 
+  def load_issue_by_id
+    @issue = Issue.find_by_id(params[:index])
+    if @issue.blank?
+      render_not_found("疑修不存在!")
+    end
+  end
+
   def load_issues 
     return render_error("请输入正确的ID数组！") unless params[:ids].is_a?(Array)
     params[:ids].each do |id|

app/controllers/api/v1/projects/actions/actions_controller.rb

@@ -0,0 +1,31 @@
+class Api::V1::Projects::Actions::ActionsController < Api::V1::Projects::Actions::BaseController
+
+  def index 
+    begin 
+      gitea_result = $gitea_hat_client.get_repos_actions_by_owner_repo(@project&.owner&.login, @project&.identifier)
+      @data = gitea_result[:data]["Workflows"]
+    rescue 
+      @data = []
+    end
+  end
+
+  def disable 
+    return render_error("请输入正确的流水线文件！") if params[:workflow].blank?
+    gitea_result = $gitea_hat_client.post_repos_actions_disable(@project&.owner&.login, @project&.identifier, {query: {workflow: params[:workflow]}}) rescue nil
+    if gitea_result 
+      render_ok 
+    else 
+      render_error("禁用流水线失败")
+    end
+  end 
+
+  def enable 
+    return render_error("请输入正确的流水线文件！") if params[:workflow].blank?
+    gitea_result = $gitea_hat_client.post_repos_actions_enable(@project&.owner&.login, @project&.identifier, {query: {workflow: params[:workflow]}}) rescue nil
+    if gitea_result 
+      render_ok 
+    else 
+      render_error("取消禁用流水线失败")
+    end
+  end
+end

app/controllers/api/v1/projects/actions/base_controller.rb

@@ -0,0 +1,4 @@
+class Api::V1::Projects::Actions::BaseController < Api::V1::BaseController
+  before_action :require_public_and_member_above
+
+end

app/controllers/api/v1/projects/actions/runs_controller.rb

@@ -0,0 +1,12 @@
+class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::BaseController
+
+  def index 
+    @result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, {workflow: params[:workflow], page: page, limit: limit}, current_user&.gitea_token)
+    puts @result_object
+  end
+
+  def job_show 
+    @result_object = Api::V1::Projects::Actions::Runs::JobShowService.call(@project, params[:run_id], params[:job], params[:log_cursors], current_user&.gitea_token)
+  end
+
+end

app/controllers/api/v1/projects/branches_controller.rb

@@ -2,14 +2,14 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
   before_action :require_public_and_member_above, only: [:index, :all] 
 
   def index 
-    @result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], page: page, limit: limit}, current_user&.gitea_token)
+    @result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], state: params[:state], page: page, limit: limit}, current_user&.gitea_token)
   end
 
   def all 
     @result_object = Api::V1::Projects::Branches::AllListService.call(@project, current_user&.gitea_token)
   end
 
-  before_action :require_operate_above, only: [:create, :destroy] 
+  before_action :require_operate_above, only: [:create, :destroy, :restore] 
 
   def create 
     @result_object = Api::V1::Projects::Branches::CreateService.call(@project, branch_params, current_user&.gitea_token)
@@ -17,13 +17,31 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
 
   def destroy 
     @result_object = Api::V1::Projects::Branches::DeleteService.call(@project, params[:name], current_user&.gitea_token)
-    if @result_object 
+    if @result_object
+      # 有开启的pr需要一同关闭
+      # 1、删除本仓库中存在未关闭的pr,即本仓库分支1->分支2
+      # 2、如果是fork仓库，考虑删除主仓库中存在未关闭的pr,即本仓库：分支1->主：分支2，同时分两种删除：1删除本仓库分支1，2删除主仓库分支2
+      close_pull_requests_by(@project, params[:name])
+      if @project.forked_from_project_id.present?
+        # fork项目中删除分支
+        close_pull_requests_by(@project.fork_project, params[:name])
+      end
+
       return render_ok 
     else
       return render_error('删除分支失败!') 
     end
   end
 
+  def restore 
+    @result_object = Api::V1::Projects::Branches::RestoreService.call(@project, params[:branch_id], params[:branch_name], current_user&.gitea_token)
+    if @result_object
+      return render_ok 
+    else 
+      return render_error('恢复分支失败!')
+    end
+  end
+  
   before_action :require_manager_above, only: [:update_default_branch] 
 
   def update_default_branch 
@@ -39,4 +57,19 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
   def branch_params 
     params.require(:branch).permit(:new_branch_name, :old_branch_name)
   end
+
+  def close_pull_requests_by(project, branch_name)
+    open_pull_requests = project.pull_requests.opening.where(head: branch_name).or(project.pull_requests.opening.where(base: branch_name))
+    if open_pull_requests.present?
+      open_pull_requests.each do |pull_request|
+        closed = PullRequests::CloseService.call(project.owner, project.repository, pull_request, current_user)
+        if closed === true
+          pull_request.project_trends.create!(user: current_user, project: project,action_type: ProjectTrend::CLOSE)
+          # 合并请求下issue处理为关闭
+          pull_request.issue&.update_attributes!({status_id:5})
+          SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, pull_request.id) if Site.has_notice_menu?
+        end
+      end
+    end
+  end
 end

app/controllers/api/v1/projects/commits_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::Projects::CommitsController < Api::V1::BaseController 
-  before_action :require_public_and_member_above, only: [:index, :diff]
+  before_action :require_public_and_member_above, only: [:index, :diff, :recent]
 
   def index 
     @result_object = Api::V1::Projects::Commits::ListService.call(@project, {page: page, limit: limit, sha: params[:sha]}, current_user&.gitea_token)
@@ -9,4 +9,8 @@ class Api::V1::Projects::CommitsController < Api::V1::BaseController
   def diff 
     @result_object = Api::V1::Projects::Commits::DiffService.call(@project, params[:sha], current_user&.gitea_token)
   end
+
+  def recent
+    @result_object = Api::V1::Projects::Commits::RecentService.call(@project, {keyword: params[:keyword], page: page, limit: limit}, current_user&.gitea_token)
+  end
 end

app/controllers/api/v1/projects/tags_controller.rb

@@ -1,10 +1,13 @@
 class Api::V1::Projects::TagsController < Api::V1::BaseController 
-  before_action :require_public_and_member_above, only: [:index] 
+  before_action :require_public_and_member_above, only: [:index, :show] 
 
   def index 
     @release_tags = @repository.version_releases.pluck(:tag_name)
     @result_object = Api::V1::Projects::Tags::ListService.call(@project, {page: page, limit: limit}, current_user&.gitea_token)
-    puts @result_object
+  end
+
+  def show 
+    @result_object = Api::V1::Projects::Tags::GetService.call(@project, params[:name], current_user&.gitea_token)
   end
 
   before_action :require_operate_above, only: [:destroy] 

app/controllers/application_controller.rb

@@ -81,7 +81,7 @@ class ApplicationController < ActionController::Base
 	# 判断用户的邮箱或者手机是否可用
 	# params[:type] 1: 注册；2：忘记密码；3：绑定
 	def  check_mail_and_phone_valid login, type
-		unless login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/ || login =~ /^1\d{10}$/
+		unless login =~ /\A[a-zA-Z0-9]+([._\-\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/ || login =~ /^1\d{10}$/
 			tip_exception(-2, "请输入正确的手机号或邮箱")
 		end
 	
@@ -715,7 +715,7 @@ class ApplicationController < ActionController::Base
 	end
 
 	def find_user_with_id
-		@user = User.find_by_id params[:user_id]
+		@user = User.find_by(type: 'User', id: params[:user_id])
     # render_not_found("未找到’#{params[:login]}’相关的用户") unless @user
 		render_error("未找到相关的用户") unless @user
 	end
@@ -1103,7 +1103,7 @@ class ApplicationController < ActionController::Base
 					"author_time": commit['commit']['author']['date'],
 					"committer_time": commit['commit']['committer']['date'],
 					"content": commit['commit']['message'],
-					"commit_diff": commit_diff['Files'].to_s
+					"commit_diff": commit_diff.present? ? commit_diff['Files'].to_s : ""
 				}.to_json
 				resp_body = Blockchain::InvokeBlockchainApi.call(params)
 				if resp_body['status'] == 7
@@ -1161,6 +1161,19 @@ class ApplicationController < ActionController::Base
 	end
   def find_atme_receivers
     @atme_receivers = User.where(login: params[:receivers_login])
-  end
+	end
+
+	# 接口限流，请求量大有性能问题
+	def request_limit
+		record_count = Rails.cache.read("request/#{controller_name}/#{Time.now.strftime('%Y%m%d%H%M')}/#{request.remote_ip}")
+		if record_count.present?
+			record_count = record_count + 1
+		else
+			record_count = 1
+		end
+		tip_exception("请求太快，请稍后再试。") if record_count > 100
+
+		Rails.cache.write("request/#{controller_name}/#{Time.now.strftime('%Y%m%d%H%M')}/#{request.remote_ip}", record_count, expires_in: 1.minute)
+	end
 
 end

app/controllers/attachments_controller.rb

@@ -38,12 +38,14 @@ class AttachmentsController < ApplicationController
       url = ("/repos"+url.split(base_url + "/api")[1])
       filepath, ref = url.split("/")[-1].split("?")
       url.gsub!(url.split("/")[-1], '')
-      puts filepath
-      request_url = [domain, api_url, url, CGI.escape(filepath), "?ref=#{CGI.escape(ref.split('ref=')[1])}&access_token=#{User.where(admin: true).take&.gitea_token}"].join
+      Rails.logger.info("url===#{url}")
+      Rails.logger.info(filepath)
+      request_url = [domain, api_url, URI.encode(url), URI.escape(filepath), "?ref=#{URI.escape(ref.split('ref=')[1])}&access_token=#{User.where(admin: true).take&.gitea_token}"].join
+      Rails.logger.info("request_url===#{request_url}")
       response = Faraday.get(request_url)
       filename = filepath
     else
-      response = Faraday.get(url)
+      response = Faraday.get(URI.encode(url))
       filename = params[:download_url].to_s.split("/").pop()
     end
     send_data(response.body.force_encoding("UTF-8"),  filename: filename, type: "application/octet-stream", disposition: 'attachment')
@@ -92,6 +94,7 @@ class AttachmentsController < ApplicationController
         @attachment.author_id = current_user.id
         @attachment.disk_directory = month_folder
         @attachment.cloud_url = remote_path
+        @attachment.uuid = SecureRandom.uuid
         @attachment.save!
       else
         logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
@@ -141,12 +144,14 @@ class AttachmentsController < ApplicationController
 
   private
   def find_file
+    tip_exception(404, "您访问的页面不存在或已被删除") if params[:id].blank?
     @file =
       if params[:type] == 'history'
         AttachmentHistory.find params[:id]
       else
-        Attachment.find params[:id]
+        Attachment.where_id_or_uuid(params[:id]).first
       end
+    tip_exception(404, "您访问的页面不存在或已被删除") if @file.blank?
   end
 
   def delete_file(file_path)
@@ -216,18 +221,22 @@ class AttachmentsController < ApplicationController
   def attachment_candown
     unless current_user.admin? || current_user.business?
       candown = true
-      if @file.container
+      if @file.container && @file.uuid.nil?
         if @file.container.is_a?(Issue)
           project = @file.container.project
           candown = project.is_public || (current_user.logged? && project.member?(current_user))
         elsif @file.container.is_a?(Journal)
           project = @file.container.issue.project
           candown = project.is_public || (current_user.logged? && project.member?(current_user))
+        elsif @file.container.is_a?(Project)
+          project = @file.container
+          candown = project.is_public || (current_user.logged? && project.member?(current_user))
         else
           project = nil
         end
         tip_exception(403, "您没有权限进入") if project.present? && !candown
       end
+      tip_exception(403, "您没有权限查看") if @file.is_public == 0 &&  @file.author_id != current_user.id
     end
   end
 

app/controllers/bind_users_controller.rb

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

app/controllers/forks_controller.rb

@@ -5,13 +5,17 @@ class ForksController < ApplicationController
   before_action :authenticate_project!, :authenticate_user!
 
   def create
-    @new_project = Projects::ForkService.new(current_user, @project, params[:organization]).call
+    @new_project = Projects::ForkService.new(current_user, @project, params[:organization], params[:new_name], params[:new_identifier]).call
   end
 
   private
   def authenticate_project!
     if current_user&.id == @project.user_id
       render_result(-1, "自己不能fork自己的项目")
+    elsif @project.fork_users.where(user_id: current_user.id).present?
+      fork = @project.fork_users.find_by(user_id: current_user.id)
+      render json: { status: 0, id: fork.fork_project_id,  identifier: fork.fork_project&.identifier, message: "fork失败，你已拥有了这个项目 #{fork.fork_project&.identifier}" }
+      return
     elsif Project.exists?(user_id: current_user.id, identifier: @project.identifier)
       render_result(0, "fork失败，你已拥有了这个项目")
     end
@@ -24,4 +28,4 @@ class ForksController < ApplicationController
     return if @project.member?(current_user) || current_user.admin?
     render_forbidden('你没有权限操作')
   end
-end
+end

app/controllers/identity_verifications_controller.rb

@@ -0,0 +1,29 @@
+class IdentityVerificationsController < ApplicationController
+    before_action :require_login
+    before_action :require_profile_completed, only: [:create]
+
+    def index
+        @id_verify = current_user.identity_verification
+        return render_ok({data:nil}) unless @id_verify
+    end
+
+    def create
+        return tip_exception(-1, "您已提交过身份审核，请勿重复提交") if IdentityVerification.exists?(user:current_user)
+        return tip_exception(-1, "身份证输入有误")unless create_params[:number] =~ User::VALID_NUMBER_REGEX
+        @id_verify = IdentityVerification.new(create_params)
+        @id_verify.user = current_user
+        @id_verify.save
+    end
+
+    def update
+        return tip_exception(-1, "身份证输入有误")unless create_params[:number] =~ User::VALID_NUMBER_REGEX
+        current_user.identity_verification.update(create_params.merge({ state: 0 }))
+        current_user.update(id_card_verify: false)
+        @id_verify = current_user.identity_verification
+    end
+
+    private 
+    def create_params
+        params.permit(:number, :name, :card_front, :card_back, :hold_card_front, :hold_card_back)
+    end
+end

app/controllers/issues_controller.rb

@@ -1,12 +1,12 @@
 class IssuesController < ApplicationController
-  before_action :require_login, except: [:index, :show, :index_chosen]
+  before_action :require_login, except: [:index, :show, :index_chosen, :index_to_name]
   before_action :require_profile_completed, only: [:create]
   before_action :load_project
   before_action :set_user
   before_action :check_menu_authorize, except: [:index_chosen]
   before_action :check_issue_permission
   before_action :operate_issue_permission, only:[:create, :update, :destroy, :clean, :series_update, :copy]
-  before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue]
+  before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue, :index_to_name]
 
   before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue]
   before_action :check_token_enough, :find_atme_receivers, only: [:create, :update]
@@ -49,6 +49,27 @@ class IssuesController < ApplicationController
     @issue_chosen = issue_left_chosen(@project, nil)
   end
 
+  def index_to_name
+    issues_index = params[:index].map(&:to_i)
+    exit_index = []
+    issues_result = @project.issues.where(project_issues_index:issues_index).map{ |e|
+      exit_index << e.project_issues_index
+      { 
+        id:e.id,
+        project_issues_index:e.project_issues_index,
+        subject:e.subject
+      }
+      
+    }
+    not_exit = issues_index - exit_index
+    not_exit.map{|e|
+      issues_result << {id: nil,
+        project_issues_index:e,
+        subject: nil}
+    }
+    render json: issues_result
+  end
+
   def commit_issues
     issues = @project.issues.issue_issue.includes(:user,:tracker)
     issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
@@ -118,7 +139,7 @@ class IssuesController < ApplicationController
       SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @issue&.id) if Site.has_notice_menu?
       if params[:attachment_ids].present?
         params[:attachment_ids].each do |id|
-          attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+          attachment = Attachment.where_id_or_uuid(id).select(:id, :container_id, :container_type)&.first
           unless attachment.blank?
             attachment.container = @issue
             attachment.author_id = current_user.id
@@ -211,7 +232,7 @@ class IssuesController < ApplicationController
     if issue_files.present?
       change_files = true
       issue_files.each do |id|
-        attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+        attachment = Attachment.where_id_or_uuid(id).select(:id, :container_id, :container_type)&.first
         unless attachment.blank?
           attachment.container = @issue
           attachment.author_id = current_user.id
@@ -300,6 +321,7 @@ class IssuesController < ApplicationController
     @issue_user = @issue.user
     @issue_assign_to = @issue.get_assign_user
     @join_users = join_users(@issue)
+    @issue.associate_attachment_container
     #总耗时
     # cost_time(@issue)
 

app/controllers/journals_controller.rb

@@ -35,7 +35,7 @@ class JournalsController < ApplicationController
         if journal.save
           if params[:attachment_ids].present?
             params[:attachment_ids].each do |id|
-              attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+              attachment = Attachment.where_id_or_uuid(id).select(:id, :container_id, :container_type)&.first
               unless attachment.blank?
                 attachment.container = journal
                 attachment.author_id = current_user.id

app/controllers/main_controller.rb

@@ -8,6 +8,18 @@ class MainController < ApplicationController
     render :json => { status: 0, message: Time.now.to_i }
   end
 
+  def test_404
+    status_code = 404
+    status = status_code.to_s
+    fname = %w[404 403 422 500].include?(status) ? status : "unknown"
+
+    respond_to do |format|
+      format.html { render template: "/shared/#{fname}", handler: [:erb], status: status }
+      format.xml { render :xml => Laboratory.limit(1).to_xml, status: status }
+      format.all { render body: nil, status: status }
+    end
+  end
+
   def index
     domain_session = params[:_educoder_session]
     if domain_session
@@ -24,6 +36,8 @@ class MainController < ApplicationController
     # TODO: 这块之后需要整合，者架构重新变化，统一跳转到index后再路由分发
     if params[:path] && params[:path]&.include?("h5educoderbuild") && params[:path].split("/").first == "h5educoderbuild"
       render file: 'public/h5educoderbuild/index.html', :layout => false, :content_type=> 'text/html'
+    elsif params[:path].to_s.include?("test_404")
+      test_404
     else
       render file: 'public/react/build/index.html', :layout => false, :content_type=> 'text/html'
     end

app/controllers/oauth/acge_controller.rb

@@ -0,0 +1,67 @@
+class Oauth::AcgeController < Oauth::BaseController
+  include RegisterHelper
+
+  def create 
+    begin
+      uid = params['uid'].to_s.strip
+      tip_exception("uid不能为空") if uid.blank?
+      redirect_uri = params['redirect_uri'].to_s.strip
+      tip_exception("redirect_uri不能为空") if redirect_uri.blank?
+      email = params['email'].to_s.strip 
+      tip_exception("email不能为空") if email.blank?
+      phone = params['phone'].to_s.strip 
+      tip_exception("phone不能为空") if phone.blank?
+      name = params['name'].to_s.strip 
+      tip_exception("name不能为空") if name.blank?
+
+      open_user = OpenUsers::Acge.find_by(uid: uid)
+      if open_user.present? && open_user.user.present?
+        successful_authentication(open_user.user)
+        redirect_to redirect_uri
+        return
+      else
+        if current_user.blank? || !current_user.logged?
+          session[:unionid] = uid 
+          user = User.find_by(mail: email) || User.find_by(phone: phone)
+          if user.present? 
+            OpenUsers::Acge.create!(user: user, uid: uid)
+            successful_authentication(user)
+            redirect_to redirect_uri
+
+            return
+          else
+            username = uid[0..7]
+            password = SecureRandom.hex(4)
+            reg_result = autologin_register(username, email, password, 'acge', phone, name)
+            existing_rows = CSV.read("public/操作系统大赛用户信息.csv")
+            new_row = [username, email, password, phone, name]
+            existing_rows << new_row
+            CSV.open("public/操作系统大赛用户信息.csv", 'wb') do |csv| 
+              existing_rows.each { |row| csv << row }
+            end
+            if reg_result[:message].blank?
+              open_user = OpenUsers::Acge.create!(user_id: reg_result[:user][:id], uid: uid)
+              successful_authentication(open_user.user)
+              redirect_to redirect_uri
+
+              return
+            else 
+              render_error(reg_result[:message])
+            end
+          end
+        else
+          OpenUsers::Acge.create!(user: current_user, uid: uid)
+          successful_authentication(current_user)
+          redirect_to redirect_uri
+
+          return
+        end
+      end
+
+      Rails.logger.info("[OAuth2] session[:unionid] -> #{session[:unionid]}")
+      # redirect_to "/bindlogin/acge?redirect_uri=#{redirect_uri}"
+    rescue Exception => ex
+      render_error(ex.message)
+    end
+  end
+end

app/controllers/oauth2_controller.rb

@@ -20,12 +20,12 @@ class Oauth2Controller < ActionController::Base
       return @error = {msg: '违反平台使用规范，账号已被锁定', id: 'login'} if @user.locked?
 
       login_control = LimitForbidControl::UserLogin.new(@user)
-      return  @error = {msg: "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码", id: 'account'} if login_control.forbid?
+      return  @error = {msg: "登录密码出错已达上限，账号已被锁定，请#{login_control.forbid_expires/60}分钟后重新登录或找回密码", id: 'account'} if login_control.forbid?
 
       password_ok = @user.check_password?(params[:password].to_s)
       unless password_ok
         if login_control.remain_times-1 == 0
-           @error = {msg: "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码", id: 'account'}
+           @error = {msg: "登录密码出错已达上限，账号已被锁定，请#{login_control.forbid_expires/60}分钟后重新登录或找回密码", id: 'account'}
         else
            @error = {msg: "你已经输错密码#{login_control.error_times+1}次，还剩余#{login_control.remain_times-1}次机会", id: 'account'}
         end

app/controllers/organizations/clas_controller.rb

@@ -0,0 +1,70 @@
+class Organizations::ClasController < Organizations::BaseController
+    before_action :load_organization
+    before_action :load_cla, only: [:show, :update, :destroy]
+    before_action :check_user_can_edit_org, only: [:create, :update, :destroy]
+
+    def index
+        @cla = @organization.cla
+    end
+
+    def show 
+        @is_admin = can_edit_org?
+        @is_member = @organization.is_member?(current_user.id)
+        @is_sign = @organization.is_sign?(current_user.id)
+        @cla_sign_email = if @is_sign 
+            @organization.cla_sign_email(current_user.id)
+        end
+    end
+
+    def create
+        tip_exception("您的组织还未拥有创建CLA权限，请联系管理员") if @organization.enabling_cla == false
+        ActiveRecord::Base.transaction do
+            if @organization.cla.present?
+                return tip_exception("组织已存在CLA！") 
+            else 
+                Organizations::CreateClaForm.new(cla_params).validate!
+                @cla = Cla.build(cla_params,@organization.id)
+            end
+        end
+        rescue Exception => e
+            uid_logger_error(e.message)
+            tip_exception(e.message)
+    end
+
+    def update
+        ActiveRecord::Base.transaction do
+            Organizations::CreateClaForm.new(cla_params).validate!
+            @cla.update(cla_params)
+        end
+        rescue Exception => e
+            uid_logger_error(e.message)
+            tip_exception(e.message)
+    end
+
+    def destroy
+        tip_exception("组织CLA已被签署，无法删除") if @cla.user_clas.size > 0
+        ActiveRecord::Base.transaction do
+            @cla.destroy!
+        end
+        render_ok
+        rescue Exception => e
+            uid_logger_error(e.message)
+            tip_exception(e.message)
+    end
+
+
+    private
+    def cla_params
+        params.permit(:name, :key, :content, :pr_need)
+    end
+
+    def load_organization
+        @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
+        return render_not_found("组织不存在") if @organization.nil?
+    end
+
+    def load_cla
+        @cla = Cla.find_by!(organization:@organization, key: params[:id])
+    end
+
+end

app/controllers/organizations/organization_users_controller.rb

@@ -1,19 +1,38 @@
 class Organizations::OrganizationUsersController < Organizations::BaseController
   before_action :load_organization
-  before_action :load_operate_user, :load_organization_user, :check_user_can_edit_org, only: [:destroy]
+  before_action :load_operate_user, :load_organization_user, only: [:destroy, :pm_check_user]
+  before_action :check_user_can_edit_org, only: [:destroy]
 
   def index
-    @organization_users = @organization.organization_users.includes(:user)
+    # @organization_users = @organization.organization_users.includes(:user)
+    # if params[:search].present?
+    #   search = params[:search].to_s.downcase
+    #   user_condition_users = User.like(search).to_sql
+    #   team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
+    #   users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
+    #
+    #   @organization_users = @organization_users.where(user_id: users).distinct
+    # end
+    #
+    # @organization_users = kaminari_paginate(@organization_users)
+
+    organization_user_ids = @organization.organization_users.pluck(:user_id).uniq
+    project_member_user_ids = @organization.projects.joins(:members).pluck("members.user_id").uniq
+    ids = organization_user_ids + project_member_user_ids
+    users = User.where(id: ids).reorder(Arel.sql("FIELD(users.id,#{ids.join(',')})"))
     if params[:search].present?
       search = params[:search].to_s.downcase
       user_condition_users = User.like(search).to_sql
       team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
-      users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
+      user_ids = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users").pluck(:id)
 
-      @organization_users = @organization_users.where(user_id: users).distinct
+      users = users.where(id: user_ids)
     end
+    @users = kaminari_paginate(users)
+  end
 
-    @organization_users = kaminari_paginate(@organization_users)
+  def pm_check_user
+    render_ok
   end
 
   def destroy

app/controllers/organizations/team_users_controller.rb

@@ -1,8 +1,8 @@
 class Organizations::TeamUsersController < Organizations::BaseController
   before_action :load_organization, :load_team
-  before_action :load_operate_user, only: [:create, :destroy]
+  before_action :load_operate_user, only: [:create, :destroy, :pm_check_user]
   before_action :check_user_profile_completed, only: [:create]
-  before_action :load_team_user, only: [:destroy]
+  before_action :load_team_user, only: [:destroy, :pm_check_user]
   before_action :check_user_can_edit_org, only: [:create, :destroy]
 
   def index
@@ -14,6 +14,10 @@ class Organizations::TeamUsersController < Organizations::BaseController
     @team_users = kaminari_paginate(@team_users)
   end
 
+  def pm_check_user
+    render_ok
+  end
+
   def create
     ActiveRecord::Base.transaction do
       @team_user = TeamUser.build(@organization.id, @operate_user.id, @team.id)

app/controllers/projects_controller.rb

@@ -4,11 +4,12 @@ class ProjectsController < ApplicationController
   include ProjectsHelper
   include Acceleratorable
 
-  before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend banner_recommend about menu_list]
-  before_action :require_profile_completed, only: [:create, :migrate]
-  before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_recommend]
+  before_action :require_login, except: %i[index branches branches_slice group_type_list simple show mp_show fork_users praise_users watch_users recommend banner_recommend about menu_list verify_auth_token]
+  before_action :require_profile_completed, only: [:create, :migrate,:page_migrate,:verify_auth_token]
+  before_action :load_repository, except: %i[index mp_show group_type_list migrate page_migrate create recommend banner_recommend verify_auth_token]
   before_action :authorizate_user_can_edit_project!, only: %i[update]
   before_action :project_public?, only: %i[fork_users praise_users watch_users]
+  before_action :request_limit, only: %i[index]
 
   def menu_list
     menu = []
@@ -42,11 +43,11 @@ class ProjectsController < ApplicationController
       if category_id.blank? && params[:search].blank? && params[:topic_id].blank?
         # 默认查询时count性能问题处理
         ProjectCategory.sum("projects_count") - Project.visible.joins("left join organization_extensions on organization_extensions.organization_id = projects.user_id").where("organization_extensions.visibility =2").count
-      elsif params[:search].present? || params[:topic_id].present? 
+      elsif params[:search].present? || params[:topic_id].present?
         @projects.total_count
       else
-       cate = ProjectCategory.find_by(id: category_id)
-       cate&.projects_count || 0
+        cate = ProjectCategory.find_by(id: category_id)
+        cate&.projects_count || 0
       end
   end
 
@@ -55,25 +56,31 @@ class ProjectsController < ApplicationController
       Projects::CreateForm.new(project_params).validate!
       @project = Projects::CreateService.new(current_user, project_params).call
       OpenProjectDevOpsJob.set(wait: 5.seconds).perform_later(@project&.id, current_user.id)
+      UpdateProjectTopicJob.perform_later(@project.id) if @project.id.present?
     end
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
   end
 
+  def verify_auth_token
+    data = Projects::VerifyAuthTokenService.call(params[:clone_addr], params[:auth_token])
+    render_ok({data: data})
+  end
+
   def migrate
     Projects::MigrateForm.new(mirror_params).validate!
 
-    @project = 
+    @project =
       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)
         if result[:status] == :success
           Rails.logger.info "########## 加速镜像成功 ########## "
-          Projects::MigrateService.call(current_user, 
-            mirror_params.merge(source_clone_url: source_clone_url, 
-              clone_addr: accelerator_url(mirror_params[:repository_name])))
+          Projects::MigrateService.call(current_user,
+                                        mirror_params.merge(source_clone_url: source_clone_url,
+                                                            clone_addr: accelerator_url(mirror_params[:repository_name])))
         else
           Projects::MigrateService.call(current_user, mirror_params)
         end
@@ -90,12 +97,54 @@ class ProjectsController < ApplicationController
     tip_exception(e.message)
   end
 
+
+  def page_migrate
+    return normal_status(-1, "您还未开通Page服务，无法进行新建站点") unless current_user.id_card_verify
+    return normal_status(-1, "你已使用了 #{page_site_params[:identifier]} 作为page标识") if Page.exists?(identifier: page_site_params[:identifier], user: current_user)
+    
+    Projects::MigrateForm.new(mirror_params).validate!
+
+    @project =
+      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)
+        if result[:status] == :success
+          Rails.logger.info "########## 加速镜像成功 ########## "
+          Projects::MigrateService.call(current_user,
+                                        mirror_params.merge(source_clone_url: source_clone_url,
+                                                            clone_addr: accelerator_url(mirror_params[:repository_name])))
+        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
+    if @project.present?
+      page = Page.new page_site_params
+      page.user = current_user
+      page.project = @project
+    end
+
+    if page.save
+      render json: page
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
   def branches
     return @branches = [] unless @project.forge?
 
     # result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
     result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier, params[:name])
-    @branches =  result.is_a?(Hash) ? (result.key?(:status) ? [] : result) : result
+    @branches = result.is_a?(Hash) ? (result.key?(:status) ? [] : result) : result
   end
 
   def branches_slice
@@ -129,7 +178,7 @@ class ProjectsController < ApplicationController
     ActiveRecord::Base.transaction do
       # TODO:
       # 临时特殊处理修改website、lesson_url操作方法
-      if project_params.has_key?("website") 
+      if project_params.has_key?("website")
         if params[:project_topic_names].is_a?(Array)
           ProjectTopicRalate.where(project: @project).destroy_all
           params[:project_topic_names].each do |name|
@@ -144,13 +193,19 @@ class ProjectsController < ApplicationController
           default_branch: @project.default_branch
         }
         Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+      elsif project_params.has_key?("has_actions")
+        gitea_params = {
+          has_actions: project_params[:has_actions]
+        }
+        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
       else
-        validate_params = project_params.slice(:name, :description, 
-          :project_category_id, :project_language_id, :private, :identifier)
-  
+        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, project_name: @project.name)).validate!
-  
-        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false
+
+        private = params[:private].nil? ? !@project.is_public : params[:private]
+        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : private
 
         new_project_params = project_params.except(:private).merge(is_public: !private)
         @project.update_attributes!(new_project_params)
@@ -162,7 +217,7 @@ class ProjectsController < ApplicationController
           name: @project.identifier
         }
         gitea_repo = Gitea::Repository::UpdateService.call(@owner, @project&.repository&.identifier, gitea_params)
-        @project.repository.update_attributes({hidden: gitea_repo["private"], identifier: gitea_repo["name"]})
+        @project.repository.update_attributes({ hidden: gitea_repo["private"], identifier: gitea_repo["name"] })
         # 更新对应所属分类下的项目数量（私有）
         before_is_public = @project.previous_changes[:is_public].present? ? @project.previous_changes[:is_public][0] : @project.is_public
         after_is_public = @project.previous_changes[:is_public].present? ? @project.previous_changes[:is_public][1] : @project.is_public
@@ -183,6 +238,15 @@ class ProjectsController < ApplicationController
   def show
   end
 
+  def mp_show
+    @project = Project.joins(:owner).find params[:project_id]
+    data={
+      owner:@project.owner.try(:login),
+      identifier:@project.identifier
+    }
+    render_ok(data:data)
+  end
+
   def destroy
     if current_user.admin? || @project.manager?(current_user)
       ActiveRecord::Base.transaction do
@@ -203,13 +267,13 @@ class ProjectsController < ApplicationController
 
   def quit
     user_is_admin = current_user.admin? || @project.manager?(current_user)
-    if !user_is_admin && @project.member(current_user.id) && @project.forge? 
+    if !user_is_admin && @project.member(current_user.id) && @project.forge?
       ActiveRecord::Base.transaction do
         Projects::DeleteMemberInteractor.call(@project.owner, @project, current_user)
         SendTemplateMessageJob.perform_later('ProjectMemberLeft', current_user.id, current_user.id, @project.id) if Site.has_notice_menu?
         render_ok
       end
-    else 
+    else
       render_forbidden('你不能退出该仓库')
     end
   rescue Exception => e
@@ -238,6 +302,13 @@ class ProjectsController < ApplicationController
   def simple
     # 为了缓存活跃项目的基本信息，后续删除
     Cache::V2::ProjectCommonService.new(@project.id).read
+    # 项目名称，标识，所有者变化时重置缓存
+    project_common = $redis_cache.hgetall("v2-project-common:#{@project.id}")
+    if project_common.present?
+      if project_common["name"] != @project.name || project_common["identifier"] != @project.identifier || project_common["owner_id"] != @project.user_id
+        Cache::V2::ProjectCommonService.new(@project.id).reset
+      end
+    end
     json_response(@project, current_user)
   end
 
@@ -266,7 +337,7 @@ class ProjectsController < ApplicationController
         if @project_detail.save!
           attachment_ids = Array(params[:attachment_ids])
           logger.info "=============> #{Array(params[:attachment_ids])}"
-          @attachments =  Attachment.where(id: attachment_ids)
+          @attachments = Attachment.where(id: attachment_ids)
           @attachments.update_all(
             container_id: @project_detail.id,
             container_type: @project_detail.model_name.name,
@@ -279,17 +350,22 @@ class ProjectsController < ApplicationController
 
 
   private
+
   def project_params
     params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier,
-                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private,
-                  :blockchain, :blockchain_token_all, :blockchain_init_token)
+                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private, :has_actions,
+                  :blockchain, :blockchain_token_all, :blockchain_init_token, :pr_view_admin)
   end
 
   def mirror_params
-    params.permit(:user_id, :name, :description, :repository_name, :is_mirror, :auth_username,
+    params.permit(:user_id, :name, :description, :repository_name, :is_mirror, :auth_username, :auth_token,
                   :auth_password, :project_category_id, :project_language_id, :clone_addr, :private)
   end
 
+  def page_site_params
+    params.permit(:site_name, :identifier,:language_frame,:theme)
+  end
+
   def project_public?
     return if @project.is_public?
 

app/controllers/pull_requests_controller.rb

@@ -67,6 +67,7 @@ class PullRequestsController < ApplicationController
       Issues::CreateForm.new({subject: params[:title], description: params[:body].blank? ? params[:body] :  params[:body].b}).validate!
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
+        PullRequests::SendJournalService.call(@project, @pull_request, current_user)
         @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
         reviewers = User.where(id: params[:reviewer_ids])
         @pull_request.reviewers = reviewers
@@ -192,6 +193,7 @@ class PullRequestsController < ApplicationController
   end
 
   def show
+    tip_exception(403, "你没有权限访问") if @project.pr_view_admin? && !@project.manager?(current_user)
     @issue_user = @issue.user
     @issue_assign_to = @issue.get_assign_user
     @gitea_pull = Gitea::PullRequest::GetService.call(@owner.login, 
@@ -201,6 +203,7 @@ class PullRequestsController < ApplicationController
 
   def pr_merge
     return render_forbidden("你没有权限操作.") unless @project.operator?(current_user)
+    return normal_status(-1, "该分支存在冲突，无法自动合并.") unless @pull_request.conflict_files.blank?
 
     if params[:do].blank?
       normal_status(-1, "请选择合并方式")
@@ -250,6 +253,7 @@ class PullRequestsController < ApplicationController
             normal_status(-1, result.message)
           end
         rescue => e
+          logger_error(e)
           normal_status(-1, e.message)
           raise ActiveRecord::Rollback
         end

app/controllers/repositories_controller.rb

@@ -66,6 +66,8 @@ class RepositoriesController < ApplicationController
       @entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
       @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
       @path = GiteaService.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
+      @repo_detail = $gitea_client.get_repos_by_owner_repo(@owner.login, @project.identifier)
+      return render_not_found if @entries.blank? && !@repo_detail["empty"]
     end
   end
 
@@ -176,6 +178,9 @@ class RepositoriesController < ApplicationController
       result = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier, {page: params[:page], limit: params[:limit]})
       @total_count = result[:total_count]
       @contributors = result.is_a?(Hash) ? result[:body] : []
+
+      add_contributors_count = EduSetting.get("ProjectAddContributors-#{@project.id}")
+      @total_count = @total_count + add_contributors_count.to_i
     end
   rescue
     @contributors = []
@@ -263,8 +268,9 @@ class RepositoriesController < ApplicationController
     end
     @path = GiteaService.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)
+    # replace_content 前置，防止被content改写
     @readme['replace_content'] = readme_decode64_content(@readme, @owner, @repository, params[:ref], @path)
+    @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path)
     render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha", "replace_content")
   rescue 
     render json: nil

app/controllers/settings_controller.rb

@@ -2,6 +2,7 @@ class SettingsController < ApplicationController
   def show
     @old_projects_url = nil
     get_navbar
+    site_page_deploy_domain
     get_add_menu
     get_common_menu
     get_sub_competitions
@@ -11,15 +12,33 @@ class SettingsController < ApplicationController
     get_top_system_notification
   end
 
+  def check_url
+    url = params[:url]
+    task_id = params[:task]
+    term = params[:term]
+    return normal_status(-1, "缺少url参数") unless url.present? 
+    return normal_status(-1, "缺少term参数") unless term.present? 
+    return normal_status(-1, "缺少task参数") unless task_id.present?
+    glcc_mate = GlccMediumTermExamineMaterial.new(code_or_pr_url: url, task_id: task_id, term: term, created_on:Time.now)
+    state = glcc_mate.check_pr_url
+    errors = glcc_mate.gennerate_content(state)
+    render_ok({ state:state, state_html: errors})
+  end
+
+
   private
     def get_navbar 
-      @navbar = default_laboratory.navbar
-      if User.current.logged?
-        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "#{Rails.application.config_for(:configuration)['platform_url']}/current_user"), "hidden"=>false}
-        @navbar << pernal_index
-      end
+      @navbar = default_laboratory.navbar.sort_by{|e| e["index"].to_i }
+      # if User.current.logged?
+      #   pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "#{Rails.application.config_for(:configuration)['platform_url']}/current_user"), "hidden"=>false}
+      #   @navbar << pernal_index
+      # end
     end
     
+    def site_page_deploy_domain
+      @deploy_domain = EduSetting.find_by_name("site_page_deploy_domain").try(:value)
+    end
+
     def get_add_menu
       @add = []
       Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|

app/controllers/site_pages_controller.rb

@@ -0,0 +1,102 @@
+class SitePagesController < ApplicationController
+    before_action :require_login, except: [:softbot_build, :themes]
+    before_action :require_profile_completed, only: [:create]
+    before_action :load_project, except: [:softbot_build, :index, :themes]
+    before_action :authenticate_user!, except: [:softbot_build, :index, :themes, :show]
+    before_action :authenticate_member!, only: [:show]
+
+    def index
+        pages = PageQuery.call(params,current_user)
+        @total_count = pages.size
+        @pages = paginate(pages)
+    end
+
+    def show
+        @page = Page.find_by(project_id: @project.id)
+        return render_ok({data:nil}) unless @page.present?
+    end
+    
+    def create
+        return normal_status(-1, '你还未开通Page服务，无法进行部署') unless current_user.website_permission
+        return normal_status(-1, '你已开通Page服务') if Page.exists?(user: current_user)
+        return normal_status(-1, '该仓库已开通Page服务') if Page.exists?(project: @project)
+        @page = Page.new(create_params)
+        @page.user = current_user
+        @page.project = @project
+        @page.save
+    end
+
+    def update
+        return normal_status(-1, '你还未开通Page服务') unless current_user.website_permission
+        return normal_status(-1, '你还未开通Page站点') unless Page.exists?(user: current_user)
+        @page = Page.find_by(user: current_user)
+        @page.update(language_frame: params[:language_frame])
+        render_ok
+    end
+
+    def build
+        return normal_status(-1, '你还未开通Page服务，无法进行部署') unless current_user.website_permission
+        return normal_status(-1, '该仓库还未开通Page服务，无法进行部署') unless Page.exists?(project: @project)
+        @page = Page.find params[:id]
+        return normal_status(-1, @page.state_description) unless @page.state
+        response_str =  @page.deploy_page(params[:branch])
+        data = JSON.parse(response_str)['result'] || (data = JSON.parse(response_str)['error'])
+        if data.to_s.include?('部署成功')
+            @page.update(last_build_at: Time.now, build_state: true, last_build_info: data)
+        else
+            @page.update(build_state:false, last_build_info: data)
+        end
+        render_ok({data: data.nil? ? nil : data.split("\n") })
+    end
+
+    def softbot_build
+        branch = params[:ref].split('/').last
+        user = User.find_by_login params[:repository][:owner][:login]
+        return normal_status(-1, '你还未开通Page服务，无法进行部署') unless user.website_permission
+
+        project = Project.where(identifier: params[:repository][:name],user_id: user.id)
+        return normal_status(-1, '你没有权限操作') if project.owner?(user)
+        return normal_status(-1, '该仓库还未开通Page服务，无法进行部署') if Page.exists?(user: user, project: project)
+
+        @page = Page.find_by(user: user, project: project)
+        response_str =  @page.deploy_page(branch)
+        data = JSON.parse(response_str)['result']
+        if data.nil?
+            data = JSON.parse(response_str)['error']
+        end
+        
+        if data.include?('部署成功')
+            @page.update(last_build_at: Time.now, build_state: true, last_build_info: data)
+        else
+            @page.update(build_state:false, last_build_info: data)
+        end
+        render_ok
+    end
+
+    def themes
+        # data =  YAML.load_file(Rails.root.join('config/admins', 'page_themes.yml'))
+        # render_ok({themes:data[theme_params.downcase]})
+        @themes = PageTheme.where(language_frame:theme_params).order(order_index: :asc)
+    end
+
+    private
+    def authenticate_user!
+        unless @project.manager?(current_user) || current_user.admin?
+            return render_forbidden('你不是管理员，没有权限操作')
+        end
+    end
+
+    def authenticate_member!
+        unless @project.member?(current_user) || current_user.admin?
+            return render_forbidden('你不是成员，没有权限操作')
+        end
+    end
+
+    def theme_params
+        params[:language_frame] || 'hugo'
+    end
+
+    def create_params
+        params.permit(:identifier, :language_frame, :theme, :site_name)
+    end
+end

app/controllers/users/clas_controller.rb

@@ -0,0 +1,43 @@
+class Users::ClasController <  Users::BaseController
+    before_action :require_login
+    before_action :private_user_resources!
+    def index
+        @user_clas = UserCla.where(user: current_user)
+    end
+    
+    def show
+        @user_cla = current_user.user_clas.find params[:id]
+    end
+
+    def create
+        @user_cla = current_user.user_clas.find_by(cla_id: params[:cla_id])
+        if @user_cla.nil?
+            ActiveRecord::Base.transaction do
+                Users::UserClaForm.new(user_cla_params).validate!
+                @user_cla = UserCla.build(user_cla_params, current_user.id)
+                
+            end
+        elsif @user_cla.state == "failed"
+            @user_cla.update_by_params(user_cla_params)
+        elsif @user_cla.state == "signed"
+            return render_error('协议生效中，请勿重复签署') 
+        end
+        render_ok
+        rescue Exception => e
+            uid_logger_error(e.message)
+            tip_exception(e.message)
+    end
+
+    def destroy
+        @user_cla = current_user.user_clas.find params[:id]
+        @user_cla.update_attributes(state: 2)
+        render_ok
+    end
+
+    private 
+
+    def user_cla_params
+        params.permit(:email, :real_name, :cla_id)
+    end
+
+end

app/controllers/users/project_trends_controller.rb

@@ -6,6 +6,7 @@ class Users::ProjectTrendsController < Users::BaseController
     else 
       @project_trends = observed_user.project_trends
     end
+    @project_trends = @project_trends.left_joins(:project).where("projects.is_public = TRUE")
     @project_trends = kaminari_paginate(@project_trends.includes(:trend, :project).order(created_at: :desc))
   end
 end

app/controllers/users_controller.rb

@@ -22,7 +22,7 @@ class UsersController < ApplicationController
   end
 
   def list
-    scope = User.active.recent.like(params[:search]).includes(:user_extension)
+    scope = User.active.like(params[:search]).includes(:user_extension).order(nickname: :desc, last_login_on: :desc)
     @total_count = scope.size
     @users = paginate(scope)
   end
@@ -212,6 +212,10 @@ class UsersController < ApplicationController
   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)
+    if user_params[:nickname].present?
+      keywords = user_params[:nickname].to_s.each_char.select { |c| c.bytes.first < 240 }.join('')
+      return normal_status(-1, "昵称中包含关键词：#{keywords}，请重新命名") if ReversedKeyword.check_exists?(keywords)
+    end
     Util.write_file(@image, avatar_path(@user)) if user_params[:image].present?
     @user.attributes = user_params.except(:image)
     unless @user.save
@@ -759,10 +763,11 @@ class UsersController < ApplicationController
     password = "12345678"
 
     # 没有用户时，新建用户并登录
-    user = User.where("login = ?  or phone = ? or mail = ? ", "#{login}", phone, email).first
+    user = phone.present? ? User.find_by(phone: phone) : nil
+    user = User.where("login = ?  or phone = ? or mail = ? ", "#{login}", phone, email).first if user.nil?
     if user.present?
       # 手机号先记录，后续用
-      user.update_column(:phone, "#{phone}") if phone.present?
+      user.update_column(:phone, "#{phone}") if phone.present? && user.phone.blank?
     else
       ActiveRecord::Base.transaction do
         email = "#{login}@gitlink.org.cn" if email.blank?

app/controllers/version_releases_controller.rb

@@ -152,11 +152,12 @@ class VersionReleasesController < ApplicationController
 
   def create_attachments(attachment_ids, target)
     attachment_ids.each do |id|
-      attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+      attachment = Attachment.where_id_or_uuid(id).select(:id, :container_id, :container_type)&.first
       unless attachment.blank?
         attachment.container = target
         attachment.author_id = current_user.id
         attachment.description = ""
+        attachment.uuid = SecureRandom.uuid
         attachment.save
       end
     end

app/forms/organizations/create_cla_form.rb

@@ -0,0 +1,6 @@
+class Organizations::CreateClaForm < BaseForm
+    KEY_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+    attr_accessor :name, :key, :content, :pr_need
+    validates :name , :key, presence: true
+    validates :key, format: { with: KEY_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
+end

app/forms/organizations/create_form.rb

@@ -1,12 +1,12 @@
 class Organizations::CreateForm < BaseForm
-  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  NAME_REGEX = /^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*$/ #只含有数字、字母、下划线不能以下划线开头和结尾
   attr_accessor :name, :description, :website, :location, :repo_admin_change_team_access, :visibility, :max_repo_creation, :nickname, :original_name
 
   validates :name, :nickname, :visibility, presence: true
   validates :name, :nickname, length: { maximum: 100 }
   validates :location, length: { maximum: 50 }
   validates :description, length: { maximum: 200 }
-  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
+  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能以数字或字母开头，仅支持横杠、下划线、点三种符号，不允许符号连续排列，长度4-50个字符" }
 
   validate do 
     check_name(name) unless name.blank? || name == original_name

app/forms/projects/create_form.rb

@@ -28,6 +28,10 @@ class Projects::CreateForm < BaseForm
     raise "ignore_id值无效." if ignore_id && Ignore.find_by(id: ignore_id).blank?
   end
 
+  def check_auto_init 
+    raise "auto_init值无效." if ignore_id && license_id && !auto_init
+  end
+
   def check_owner
     @project_owner = Owner.find_by(id: user_id)
     raise "user_id值无效." if user_id && @project_owner.blank?

app/forms/projects/migrate_form.rb

@@ -1,5 +1,5 @@
 class Projects::MigrateForm < BaseForm
-  attr_accessor :user_id, :name, :repository_name, :project_category_id, :description,
+  attr_accessor :user_id, :name, :repository_name, :project_category_id, :description, :auth_token,
                 :project_language_id, :clone_addr, :private, :is_mirror, :auth_username, :auth_password, :owner
 
   validates :user_id, :name, :repository_name, :clone_addr, presence: true

app/forms/register/base_form.rb

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

app/forms/register/remote_form.rb

@@ -1,15 +1,16 @@
 module Register
   class RemoteForm < Register::BaseForm
     # login 登陆方式，支持邮箱、登陆、手机号等
-    attr_accessor :username, :email, :password, :platform
+    attr_accessor :username, :email, :password, :platform, :user_id
 
     validates :username, :email, :password, presence: true
     validate :check!
     
     def check!
-      Rails.logger.info "Register::RemoteForm params: username: #{username}; email: #{email}; password: #{password}; platform: #{platform}"
-      check_login(username)
-      check_mail(email)
+      user = User.find_by(id: user_id)
+      Rails.logger.info "Register::RemoteForm params: id: #{user_id};  username: #{username}; email: #{email}; password: #{password}; platform: #{platform}"
+      check_login(username, user)
+      check_mail(email,user)
       check_password(password)
     end
   end

app/forms/users/user_cla_form.rb

@@ -0,0 +1,6 @@
+class Users::UserClaForm
+    include ActiveModel::Model
+    attr_accessor :email, :real_name, :cla_id
+    validates :email, presence: true, format: { with: CustomRegexp::EMAIL }
+  end
+  

app/helpers/admins/glcc_pr_check_helper.rb

@@ -0,0 +1,2 @@
+module Admins::GlccPrCheckHelper
+end

app/helpers/admins/identity_verifications_helper.rb

@@ -0,0 +1,2 @@
+module Admins::IdentityVerificationsHelper
+end

app/helpers/admins/page_themes_helper.rb

@@ -0,0 +1,2 @@
+module Admins::PageThemesHelper
+end

app/helpers/admins/site_pages_helper.rb

@@ -0,0 +1,2 @@
+module Admins::SitePagesHelper
+end

app/helpers/application_helper.rb

@@ -299,7 +299,7 @@ module ApplicationHelper
   end
 
   def download_url attachment,options={}
-    attachment_path(attachment,options)
+    attachment&.uuid.present? ? attachment_path(attachment.uuid,options) : attachment_path(attachment,options)
   end
 
   # 耗时：天、小时、分、秒

app/helpers/identity_verifications_helper.rb

@@ -0,0 +1,2 @@
+module IdentityVerificationsHelper
+end

app/helpers/organizations/clas_helper.rb

@@ -0,0 +1,2 @@
+module Organizations::ClasHelper
+end

app/helpers/pages_helper.rb

@@ -0,0 +1,2 @@
+module PagesHelper
+end

app/helpers/repositories_helper.rb

@@ -16,7 +16,11 @@ module RepositoriesHelper
 
   def image_type?(str)
     default_type = %w(png jpg gif tif psd svg bmp webp jpeg ico psd)
-    default_type.include?(str&.downcase)
+    default_type.include?(str.to_s.gsub("\r", "").downcase)
+  end
+
+  def is_text_file?(entry)
+    entry['is_text_file']
   end
 
   def is_readme?(type, str)
@@ -36,18 +40,26 @@ module RepositoriesHelper
   end
 
   def render_cache_commit_author(author_json)
+    user = nil
     if author_json["name"].present? && author_json["email"].present?
-      return find_user_in_redis_cache(author_json['name'], author_json['email']) 
+      user = 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']) 
+      user = find_user_in_redis_cache(author_json['Name'], author_json['Email'])
     end
+    if user.blank? && author_json["email"].present?
+      user = User.find_by(mail: author_json["email"])
+    end
+    if user.blank? && author_json["Email"].present?
+      user = User.find_by(mail: author_json["Email"])
+    end
+    user
   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')
+      content = Base64.decode64(content).force_encoding('UTF-8').valid_encoding? ? Base64.decode64(str).force_encoding('UTF-8') : Base64.decode64(str).force_encoding("GBK").encode("UTF-8")
 
       c_regex = /\!\[.*?\]\((.*?)\)/
       src_regex = /src=\"(.*?)\"/
@@ -107,19 +119,34 @@ module RepositoriesHelper
    def new_readme_render_decode64_content(str, owner, repo, ref, readme_path, readme_name)
     file_path = readme_path.include?('/') ? readme_path.gsub("/#{readme_name}", '') : readme_path.gsub("#{readme_name}", '')
     return nil if str.blank?
-    content = Base64.decode64(str).force_encoding('UTF-8')
+    content = Base64.decode64(str).force_encoding('UTF-8').valid_encoding? ? Base64.decode64(str).force_encoding('UTF-8') : Base64.decode64(str).force_encoding("GBK").encode("UTF-8")
     # s_regex = /\s\!\[.*?\]\((.*?)\)\s/
     s_regex_c = /`{1,2}[^`](.*?)`{1,2}/
     s_regex = /```([\s\S]*?)```[\s]?/
     s_regex_1 = /\[.*?\]\((.*?)\)/
+    # 变量图片相对路径
+    s_regex_2 = /\[.*?\]:(.*?)\n/
     src_regex = /src=\"(.*?)\"/
     src_regex_1 = /src=\'(.*?)\'/
+    src_regex_2 = /src = (.*?) /
+    src_regex_3 = /src= (.*?) /
+    src_regex_4 = /src =(.*?) /
+    src_regex_5 = /src =(.*?) /
+    href_regex = /href=\"(.*?)\"/
+    href_regex_1 = /href=\'(.*?)\'/
     ss_c = content.to_s.scan(s_regex_c)
     ss = content.to_s.scan(s_regex)
     ss_1 = content.to_s.scan(s_regex_1)
+    ss_2 = content.to_s.scan(s_regex_2)
     ss_src = content.to_s.scan(src_regex)
     ss_src_1 = content.to_s.scan(src_regex_1)
-    total_sources = {ss_c: ss_c,ss: ss, ss_1: ss_1, ss_src: ss_src, ss_src_1: ss_src_1} 
+    ss_src_2 = content.to_s.scan(src_regex_2)
+    ss_src_3 = content.to_s.scan(src_regex_3)
+    ss_src_4 = content.to_s.scan(src_regex_4)
+    ss_src_5 = content.to_s.scan(src_regex_5)
+    ss_href = content.to_s.scan(href_regex)
+    ss_href_1 = content.to_s.scan(href_regex_1)
+    total_sources = {ss_c: ss_c,ss: ss, ss_1: ss_1, ss_2: ss_2, ss_src: ss_src, ss_src_1: ss_src_1, ss_src_2: ss_src_2, ss_src_3: ss_src_3, ss_src_4: ss_src_4, ss_src_5: ss_src_5, ss_href: ss_href, ss_href_1: ss_href_1}
     # total_sources.uniq! 
     total_sources.except(:ss, :ss_c).each do |k, sources|
       sources.each do |s| 
@@ -128,28 +155,50 @@ module RepositoriesHelper
           # 链接直接跳过不做替换
           next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:') || s_content.blank?
           ext = File.extname(s_content)[1..-1]
+          ext = ext.split("?")[0] if ext.include?("?")
           if (image_type?(ext) || download_type(ext)) && !ext.blank?
             s_content = File.expand_path(s_content, file_path)
             s_content = s_content.split("#{Rails.root}/")[1]
             # content = content.gsub(s[0], "/#{s_content}")
-            s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw/#{s_content}?ref=#{ref}"].join
-            case k.to_s 
+            join_xxx = s_content.include?("?") ? "&" : "?"
+            s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw/#{s_content}#{join_xxx}ref=#{ref}"].join
+            case k.to_s
             when 'ss_src'
               content = content.gsub("src=\"#{s[0]}\"", "src=\"#{s_content}\"")
             when 'ss_src_1'
               content = content.gsub("src=\'#{s[0]}\'", "src=\'#{s_content}\'")
+            when 'ss_src_2'
+              content = content.gsub("src = #{s[0]}", "src=\'#{s_content}\'")
+            when 'ss_src_3'
+              content = content.gsub("src= #{s[0]}", "src=\'#{s_content}\'")
+            when 'ss_src_4'
+              content = content.gsub("src =#{s[0]}", "src=\'#{s_content}\'")
+            when 'ss_src_5'
+              content = content.gsub("src=#{s[0]}", "src=\'#{s_content}\'")
+            when 'ss_2'
+              content = content.gsub(/]:#{s[0]}/, "]: #{s_content.to_s.gsub(" ","").gsub("\r", "")}")
+            when 'ss_href'
+              content = content.gsub("href=\"#{s[0]}\"", "href=\"#{s_content}\"")
+            when 'ss_href_1'
+              content = content.gsub("href=\'#{s[0]}\'", "href=\'#{s_content}\'")
             else 
               content = content.gsub("(#{s[0]})", "(#{s_content})")
             end
           else
             path = [owner&.login, repo&.identifier, 'tree', ref, file_path].join("/")
             s_content = File.expand_path(s_content, path)
-            s_content = s_content.split("#{Rails.root}/")[1]
+            s_content = s_content.split("#{Rails.root}")[1]
             case k.to_s
             when 'ss_src'
               content = content.gsub("src=\"#{s[0]}\"", "src=\"/#{s_content}\"")
             when 'ss_src_1'
               content = content.gsub("src=\'#{s[0]}\'", "src=\'/#{s_content}\'")
+            when 'ss_2'
+              content = content.gsub(/]:#{s[0]}/, "]: /#{s_content.to_s.gsub(" ","").gsub("\r", "")}")
+            when 'ss_href'
+              content = content.gsub("href=\"#{s[0]}\"", "href=\"#{s_content}\"")
+            when 'ss_href_1'
+              content = content.gsub("href=\'#{s[0]}\'", "href=\'#{s_content}\'")
             else 
               content = content.gsub("(#{s[0]})", "(/#{s_content})")
             end
@@ -168,9 +217,10 @@ module RepositoriesHelper
     after_ss_c_souces.each_with_index do |s, index| 
       content = content.gsub("#{s[0]}","#{total_sources[:ss_c][index][0]}")
     end
-    
     return content
-  rescue
+  rescue Exception => e
+    Rails.logger.error("===================#{readme_path}:#{readme_name}:error:#{e}")
+    # e.backtrace.each { |msg| Rails.logger.error(msg) }
     return str
   end
 
@@ -186,8 +236,7 @@ module RepositoriesHelper
 
   def readme_decode64_content(entry, owner, repo, ref, path=nil)
     Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
-    content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
-    # Rails.logger.info("content===#{content}")
+    content = entry['content'].present? ? entry['content'] : Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
     # readme_render_decode64_content(content, owner, repo, ref)
     new_readme_render_decode64_content(content, owner, repo, ref, entry['path'], entry['name'])
   end
@@ -195,10 +244,12 @@ module RepositoriesHelper
   def decode64_content(entry, owner, repo, ref, path=nil)
     if is_readme?(entry['type'], entry['name'])
       Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
-      content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
+      content = entry['content'].present? ? entry['content'] : Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
       # Rails.logger.info("content===#{content}")
-      # readme_render_decode64_content(content, owner, repo, ref)
+      return Base64.decode64(content).force_encoding("GBK").encode("UTF-8") unless Base64.decode64(content).force_encoding('UTF-8').valid_encoding?
       return Base64.decode64(content).force_encoding('UTF-8')
+    elsif entry['is_text_file'] == true
+      return render_decode64_content(entry['content'])
     else
       file_type = File.extname(entry['name'].to_s)[1..-1]
       if image_type?(file_type)

app/helpers/users/clas_helper.rb

@@ -0,0 +1,2 @@
+module Users::ClasHelper
+end

app/interactors/gitea/delete_file_interactor.rb

@@ -42,6 +42,10 @@ module Gitea
     def render_result(response)
       if response.status == 200
         @result = JSON.parse(response.body)
+      else
+        Rails.logger.error("Gitea::Repository::Entries::DeleteService error[#{response.status}]======#{response.body}")
+        @error = "删除失败，请确认该分支是否是保护分支。"
+        @error = "删除失败，参数sha不匹配。" if response.body.to_s.include?("sha does not match")
       end
     end
 

app/interactors/gitea/update_file_interactor.rb

@@ -42,6 +42,9 @@ module Gitea
     def render_result(response)
       if response.status == 200
         @result = JSON.parse(response.body)
+      else
+        Rails.logger.error("Gitea::Repository::Entries::UpdateService error[#{response.status}]======#{response.body}")
+        @error = "更新失败，请确认该分支是否是保护分支。"
       end
     end
 

app/jobs/daily_platform_statistics_job.rb

@@ -0,0 +1,44 @@
+# 按天获取百度统计数据，pv，访问，ip和来源分类占比
+# 其他统计：前一周用户留存率
+class DailyPlatformStatisticsJob < ApplicationJob
+  queue_as :default
+
+  def perform(*args)
+    Rails.logger.info("*********开始统计*********")
+
+    tongji_service = Baidu::TongjiService.new
+    access_token = tongji_service.access_token
+    Rails.logger.info "job baidu_tongji_auth access_token ===== #{access_token}"
+    ActiveJob::Base.logger.info "job baidu_tongji_auth access_token ===== #{access_token}"
+    # 从最后一个记录日期开始，如果遗漏日期数据可以补充数据
+    last_date = DailyPlatformStatistic.order(:date).last
+    start_date = last_date.date
+    end_date = Time.now
+    if access_token.present?
+      tongji_service.overview_batch_add(start_date, end_date)
+
+      # 本周访问来源占比，每天记录一次，如果遗漏日期数据可以补充数据
+      tongji_service.source_from_batch_add(start_date, end_date)
+    end
+    # 周用户留存率
+    pre_week_user_ids = User.where(created_on: pre_week).pluck(:id).uniq
+    weekly_keep_user_count = User.where(id: pre_week_user_ids).where(last_login_on: current_week).count
+    weekly_keep_rate = format("%.2f", pre_week_user_ids.size > 0 ? weekly_keep_user_count.to_f / pre_week_user_ids.size : 0)
+
+    job_date = 1.days.ago
+    daily_statistic = DailyPlatformStatistic.find_or_initialize_by(date: job_date)
+    daily_statistic.weekly_keep_rate = weekly_keep_rate
+    daily_statistic.save
+  end
+
+  private
+
+  def current_week
+    Time.now.beginning_of_week..Time.now.end_of_day
+  end
+
+  def pre_week
+    # 7.days.ago.beginning_of_week..7.days.ago.beginning_of_week.end_of_week
+    Time.now.prev_week..Time.now.prev_week.end_of_week
+  end
+end

app/jobs/daily_project_statistics_job.rb

@@ -0,0 +1,35 @@
+class DailyProjectStatisticsJob < ApplicationJob
+  queue_as :cache
+
+  def perform
+    date = (Date.today - 1.days).to_s
+    daily_data_keys = $redis_cache.keys("v2-project-statistic:*-#{date}")
+    daily_data_keys.each do |key| 
+      result = $redis_cache.hgetall(key)
+      project_id = key.gsub('v2-project-statistic:', '').gsub("-#{date}", '')
+      next unless Project.find_by_id(project_id).present?
+      visits = result["visits"].to_i 
+      watchers = result["watchers"].to_i 
+      praises = result["praises"].to_i
+      forks = result["forks"].to_i 
+      issues = result["issues"].to_i 
+      closed_issues = result["closed_issues"].to_i
+      pullrequests = result["pullrequests"].to_i 
+      commits = result["commits"].to_i 
+      score = visits *1 + watchers *5 + praises * 5 + forks * 10 + issues *5 + pullrequests * 10 + commits * 5 
+      DailyProjectStatistic.create!(
+        project_id: project_id,
+        date: date,
+        score: score ,
+        visits: visits,
+        watchers: watchers,
+        praises: praises,
+        forks: forks, 
+        issues: issues,
+        closed_issues: closed_issues,
+        pullrequests: pullrequests,
+        commits: commits
+      )
+    end
+  end
+end

app/jobs/delay_expired_issue_and_milestone_job.rb

@@ -0,0 +1,16 @@
+class DelayExpiredIssueAndMilestoneJob < ApplicationJob
+  queue_as :message
+
+  def perform
+    Issue.where(due_date: Date.today + 1.days).find_each do |issue|
+      SendTemplateMessageJob.perform_later('IssueExpire', issue.id) if Site.has_notice_menu?
+    end
+    Version.where(effective_date: Date.today + 1.days).find_each do |version| 
+      SendTemplateMessageJob.perform_later('ProjectMilestoneEarlyExpired', version.id) if Site.has_notice_menu?
+    end
+    Version.where(effective_date: Date.today - 1.days).find_each do |version|
+      SendTemplateMessageJob.perform_later('ProjectMilestoneExpired', version.id) if Site.has_notice_menu?
+    end
+  end
+
+end

app/jobs/delay_expired_issue_job.rb

@@ -1,10 +0,0 @@
-class DelayExpiredIssueJob < ApplicationJob
-  queue_as :message
-
-  def perform
-    Issue.where(due_date: Date.today + 1.days).find_each do |issue|
-      SendTemplateMessageJob.perform_later('IssueExpire', issue.id) if Site.has_notice_menu?
-    end
-  end
-
-end

app/jobs/migrate_remote_repository_job.rb

@@ -16,10 +16,12 @@ class MigrateRemoteRepositoryJob < ApplicationJob
       project_id = repo&.project&.id
       puts "############ mirror project_id,user_id: #{project_id},#{user_id}  ############"
       OpenProjectDevOpsJob.set(wait: 5.seconds).perform_later(project_id, user_id) if project_id.present? && user_id.present?
+      UpdateProjectTopicJob.set(wait: 1.seconds).perform_later(project_id) if project_id.present?
       puts "############ mirror status: #{repo.mirror.status} ############"
     else 
       repo&.mirror&.failed!
     end
-    BroadcastMirrorRepoMsgJob.perform_later(repo.id) unless repo&.mirror.waiting?
+    # UpdateProjectTopicJob 中语言要延迟1S才能获取
+    BroadcastMirrorRepoMsgJob.set(wait: 1.seconds).perform_later(repo.id) unless repo&.mirror.waiting?
   end
 end

app/jobs/send_template_message_job.rb

@@ -8,7 +8,7 @@ class SendTemplateMessageJob < ApplicationJob
       receivers_id, template_id, props = args[0], args[1], args[2]
       template = MessageTemplate.find_by_id(template_id)
       return unless template.present?
-      receivers = User.where(id: receivers_id).or(User.where(mail: receivers_id))
+      receivers = User.where("id in(?)", receivers_id).or(User.where(mail: receivers_id))
       not_exists_receivers = receivers_id - receivers.pluck(:id) - receivers.pluck(:mail)
       receivers_string, content, notification_url = MessageTemplate::CustomTip.get_message_content(receivers, template, props)
       Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {receivers_id: receivers_id, template_id: template_id, props: props})
@@ -221,6 +221,20 @@ class SendTemplateMessageJob < ApplicationJob
         receivers_email_string, email_title, email_content = MessageTemplate::ProjectMilestone.get_email_message_content(receiver, operator, milestone)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
       end
+    when 'ProjectMilestoneExpired'
+      milestone_id = args[0]
+      milestone = Version.find_by_id(milestone_id)
+      return unless milestone.present? && milestone&.project.present?
+      receivers = User.where(id: milestone.user_id)
+      receivers_string, content, notification_url = MessageTemplate::ProjectMilestoneExpired.get_message_content(receivers, milestone)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {milestone_id: milestone_id, operator_id: operator_id})
+    when 'ProjectMilestoneEarlyExpired'
+      milestone_id = args[0]
+      milestone = Version.find_by_id(milestone_id)
+      return unless milestone.present? && milestone&.project.present?
+      receivers = User.where(id: milestone.user_id)
+      receivers_string, content, notification_url = MessageTemplate::ProjectMilestoneEarlyExpired.get_message_content(receivers, milestone)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {milestone_id: milestone_id, operator_id: operator_id})
     when 'ProjectPraised'
       operator_id, project_id = args[0], args[1]
       operator = User.find_by_id(operator_id)

app/jobs/sync_repo_update_time_job.rb

@@ -3,9 +3,9 @@ class SyncRepoUpdateTimeJob < ApplicationJob
 
   def perform(*args)
     # Do something later
-    Project.forge.find_each do |project|
-      update_repo_time!(project)
-    end
+    # Project.forge.find_each do |project|
+    #   update_repo_time!(project)
+    # end
   end
 
   private

app/jobs/touch_webhook_job.rb

@@ -49,9 +49,9 @@ class TouchWebhookJob < ApplicationJob
     when 'IssueComment'
       issue_id, sender_id, comment_id, action_type, comment_json = args[0], args[1], args[2], args[3], args[4]
       issue = Issue.find_by_id issue_id
-      comment = issue.comment_journals.find_by_id comment_id
       sender = User.find_by_id sender_id
-      return if issue.nil? || sender.nil? 
+      return if issue.nil? || sender.nil?
+      comment = issue.comment_journals.find_by_id comment_id
       return if action_type == 'edited' && comment_json.blank?
 
       issue.project.webhooks.each do |webhook| 
@@ -63,10 +63,10 @@ class TouchWebhookJob < ApplicationJob
     when 'PullRequestComment'
       issue_id, sender_id, comment_id, action_type, comment_json = args[0], args[1], args[2], args[3], args[4]
       issue = Issue.find_by_id(issue_id)
-      comment = issue.comment_journals.find_by_id comment_id
       sender = User.find_by_id sender_id
       pull = issue.try(:pull_request)
-      return if pull.nil? || sender.nil? 
+      return if issue.nil? || pull.nil? || sender.nil?
+      comment = issue.comment_journals.find_by_id comment_id
       return if action_type == 'edited' && comment_json.blank?
 
       pull.project.webhooks.each do |webhook| 

app/jobs/update_project_topic_job.rb

@@ -0,0 +1,33 @@
+class UpdateProjectTopicJob < ApplicationJob
+  include ProjectsHelper
+
+  queue_as :message
+
+  def perform(project_id)
+    project = Project.find_by(id: project_id)
+    return if project.blank?
+    begin
+      languages = $gitea_client.get_repos_languages_by_owner_repo(project.owner.login, project.identifier)
+      puts "#{project.owner.login}/#{project.identifier} get_repos_languages:#{languages}"
+      topic_count = 0
+      if project.project_category_id.present?
+        project_topic = ProjectTopic.find_or_create_by!(name: project.project_category.name.downcase)
+        project_topic_ralate = project_topic.project_topic_ralates.find_or_create_by!(project_id: project.id)
+        if project_topic.present? && project_topic_ralate.present?
+          topic_count +=1
+        end
+      end
+      languages.each do |k, _|
+        next if topic_count >= 3
+        project_topic = ProjectTopic.find_or_create_by!(name: k.downcase)
+        project_topic_ralate = project_topic.project_topic_ralates.find_or_create_by!(project_id: project.id)
+        if project_topic.present? && project_topic_ralate.present?
+          topic_count +=1
+        end
+      end
+    rescue => e
+      puts "get_repos_languages: error:#{e.message}"
+    end
+  end
+
+end

app/libs/getway.rb

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

app/mailers/user_mailer.rb

@@ -30,4 +30,11 @@ class UserMailer < ApplicationMailer
   def feedback_email(mail, title, content)
     mail(to: mail, subject: title, content_type: "text/html", body: content)
   end
+
+  def glcc_pr_check_email(mail, title, name, content)
+    @content = content
+    @name = name
+    mail(to: mail, subject: title)
+  end
+  
 end

app/models/attachment.rb

@@ -1,41 +1,46 @@
-# == Schema Information
-#
-# Table name: attachments
-#
-#  id                        :integer          not null, primary key
-#  container_id              :integer
-#  container_type            :string(30)
-#  filename                  :string(255)      default(""), not null
-#  disk_filename             :string(255)      default(""), not null
-#  filesize                  :integer          default("0"), not null
-#  content_type              :string(255)      default("")
-#  digest                    :string(60)       default(""), not null
-#  downloads                 :integer          default("0"), not null
-#  author_id                 :integer          default("0"), not null
-#  created_on                :datetime
-#  description               :text(65535)
-#  disk_directory            :string(255)
-#  attachtype                :integer          default("1")
-#  is_public                 :integer          default("1")
-#  copy_from                 :string(255)
-#  quotes                    :integer          default("0")
-#  is_publish                :integer          default("1")
-#  publish_time              :datetime
-#  resource_bank_id          :integer
-#  unified_setting           :boolean          default("1")
-#  cloud_url                 :string(255)      default("")
-#  course_second_category_id :integer          default("0")
-#  delay_publish             :boolean          default("0")
-#  link                      :string(255)
-#  clone_id                  :integer
-#
-# Indexes
-#
-#  index_attachments_on_author_id                        (author_id)
-#  index_attachments_on_clone_id                         (clone_id)
-#  index_attachments_on_container_id_and_container_type  (container_id,container_type)
-#  index_attachments_on_created_on                       (created_on)
-#
+# == Schema Information
+#
+# Table name: attachments
+#
+#  id                        :integer          not null, primary key
+#  container_id              :integer
+#  container_type            :string(30)
+#  filename                  :string(255)      default(""), not null
+#  disk_filename             :string(255)      default(""), not null
+#  filesize                  :integer          default("0"), not null
+#  content_type              :string(255)      default("")
+#  digest                    :string(60)       default(""), not null
+#  downloads                 :integer          default("0"), not null
+#  author_id                 :integer          default("0"), not null
+#  created_on                :datetime
+#  description               :text(65535)
+#  disk_directory            :string(255)
+#  attachtype                :integer          default("1")
+#  is_public                 :integer          default("1")
+#  copy_from                 :integer
+#  quotes                    :integer          default("0")
+#  is_publish                :integer          default("1")
+#  publish_time              :datetime
+#  resource_bank_id          :integer
+#  unified_setting           :boolean          default("1")
+#  cloud_url                 :string(255)      default("")
+#  course_second_category_id :integer          default("0")
+#  delay_publish             :boolean          default("0")
+#  memo_image                :boolean          default("0")
+#  extra_type                :integer          default("0")
+#  uuid                      :string(255)
+#
+# Indexes
+#
+#  index_attachments_on_author_id                        (author_id)
+#  index_attachments_on_container_id_and_container_type  (container_id,container_type)
+#  index_attachments_on_course_second_category_id        (course_second_category_id)
+#  index_attachments_on_created_on                       (created_on)
+#  index_attachments_on_is_public                        (is_public)
+#  index_attachments_on_quotes                           (quotes)
+#
+
+
 
 
 
@@ -65,6 +70,7 @@ class Attachment < ApplicationRecord
   scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type, :container_type, :container_id) }
   scope :search_by_container,           -> (ids) {where(container_id: ids)}
   scope :unified_setting, -> {where("unified_setting = ? ", 1)}
+  scope :where_id_or_uuid, -> (id) { (Float(id) rescue nil).present? ? where(id: id) : where(uuid: id) }
 
   validates_length_of :description, maximum: 100, message: "不能超过100个字符"
 
@@ -94,6 +100,11 @@ class Attachment < ApplicationRecord
     downloads
   end
 
+  def generate_uuid
+    self.uuid = uuid || SecureRandom.uuid
+    save!
+  end
+
   def quotes_count
     quotes.nil? ? 0 : quotes
   end