Merge branch 'standalone_develop' into pm_project_develop

# Conflicts:
#	app/models/attachment.rb
#	app/views/api/v1/attachments/_simple_detail.json.jbuilder

app/controllers/api/v1/base_controller.rb

@@ -55,6 +55,11 @@ class Api::V1::BaseController < ApplicationController
     return render_forbidden if !current_user.admin? && !@project.operator?(current_user) && !(@project.fork_project.present? && @project.fork_project.operator?(current_user))
   end
 
+  def require_member_above 
+    @project = load_project 
+    return render_forbidden if !current_user.admin? && !@project.member?(current_user)
+  end
+
   # 具有对仓库的访问权限
   def require_public_and_member_above
     @project = load_project

app/controllers/api/v1/project_datasets_controller.rb

@@ -0,0 +1,10 @@
+class Api::V1::ProjectDatasetsController < Api::V1::BaseController 
+
+  def index 
+    return render_error("请输入正确的项目id字符串") unless params[:ids].present? 
+    ids = params[:ids].split(",")
+    @project_datasets = ProjectDataset.where(project_id: ids).includes(:license, :project)
+    @project_datasets = kaminari_unlimit_paginate(@project_datasets)
+  end
+
+end

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

@@ -11,6 +11,9 @@ class Api::V1::Projects::CommitsController < Api::V1::BaseController
   end
 
   def recent
-    @result_object = Api::V1::Projects::Commits::RecentService.call(@project, {page: page, limit: limit}, current_user&.gitea_token)
+    hash = Api::V1::Projects::Commits::RecentService.call(@project, {keyword: params[:keyword], page: page, limit: limit}, current_user&.gitea_token)
+    @result_object = hash[:result]
+    @object_detail = hash[:detail]
+    puts @object_detail
   end
 end

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

@@ -0,0 +1,51 @@
+class Api::V1::Projects::DatasetsController < Api::V1::BaseController
+  before_action :require_public_and_member_above, only: [:show]
+  before_action :require_member_above, only: [:create, :update]
+  before_action :find_dataset, only: [:update, :show]
+  before_action :check_menu_authorize
+
+  def create 
+    ::Projects::Datasets::CreateForm.new(dataset_params).validate!
+    return render_error('该项目下已存在数据集！') if @project.project_dataset.present?
+    @project_dataset = ProjectDataset.new(dataset_params.merge!(project_id: @project.id))
+    if @project_dataset.save! 
+      render_ok
+    else 
+      render_error('创建数据集失败！')
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def update 
+    ::Projects::Datasets::CreateForm.new(dataset_params).validate!
+    @project_dataset.attributes = dataset_params
+    if @project_dataset.save! 
+      render_ok
+    else
+      render_error("更新数据集失败！")
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def show 
+    @attachments = kaminari_paginate(@project_dataset.attachments.includes(:author))
+  end
+
+  private 
+  def dataset_params 
+    params.permit(:title, :description, :license_id, :paper_content)
+  end
+
+  def find_dataset 
+    @project_dataset = @project.project_dataset 
+    return render_not_found unless @project_dataset.present?
+  end
+
+  def check_menu_authorize
+    return render_not_found unless @project.has_menu_permission("dataset")
+  end
+end

app/controllers/application_controller.rb

@@ -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

app/controllers/attachments_controller.rb

@@ -95,6 +95,9 @@ class AttachmentsController < ApplicationController
         @attachment.disk_directory = month_folder
         @attachment.cloud_url = remote_path
         @attachment.uuid = SecureRandom.uuid
+        @attachment.description = params[:description]
+        @attachment.container_id = params[:container_id]
+        @attachment.container_type = params[:container_type]
         @attachment.save!
       else
         logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
@@ -124,7 +127,7 @@ class AttachmentsController < ApplicationController
 
   # 附件为视频时，点击播放
   def preview_attachment
-    attachment = Attachment.find_by(id: params[:id])
+    attachment = Attachment.where_id_or_uuid(params[:id]).first
     dir_path = "#{Rails.root}/public/preview"
     Dir.mkdir(dir_path) unless Dir.exist?(dir_path)
     if params[:status] == "preview"

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/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
+            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/organizations/teams_controller.rb

@@ -67,7 +67,17 @@ class Organizations::TeamsController < Organizations::BaseController
     tip_exception("组织团队不允许被删除") if @team.owner?
     ActiveRecord::Base.transaction do
       Gitea::Organization::Team::DeleteService.call(@organization.gitea_token, @team.gtid)
+      all_user_ids  =  @organization.team_users.pluck(:user_id)
+      team_user_ids  =  @team.team_users.pluck(:user_id)
+      # 当前删除团队中成员在其他组织其他团队不存在的成员需清除组织
+      remove_user_ids = team_user_ids - all_user_ids
       @team.destroy!
+      if remove_user_ids.present?
+        User.where(id: remove_user_ids).each do |user|
+          @organization.organization_users.find_by(user_id: user.id).destroy!
+          Gitea::Organization::OrganizationUser::DeleteService.call(@organization.gitea_token, @organization.login, user.login)
+        end
+      end
     end
     render_ok
   rescue Exception => e

app/controllers/projects_controller.rb

@@ -21,6 +21,7 @@ class ProjectsController < ApplicationController
     menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
     menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls") && @project.forge?
     menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") && @project.forge?
+    menu.append(menu_hash_by_name("dataset")) if @project.has_menu_permission("dataset") && @project.forge?
     menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions")
     menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge?
     menu.append(menu_hash_by_name("services")) if @project.has_menu_permission("services") && @project.forge? && (current_user.admin? || @project.member?(current_user.id))
@@ -42,7 +43,8 @@ class ProjectsController < ApplicationController
     @total_count =
       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
+        not_category_count = Project.where(project_category_id: nil).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 + not_category_count
       elsif params[:search].present? || params[:topic_id].present?
         @projects.total_count
       else
@@ -58,7 +60,10 @@ class ProjectsController < ApplicationController
       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
+  rescue Gitea::Api::ServerError => ex 
+    uid_logger_error(ex.message)
+    tip_exception(ex.http_code, ex.message)
+  rescue ApplicationService::Error => e
     uid_logger_error(e.message)
     tip_exception(e.message)
   end
@@ -204,7 +209,8 @@ class ProjectsController < ApplicationController
 
         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)

app/controllers/pull_requests_controller.rb

@@ -203,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, "请选择合并方式")

app/controllers/version_releases_controller.rb

@@ -1,4 +1,5 @@
 class VersionReleasesController < ApplicationController
+  include ApplicationHelper
   before_action :load_repository
   before_action :set_user
   before_action :require_login, except: [:index, :show]
@@ -126,6 +127,16 @@ class VersionReleasesController < ApplicationController
     end
   end
 
+  def download
+    tip_exception(404, '您访问的页面不存在或已被删除') if params["tag_name"].blank? || params["filename"].blank?
+    version = @repository.version_releases.find_by(tag_name: params["tag_name"])
+    attachment = version.attachments.find_by(filename: params["filename"])
+    tip_exception(404, '您访问的页面不存在或已被删除') if attachment.blank?
+    send_file(absolute_path(local_path(attachment)), filename: attachment.title, stream: false, type: attachment.content_type.presence || 'application/octet-stream')
+    update_downloads(attachment)
+    # redirect_to "/api/attachments/#{attachment.uuid}"
+  end
+
 
   private
   def set_user