Merge branch 'standalone_develop' into pm_project_develop

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/identity_verifications_controller.rb

@@ -14,12 +14,14 @@ class Admins::IdentityVerificationsController < Admins::BaseController
     end
 
     def update
-        if @identity_verification.update(update_params)
+        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] = "更新成功"
-        else  
-            redirect_to admins_identity_verifications_path
-            flash[:danger] = "更新失败"
         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/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

@@ -29,8 +29,12 @@ class Admins::SitePagesController <  Admins::BaseController
     end
 
     def update
-        @site_page.update(update_params)
-        flash[:success] = '保存成功'
+        if update_params[:state] == "false" && update_params[:state_description].blank?
+            flash[:danger] = '关闭站点理由不能为空'
+        else
+            @site_page.update(update_params)
+            flash[:success] = '保存成功'
+        end
         render 'edit'
     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/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)
+  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)
+    puts @result_object
+  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)
@@ -33,6 +33,15 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
     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 

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, {page: page, limit: limit}, current_user&.gitea_token)
+  end
 end

app/controllers/organizations/organization_users_controller.rb

@@ -4,17 +4,31 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
   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
-
-    @organization_users = kaminari_paginate(@organization_users)
+    @users = kaminari_paginate(users)
   end
 
   def pm_check_user

app/controllers/projects_controller.rb

@@ -338,7 +338,7 @@ class ProjectsController < ApplicationController
 
   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,
+                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private, :auto_init,
                   :blockchain, :blockchain_token_all, :blockchain_init_token, :pr_view_admin)
   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
 

app/controllers/site_pages_controller.rb

@@ -17,23 +17,31 @@ class SitePagesController < ApplicationController
     end
     
     def create
-        return normal_status(-1, "你还未开通Page服务，无法进行部署") unless current_user.website_permission
-        return normal_status(-1, "你已使用了 #{params[:identifier]} 作为page标识") if Page.exists?(identifier: params[:identifier], user: current_user)
-        return normal_status(-1, "该仓库已开通Page服务") if Page.exists?(project: @project)
+        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)
+        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?("部署成功")
+        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)
@@ -42,22 +50,22 @@ class SitePagesController < ApplicationController
     end
 
     def softbot_build
-        branch = params[:ref].split("/").last
+        branch = params[:ref].split('/').last
         user = User.find_by_login params[:repository][:owner][:login]
-        return normal_status(-1, "你还未开通Page服务，无法进行部署") unless user.website_permission
+        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)
+        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"]
+        data = JSON.parse(response_str)['result']
         if data.nil?
-            data = JSON.parse(response_str)["error"]
+            data = JSON.parse(response_str)['error']
         end
         
-        if data.include?("部署成功")
+        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)
@@ -85,7 +93,7 @@ class SitePagesController < ApplicationController
     end
 
     def theme_params
-        params[:language_frame] || "hugo"
+        params[:language_frame] || 'hugo'
     end
 
     def create_params