FIX merge develop branch adn fix confict

.gitignore

@@ -36,6 +36,7 @@ public/react/yarn.lock
 /.idea/*
 
 # Ignore react node_modules
+public/system/*
 public/react/*
 /public/react/.cache
 /public/react/node_modules/
@@ -83,3 +84,4 @@ educoder.sql
 redis_data/
 Dockerfile
 dump.rdb
+.tags*

CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## [v3.0.3](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-05-08
+
+* BUGFIXES
+  * Fix 解决易修标题过长导致的排版问题(45469)
+  * Fix 解决合并请求详情页面排版错误的问题(45457)
+  * FIX 解决转移仓库界面专有名词描述错误的问题(45455)
+  * Fix 解决markdown格式文件自动生成数字排序的问题(45454)
+  * Fix 解决镜像项目源地址不显示的问题(45403)
+  * Fix 解决镜像项目导航显示错误问题(45398)
+  * Fix 解决其他相关bug
+
+* ENHANCEMENTS
+  * UPDATE 用户注册时，账号和密码正则匹配调整(45336) (45318) (45290)
+  * ADD 创建组织各属性添加规则匹配功能(45313) (45289)
+  * ADD 创建团建各属性添加规则匹配功能(45334) (45325) (45287)
+  * ADD 仓库转移功能(45017) (45015)
+ 
+## [v3.0.2](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-04-23
+
+* BUGFIXES
+  * Fix 解决部分用户头像不显示问题
+  * Fix 解决代码库模块中最左侧目录中的文件定位加载不准确的问题
+  * FIX 解决团队管理页面中项目链接错误问题
+  * Fix 解决markdown格式文件显示问题
+  * Fix 解决组织名下创建项目报错的问题
+  * Fix 解决组织名下的项目，创建issue报错的问题
+  * Fix 解决组织名下创建团队提示信息信息显示错误问题
+  * Fix 解决点击组织图片时，链接加载错误问题
+  * Fix 修复查询版本库信息安全漏洞
+  * Fix 解决修复团队成员操作访问组织仓库报403错误的问题
+  * Fix 解决owners团队成员对仓库添加成功失败的问题
+
+* ENHANCEMENTS
+  * ADD 自动生产用户头像功能
+  * ADD 创建组织支持中文名称
+  * ADD 创建团建支持中文名称
+  * ADD 组织名称统一显示中文名
+  * ADD 团队名称统一显示中文名
+  * ADD 用户头像悬浮时展示相关信息
+  * ADD 项目详情页添加实践课程链接入口
+  * ADD README文件页面添加添加目录导航功能
+  * UPDATE 升级改版底部footer信息
+  * UPDATE 升级用户操作版本库权限
+
 ## [v3.0.1](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-03-19
 
 * BUGFIXES

Gemfile

@@ -126,3 +126,5 @@ gem 'request_store'
 gem 'harmonious_dictionary', '~> 0.0.1'
 
 gem 'parallel', '~> 1.19', '>= 1.19.1'
+
+gem 'letter_avatar'

Gemfile.lock

@@ -162,6 +162,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.0)
     kaminari-core (1.2.0)
+    letter_avatar (0.3.8)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -456,6 +457,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   kaminari (~> 1.1, >= 1.1.1)
+  letter_avatar
   listen (>= 3.0.5, < 3.2)
   mysql2 (>= 0.4.4, < 0.6.0)
   oauth2

README.md

@@ -21,7 +21,7 @@ Trustie （确实）是一个以大众化协同开发、开放式资源共享、
 
 * Redis 5+
 
-* NodeJS > 13.0.0
+* imagemagick
 
 ### Steps
 
@@ -65,7 +65,7 @@ default: &default
 
 **因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/Trustie/gitea-binary**
 
-#### 配置gitea服务步骤
+**配置gitea服务步骤**
 1. 部署gitea服务，并注册root账户
 2. 修改forge平台的 config/configuration.yml中的gitea服务指向地址，如：
 
@@ -80,60 +80,64 @@ gitea:
 #### 6. 安装redis环境
 **请自行搜索各平台如何安装部署redis环境**
 
+#### 7. 安装imagemagick插件
+- Mac OS X
+```bash
+ brew install imagemagick ghostscript
+```
 
-#### 7. 创建数据库
+- Linux
+```bash
+sudo apt-get install -y imagemagick
+```
+
+#### 8. 创建数据库
 **开发环境为development， 生成环境为production**
 ```bash
 rails db:create  RAILS_ENV=development
 ```
 
-#### 8. 导入数据表结构
+#### 9. 导入数据表结构
 
 ```bash
 bundle exec rake sync_table_structure:import_csv
 ```
 
-#### 9. 执行migrate迁移文件
+#### 10. 执行migrate迁移文件
 **开发环境为development， 生成环境为production**
 ```bash
 rails db:migrate RAILS_ENV=development
 ```
 
-#### 10. clone前端代码
+#### 11. clone前端代码
 **将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
 ```bash
 git clone -b standalone https://git.trustie.net/jasder/build.git
 ```
 
-#### 11. 启动redis(此处已mac系统为例)
+#### 12. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```
 
-#### 12. 启动sidekiq
+#### 13. 启动sidekiq
 **开发环境为development， 生成环境为production**
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-#### 13. 启动rails服务
+#### 14. 启动rails服务
 ```bash
 rails s
 ```
 
-#### 14. 浏览器访问
-在浏览器中输入如下地址访问：
-```bash
-http://localhost:3000/
-```
-
 #### 15. 浏览器访问
 在浏览器中输入如下地址访问：
 ```bash
 http://localhost:3000/
 ```
 
-#### 15. 其他说明
+#### 16. 其他说明
 通过页面注册都第一个用户为平台管理员用户
 
 ## 页面展示

app/assets/javascripts/admins/faqs.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/helps/faqs.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/faqs.scss

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

app/assets/stylesheets/helps/faqs.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the helps/faqs 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

@@ -183,6 +183,7 @@ class AccountsController < ApplicationController
 
   # 用户登录
   def login
+    Users::LoginForm.new(account_params).validate!
     @user = User.try_to_login(params[:login], params[:password])
 
     return normal_status(-2, "错误的账号或密码") if @user.blank?
@@ -363,4 +364,7 @@ class AccountsController < ApplicationController
     params.require(:user).permit(:login, :email, :phone)
   end
 
+  def account_params 
+    params.require(:account).permit(:login, :password)
+  end
 end

app/controllers/admins/faqs_controller.rb

@@ -0,0 +1,58 @@
+class Admins::FaqsController < Admins::BaseController
+  before_action :find_faq, only: [:edit,:update, :destroy]
+
+  def index
+    sort_by = params[:sort_by] ||= 'updated_at'
+    sort_direction = params[:sort_direction] ||= 'desc'
+
+    keyword = params[:keyword].to_s.strip
+    collection = Faq.search_question(keyword).order("#{sort_by} #{sort_direction}")
+    @faqs = paginate collection
+  end
+
+  def new 
+    @faq = Faq.new
+  end
+
+  def edit 
+  end
+
+  def update
+    begin
+      @faq.update!(faq_params)
+      flash[:success] = '修改成功'
+    rescue Exception
+      flash[:danger] = @faq.errors.full_messages.to_sentence
+    end
+
+    redirect_to admins_faqs_path
+  end
+
+  def destroy
+    @faq.destroy
+
+    redirect_to admins_faqs_path 
+    flash[:success] = "删除成功"
+  end
+
+  def create
+    @faq = Faq.new(faq_params)
+    begin
+      @faq.save!
+      flash[:success] = '创建成功'
+    rescue Exception
+      flash[:danger] = @faq.errors.full_messages.to_sentence
+    end
+    redirect_to admins_faqs_path
+  end
+  
+  private
+  def find_faq
+    @faq = Faq.find params[:id]
+  end
+  
+  def faq_params
+    params.require(:faq).permit(:question, :url)
+  end
+  
+end

app/controllers/application_controller.rb

@@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base
 	DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
 	OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"
 
-	helper_method :current_user
+	helper_method :current_user, :base_url
 
 	# 所有请求必须合法签名
 	def check_sign
@@ -770,6 +770,11 @@ class ApplicationController < ActionController::Base
 		@repository ||= load_project&.repository
 	end
 
+	def base_url
+		request.base_url
+	end
+	
+
   private
 	def object_not_found
 		uid_logger("Missing template or cant't find record, responding with 404")

app/controllers/concerns/acceleratorable.rb

@@ -0,0 +1,28 @@
+module Acceleratorable
+  extend ActiveSupport::Concern
+
+  def enable_accelerator?(clone_addr)
+    clone_addr.include?(github_domain) || clone_addr.include?(gitlab_domain)
+  end
+  
+  def accelerator_url(repo_name)
+    [accelerator_domain, accelerator_username, "#{repo_name}.git"].join('/')
+  end
+
+  def github_domain
+    'github.com'
+  end
+
+  def gitlab_domain
+    'gitlab.com'
+  end
+
+  def accelerator_domain
+    Gitea.gitea_config[:accelerator]["domain"]
+  end
+
+  def accelerator_username
+    Gitea.gitea_config[:accelerator]["access_key_id"]
+  end
+  
+end

app/controllers/helps/faqs_controller.rb

@@ -0,0 +1,8 @@
+class Helps::FaqsController < ApplicationController
+  skip_before_action :check_sign, :user_setup
+
+  def index
+    faqs = Faq.select_without_id.order(updated_at: :desc)
+    render json: faqs.as_json(:except => [:id])
+  end
+end

app/controllers/issues_controller.rb

@@ -101,51 +101,46 @@ class IssuesController < ApplicationController
   end
 
   def create
-    if params[:subject].blank?
+    issue_params = issue_send_params(params)
-      normal_status(-1, "标题不能为空")
+    Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
-    elsif params[:subject].to_s.size > 255
+    @issue = Issue.new(issue_params)
-      normal_status(-1, "标题不能超过255个字符")
+    if @issue.save!
-    else
+      if params[:attachment_ids].present?
-      issue_params = issue_send_params(params)
+        params[:attachment_ids].each do |id|
-
+          attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
-      @issue = Issue.new(issue_params)
+          unless attachment.blank?
-      if @issue.save!
+            attachment.container = @issue
-        if params[:attachment_ids].present?
+            attachment.author_id = current_user.id
-          params[:attachment_ids].each do |id|
+            attachment.description = ""
-            attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+            attachment.save
-            unless attachment.blank?
-              attachment.container = @issue
-              attachment.author_id = current_user.id
-              attachment.description = ""
-              attachment.save
-            end
           end
         end
-        if params[:issue_tag_ids].present?
+      end
-          params[:issue_tag_ids].each do |tag|
+      if params[:issue_tag_ids].present?
-            IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
+        params[:issue_tag_ids].each do |tag|
-          end
+          IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
         end
-        if params[:assigned_to_id].present?
+      end
-          Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
+      if params[:assigned_to_id].present?
-                         container_id: @issue.id, container_type: 'Issue',
+        Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
-                         parent_container_id: @project.id, parent_container_type: "Project",
+                       container_id: @issue.id, container_type: 'Issue',
-                         tiding_type: 'issue', status: 0)
+                       parent_container_id: @project.id, parent_container_type: "Project",
-        end
+                       tiding_type: 'issue', status: 0)
-
-        #为悬赏任务时, 扣除当前用户的积分
-        if params[:issue_type].to_s == "2"
-          post_to_chain("minus", params[:token].to_i, current_user.try(:login))
-        end
-
-        @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
-        render json: {status: 0, message: "创建成", id: @issue.id}
-      else
-        normal_status(-1, "创建失败")
       end
 
-    end
+      #为悬赏任务时, 扣除当前用户的积分
+      if params[:issue_type].to_s == "2"
+        post_to_chain("minus", params[:token].to_i, current_user.try(:login))
+      end
 
+      @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
+      render json: {status: 0, message: "创建成", id: @issue.id}
+    else
+      normal_status(-1, "创建失败")
+    end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
   end
 
   def edit
@@ -199,7 +194,7 @@ class IssuesController < ApplicationController
       normal_status(-1, "不允许修改为关闭状态")
     else
       issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-
+      Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
       if @issue.update_attributes(issue_params)
         if params[:status_id].to_i == 5  #任务由非关闭状态到关闭状态时
           @issue.issue_times.update_all(end_time: Time.now)
@@ -225,6 +220,9 @@ class IssuesController < ApplicationController
         normal_status(-1, "更新失败")
       end
     end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
   end
 
   def show

app/controllers/members_controller.rb

@@ -56,7 +56,7 @@ class MembersController < ApplicationController
   end
 
   def member_exists?
-    @project.member?(params[:user_id])
+    @project.members.exists?(params[:user_id])
   end
 
   def operate!
@@ -68,6 +68,6 @@ class MembersController < ApplicationController
   end
 
   def check_member_not_exists!
-    return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists?
+    return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless @project.member?(params[:user_id])
   end
 end

app/controllers/organizations/base_controller.rb

@@ -17,11 +17,12 @@ class Organizations::BaseController < ApplicationController
   end
 
   def org_privacy_condition
+    return false if current_user.admin?
     @organization.organization_extension.privacy? && @organization.organization_users.where(user_id: current_user.id).blank?
   end
 
   def team_not_found_condition
-    @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
+    !current_user&.admin? && @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
   end
 
   def user_mark

app/controllers/organizations/organizations_controller.rb

@@ -1,5 +1,5 @@
 class Organizations::OrganizationsController < Organizations::BaseController
-  before_action :require_login, except: [:index, :show]
+  before_action :require_login, except: [:index, :show, :recommend]
   before_action :convert_image!, only: [:create, :update]
   before_action :load_organization, only: [:show, :update, :destroy]
   before_action :check_user_can_edit_org, only: [:update, :destroy]
@@ -25,6 +25,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
 
   def create
     ActiveRecord::Base.transaction do
+      Organizations::CreateForm.new(organization_params).validate!
       @organization = Organizations::CreateService.call(current_user, organization_params)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
     end
@@ -35,6 +36,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
 
   def update
     ActiveRecord::Base.transaction do
+      Organizations::CreateForm.new(organization_params).validate!
       login = @organization.login
       @organization.login = organization_params[:name] if organization_params[:name].present?
       @organization.nickname = organization_params[:nickname] if organization_params[:nickname].present?
@@ -60,6 +62,13 @@ class Organizations::OrganizationsController < Organizations::BaseController
     tip_exception(e.message)
   end
 
+  def recommend
+    recommend = %W(xuos Huawei_Technology openatom_foundation pkecosystem TensorLayer)
+    
+    @organizations = Organization.with_visibility(%w(common))
+      .where(login: recommend).select(:id, :login, :firstname, :lastname, :nickname)
+  end
+
   private
   def convert_image!
     return unless params[:image].present?

app/controllers/organizations/teams_controller.rb

@@ -33,13 +33,17 @@ class Organizations::TeamsController < Organizations::BaseController
   end
 
   def create
-    @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
+    ActiveRecord::Base.transaction do
+      Organizations::CreateTeamForm.new(team_params).validate!
+      @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
+    end
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
   end
 
   def update
+    Organizations::CreateTeamForm.new(team_params).validate!
     @team = Organizations::Teams::UpdateService.call(current_user, @team, team_params)
   rescue Exception => e
     uid_logger_error(e.message)
@@ -60,7 +64,7 @@ class Organizations::TeamsController < Organizations::BaseController
 
   private
   def team_params
-    params.permit(:name, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
+    params.permit(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
   end
 
   def load_organization

app/controllers/projects/applied_transfer_projects_controller.rb

@@ -0,0 +1,26 @@
+class Projects::AppliedTransferProjectsController < Projects::BaseController
+  before_action :check_auth
+
+  def organizations 
+    @organizations = Organization.includes(:organization_extension).joins(team_users: :team).where(team_users: {user_id: current_user.id}, teams: {authorize: %w(admin owner)})
+  end
+
+  def create 
+    @applied_transfer_project = Projects::ApplyTransferService.call(current_user, @project, params)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def cancel 
+    @applied_transfer_project = Projects::CancelTransferService.call(current_user, @project)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+  def check_auth 
+    return render_forbidden unless current_user.admin? ||@project.owner?(current_user)
+  end
+end

app/controllers/projects_controller.rb

@@ -2,6 +2,8 @@ class ProjectsController < ApplicationController
   include ApplicationHelper
   include OperateProjectAbilityAble
   include ProjectsHelper
+  include Acceleratorable
+
   before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about menu_list]
   before_action :load_project, except: %i[index group_type_list migrate create recommend]
   before_action :authorizate_user_can_edit_project!, only: %i[update]
@@ -60,7 +62,23 @@ class ProjectsController < ApplicationController
 
   def migrate
     Projects::MigrateForm.new(mirror_params).validate!
-    @project = Projects::MigrateService.new(current_user, mirror_params).call
+
+    @project = 
+      if 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
+      else
+        Projects::MigrateService.call(current_user, mirror_params)
+      end
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
@@ -95,19 +113,29 @@ class ProjectsController < ApplicationController
 
   def update
     ActiveRecord::Base.transaction do
-      # Projects::CreateForm.new(project_params).validate!
+      # TODO:
-      private = params[:private] || false
+      # 临时特殊处理修改website、lesson_url操作方法
+      if project_params.has_key?("website")
+        @project.update(project_params)
+      else
+        validate_params = project_params.slice(:name, :description, 
+          :project_category_id, :project_language_id, :private)
   
-      new_project_params = project_params.except(:private).merge(is_public: !private)
+        Projects::UpdateForm.new(validate_params).validate!
-      @project.update_attributes!(new_project_params)
+  
-      gitea_params = {
+        private = params[:private] || false
-        private: private,
+
-        default_branch: @project.default_branch,
+        new_project_params = project_params.except(:private).merge(is_public: !private)
-        website: @project.website
+        @project.update_attributes!(new_project_params)
-      }
+        gitea_params = {
-      if [true, false].include? private
+          private: private,
-        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+          default_branch: @project.default_branch,
-        @project.repository.update_column(:hidden, private)
+          website: @project.website
+        }
+        if [true, false].include? private
+          Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+          @project.repository.update_column(:hidden, private)
+        end
       end
     end
   rescue Exception => e
@@ -156,7 +184,7 @@ class ProjectsController < ApplicationController
   end
 
   def recommend
-    @projects = Project.recommend.includes(:repository, :project_category, :owner).limit(5)
+    @projects = Project.recommend.includes(:repository, :project_category, :owner).order(id: :desc)
   end
 
   def about
@@ -190,7 +218,7 @@ class ProjectsController < ApplicationController
 
   private
   def project_params
-    params.permit(:user_id, :name, :description, :repository_name, :website,
+    params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url,
                   :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
   end
 

app/controllers/pull_requests_controller.rb

@@ -140,7 +140,7 @@ class PullRequestsController < ApplicationController
   end
 
   def pr_merge
-    return render_forbidden("你没有权限操作.") if @project.reporter?(current_user)
+    return render_forbidden("你没有权限操作.") unless @project.operator?(current_user)
 
     if params[:do].blank?
       normal_status(-1, "请选择合并方式")
@@ -149,12 +149,12 @@ class PullRequestsController < ApplicationController
         begin
           result = PullRequests::MergeService.call(@owner, @repository, @pull_request, current_user, params)
 
-          if result && @pull_request.merge!
+          if result.status == 200 && @pull_request.merge!
             @pull_request.project_trend_status!
             @issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
             normal_status(1, "合并成功")
           else
-            normal_status(-1, "合并失败")
+            normal_status(-1, result.message)
           end
         rescue => e
           normal_status(-1, e.message)
@@ -215,7 +215,7 @@ class PullRequestsController < ApplicationController
   def get_relatived
     @project_tags = @project.issue_tags&.select(:id,:name, :color).as_json
     @project_versions = @project.versions&.select(:id,:name, :status).as_json
-    @project_members = @project.members_user_infos
+    @project_members = @project.all_developers
     @project_priories = IssuePriority&.select(:id,:name, :position).as_json
   end
 

app/controllers/users/applied_messages_controller.rb

@@ -0,0 +1,18 @@
+class Users::AppliedMessagesController < Users::BaseController 
+  before_action :check_auth 
+  after_action :view_messages, only: [:index]
+
+  def index 
+    @applied_messages = @_observed_user.applied_messages.order(viewed: :asc, created_at: :desc)
+    @applied_messages = paginate @applied_messages
+  end
+
+  private 
+  def check_auth 
+    return render_forbidden unless observed_logged_user?
+  end
+
+  def view_messages
+    @applied_messages.update_all(viewed: 'viewed')
+  end
+end

app/controllers/users/applied_transfer_projects_controller.rb

@@ -0,0 +1,41 @@
+class Users::AppliedTransferProjectsController < Users::BaseController 
+  before_action :check_auth
+  before_action :find_applied_transfer_project, except: [:index]
+  before_action :find_project, except: [:index]
+
+  def index 
+    user_collection_sql = AppliedTransferProject.where(owner_id: @_observed_user.id).to_sql 
+    org_collection_sql = AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @_observed_user.id}, teams: {authorize: %w(admin owner)} )).to_sql 
+    @applied_transfer_projects = AppliedTransferProject.from("( #{ user_collection_sql } UNION #{ org_collection_sql } ) AS applied_transfer_projects")
+    @applied_transfer_projects = paginate @applied_transfer_projects.order("created_at desc")
+  end
+
+  # 接受迁移
+  def accept 
+    @applied_transfer_project = Projects::AcceptTransferService.call(current_user, @project)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  # 拒绝迁移
+  def refuse 
+    @applied_transfer_project = Projects::RefuseTransferService.call(current_user, @project)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+  def check_auth 
+    return render_forbidden unless observed_logged_user?
+  end
+
+  def find_applied_transfer_project 
+    @applied_transfer_project = AppliedTransferProject.find_by_id params[:id]
+  end
+
+  def find_project 
+    @project = @applied_transfer_project.project
+  end
+end

app/controllers/users_controller.rb

@@ -2,8 +2,8 @@ class UsersController < ApplicationController
   include ApplicationHelper
   include Ci::DbConnectable
 
-  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users]
+  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard]
-  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users]
+  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard]
   before_action :require_login, only: %i[me list change_password change_email]
   before_action :connect_to_ci_db, only: [:get_user_info]
   skip_before_action :check_sign, only: [:attachment_show]
@@ -27,12 +27,24 @@ class UsersController < ApplicationController
 
   def show
       #待办事项，现在未做
-      @undo_events = 0
+      if User.current.login == @user.login 
+        @waiting_applied_messages = @user.applied_messages.waiting
+        @common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common
+        @undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size
+      else 
+        @waiting_applied_messages = AppliedMessage.none
+        @common_applied_transfer_projects = AppliedTransferProject.none
+        @undo_events = 0
+      end
       #用户的组织数量
       # @user_composes_count =  @user.composes.size
       @user_composes_count = 0
-      @user_org_count = User.current.logged? ? @user.organizations.with_visibility(%w(common limited)).size + @user.organizations.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).size : @user.organizations.with_visibility("common").size
+      user_organizations =  User.current.logged? ? @user.organizations.with_visibility(%w(common limited)) + @user.organizations.with_visibility("privacy").joins(:team_users).where(team_users: {user_id: current_user.id}) : @user.organizations.with_visibility("common")
-      user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? @user.projects : @user.projects.visible
+      @user_org_count = user_organizations.size
+      normal_projects = Project.members_projects(@user.id).to_sql
+      org_projects = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: @user.id}).to_sql
+      projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
+      user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? projects : projects.visible
       @projects_common_count = user_projects.common.size
       @projects_mirrior_count = user_projects.mirror.size
       @projects_sync_mirrior_count = user_projects.sync_mirror.size
@@ -56,6 +68,9 @@ class UsersController < ApplicationController
     @watchers = paginate(watchers)
   end
 
+  def hovercard
+  end
+
   def update
     @user = User.find params[:id]
     @user.update!(user_params)

app/controllers/version_releases_controller.rb

@@ -8,7 +8,7 @@ class VersionReleasesController < ApplicationController
     version_releases = Gitea::Versions::ListService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier)).call
     @version_releases = version_releases
     @user_permission = current_user.present? && (current_user == @user || current_user.admin?)
-    @forge_releases = @repository.version_releases.select(:id,:version_gid).includes(:attachments)
+    @forge_releases = @repository.version_releases.select(:id,:version_gid, :created_at).includes(:attachments)
   end
 
   def new

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

@@ -526,3 +526,241 @@ await octokit.request('POST /api/jaser/jasder_test/forks.json')
   "identifier": "newadm"
 }
 ```
+
+## 用户管理的组织列表
+用户管理的组织列表
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizations.json  | jq
+```
+
+```javascript
+await octokit.request('GET /api/:owner/:repo/applied_transfer_projects/organizations')
+```
+
+### HTTP 请求
+`GET api/:owner/:repo/applied_transfer_projects/organizations`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner             |是| |string |用户登录名
+repo             |是| |string |项目标识identifier
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+name     |string|组织标识
+nickname |string|组织名称
+description|string|组织描述
+avatar_url|string｜组织头像
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 3,
+    "organizations": [
+        {
+            "id": 9,
+            "name": "ceshi_org",
+            "nickname": "测试组织",
+            "description": "测试组织",
+            "avatar_url": "images/avatars/Organization/9?t=1612706073"
+        },
+        {
+            "id": 51,
+            "name": "ceshi",
+            "nickname": "测试组织哈哈哈",
+            "description": "23212312",
+            "avatar_url": "images/avatars/Organization/51?t=1618800723"
+        },
+        {
+            "id": 52,
+            "name": "ceshi1",
+            "nickname": "身份卡手动阀",
+            "description": "1231手动阀是的",
+            "avatar_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    ]
+}
+```
+
+## 迁移项目
+迁移项目，edit接口is_transfering为true表示正在迁移
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects.json
+```
+
+```javascript
+await octokit.request('POST /api/:owner/:repo/applied_transfer_projects.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/applied_transfer_projects.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner     |是| |string |用户登录名  |
+|repo      |是| |string |项目标识identifier  |
+|owner_name|是| |string |迁移对象标识  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |项目id |
+|status         |string   |项目迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |项目迁移创建的时间 |
+|project.id     |int      |迁移项目的id |
+|project.identifier     |string      |迁移项目的标识 |
+|project.name     |string      |迁移项目的名称 |
+|project.description     |string      |迁移项目的描述 |
+|project.is_public     |bool      |迁移项目是否公开 |
+|project.owner.id     |bool      |迁移项目拥有者id |
+|project.owner.type     |string      |迁移项目拥有者类型 |
+|project.owner.name     |string      |迁移项目拥有者昵称 |
+|project.owner.login     |string      |迁移项目拥有者标识 |
+|project.owner.image_url     |string      |迁移项目拥有者头像 |
+|user.id     |int      |迁移创建者的id |
+|user.type     |string      |迁移创建者的类型 |
+|user.name     |string      |迁移创建者的名称 |
+|user.login     |string      |迁移创建者的标识 |
+|user.image_url     |string      |迁移创建者头像 |
+|owner.id     |int      |迁移接受者的id |
+|owner.type     |string      |迁移接受者的类型 |
+|owner.name     |string      |迁移接受者的名称 |
+|owner.login     |string      |迁移接受者的标识 |
+|owner.image_url     |string      |迁移接受者头像 |
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 86,
+        "identifier": "ceshi_repo1",
+        "name": "测试项目啊1",
+        "description": "二十多",
+        "is_public": true,
+        "owner": {
+            "id": 52,
+            "type": "Organization",
+            "name": "身份卡手动阀",
+            "login": "ceshi1",
+            "image_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "yystopf",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "owner": {
+        "id": 9,
+        "type": "Organization",
+        "name": "测试组织",
+        "login": "ceshi_org",
+        "image_url": "images/avatars/Organization/9?t=1612706073"
+    },
+    "id": 4,
+    "status": "common",
+    "created_at": "2021-04-26 09:54",
+    "time_ago": "1分钟前"
+}
+```
+
+## 取消迁移项目
+迁移项目，edit接口is_transfering为true表示正在迁移
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/cancel.json
+```
+
+```javascript
+await octokit.request('POST /api/:owner/:repo/applied_transfer_projects/cancel.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/applied_transfer_projects/cancel.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner     |是| |string |用户登录名  |
+|repo      |是| |string |项目标识identifier  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |迁移id |
+|status         |string   |迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |迁移创建的时间 |
+|project.id     |int      |迁移项目的id |
+|project.identifier     |string      |迁移项目的标识 |
+|project.name     |string      |迁移项目的名称 |
+|project.description     |string      |迁移项目的描述 |
+|project.is_public     |bool      |迁移项目是否公开 |
+|project.owner.id     |bool      |迁移项目拥有者id |
+|project.owner.type     |string      |迁移项目拥有者类型 |
+|project.owner.name     |string      |迁移项目拥有者昵称 |
+|project.owner.login     |string      |迁移项目拥有者标识 |
+|project.owner.image_url     |string      |迁移项目拥有者头像 |
+|user.id     |int      |迁移创建者的id |
+|user.type     |string      |迁移创建者的类型 |
+|user.name     |string      |迁移创建者的名称 |
+|user.login     |string      |迁移创建者的标识 |
+|user.image_url     |string      |迁移创建者头像 |
+|owner.id     |int      |迁移接受者的id |
+|owner.type     |string      |迁移接受者的类型 |
+|owner.name     |string      |迁移接受者的名称 |
+|owner.login     |string      |迁移接受者的标识 |
+|owner.image_url     |string      |迁移接受者头像 |
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 86,
+        "identifier": "ceshi_repo1",
+        "name": "测试项目啊1",
+        "description": "二十多",
+        "is_public": true,
+        "owner": {
+            "id": 52,
+            "type": "Organization",
+            "name": "身份卡手动阀",
+            "login": "ceshi1",
+            "image_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "yystopf",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "owner": {
+        "id": 9,
+        "type": "Organization",
+        "name": "测试组织",
+        "login": "ceshi_org",
+        "image_url": "images/avatars/Organization/9?t=1612706073"
+    },
+    "id": 4,
+    "status": "common",
+    "created_at": "2021-04-26 09:54",
+    "time_ago": "1分钟前"
+}
+```

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

@@ -1,3 +1,9 @@
+<!--
+ * @Date: 2021-03-01 10:35:21
+ * @LastEditors: viletyy
+ * @LastEditTime: 2021-04-26 10:47:30
+ * @FilePath: /forgeplus/app/docs/slate/source/includes/_users.md
+-->
 # Users
 
 ## 获取当前登陆用户信息
@@ -40,3 +46,390 @@ await octokit.request('GET /api/users/me.json')
 <aside class="success">
   Success Data.
 </aside>
+
+## 待办事项-用户通知信息
+待办事项-用户通知信息
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/users/yystopf/applied_messages.json
+```
+
+```javascript
+await octokit.request('GET /api/users/:login/applied_messages.json')
+```
+
+### HTTP 请求
+`GET /api/users/:login/applied_messages.json`
+
+### 请求字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|login       |string   |用户标识 |
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|applied       |object   |通知主体 |
+|applied.id             |int      |通知主体的迁移id |
+|applied.status         |string   |通知主体的迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|applied.time_ago       |string   |通知主体的迁移创建的时间 |
+|applied.project.id     |int      |通知主体的迁移项目的id |
+|applied.project.identifier     |string      |通知主体的迁移项目的标识 |
+|applied.project.name     |string      |通知主体的迁移项目的名称 |
+|applied.project.description     |string      |通知主体的迁移项目的描述 |
+|applied.project.is_public     |bool      |通知主体的迁移项目是否公开 |
+|applied.project.owner.id     |bool      |通知主体的迁移项目拥有者id |
+|applied.project.owner.type     |string      |通知主体的迁移项目拥有者类型 |
+|applied.project.owner.name     |string      |通知主体的迁移项目拥有者昵称 |
+|applied.project.owner.login     |string      |通知主体的迁移项目拥有者标识 |
+|applied.project.owner.image_url     |string      |通知主体的迁移项目拥有者头像 |
+|applied.user.id     |int      |通知主体的迁移创建者的id |
+|applied.user.type     |string      |通知主体的迁移创建者的类型 |
+|applied.user.name     |string      |通知主体的迁移创建者的名称 |
+|applied.user.login     |string      |通知主体的迁移创建者的标识 |
+|applied.user.image_url     |string      |通知主体的迁移创建者头像 |
+|applied.owner.id     |int      |通知主体的迁移接受者的id |
+|applied.owner.type     |string      |通知主体的迁移接受者的类型 |
+|applied.owner.name     |string      |通知主体的迁移接受者的名称 |
+|applied.owner.login     |string      |通知主体的迁移接受者的标识 |
+|applied.owner.image_url     |string      |通知主体的迁移接受者头像 |
+|applied_type       |string   |通知类型 |
+|name       |string   | 通知内容 |
+|viewed         |string|是否已读，waiting:未读,viewed:已读|
+|status         |string|通知状态, canceled:已取消,common: 正常,successed:成功,failure:失败|
+|time_ago     |string|通知时间|
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 5,
+    "applied_messages": [
+        {
+            "applied": {
+                "project": {
+                    "id": 86,
+                    "identifier": "ceshi_repo1",
+                    "name": "测试项目啊1",
+                    "description": "二十多",
+                    "is_public": true,
+                    "owner": {
+                        "id": 52,
+                        "type": "Organization",
+                        "name": "身份卡手动阀",
+                        "login": "ceshi1",
+                        "image_url": "images/avatars/Organization/52?t=1618805056"
+                    }
+                },
+                "user": {
+                    "id": 6,
+                    "type": "User",
+                    "name": "yystopf",
+                    "login": "yystopf",
+                    "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+                },
+                "owner": {
+                    "id": 9,
+                    "type": "Organization",
+                    "name": "测试组织",
+                    "login": "ceshi_org",
+                    "image_url": "images/avatars/Organization/9?t=1612706073"
+                },
+                "id": 4,
+                "status": "common",
+                "created_at": "2021-04-26 09:54",
+                "time_ago": "35分钟前"
+            },
+            "applied_user": {
+                "id": 6,
+                "type": "User",
+                "name": "yystopf",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+            },
+            "applied_type": "AppliedTransferProject",
+            "name": "正在将【测试项目啊1】仓库转移给【测试组织】",
+            "viewed": "viewed",
+            "status": "common",
+            "created_at": "2021-04-26 09:54",
+            "time_ago": "35分钟前"
+        },
+        ...
+    ]
+}
+```
+
+## 待办事项-接受仓库
+待办事项-接受仓库
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/users/yystopf/applied_transfer_projects.json
+```
+
+```javascript
+await octokit.request('GET /api/users/:login/applied_transfer_projects.json')
+```
+
+### HTTP 请求
+`GET /api/users/:login/applied_transfer_projects.json`
+
+### 请求字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|login       |string   |用户标识 |
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |迁移id |
+|status         |string   |迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |迁移创建的时间 |
+|project.id     |int      |迁移项目的id |
+|project.identifier     |string      |迁移项目的标识 |
+|project.name     |string      |迁移项目的名称 |
+|project.description     |string      |迁移项目的描述 |
+|project.is_public     |bool      |迁移项目是否公开 |
+|project.owner.id     |bool      |迁移项目拥有者id |
+|project.owner.type     |string      |迁移项目拥有者类型 |
+|project.owner.name     |string      |迁移项目拥有者昵称 |
+|project.owner.login     |string      |迁移项目拥有者标识 |
+|project.owner.image_url     |string      |迁移项目拥有者头像 |
+|user.id     |int      |迁移创建者的id |
+|user.type     |string      |迁移创建者的类型 |
+|user.name     |string      |迁移创建者的名称 |
+|user.login     |string      |迁移创建者的标识 |
+|user.image_url     |string      |迁移创建者头像 |
+|owner.id     |int      |迁移接受者的id |
+|owner.type     |string      |迁移接受者的类型 |
+|owner.name     |string      |迁移接受者的名称 |
+|owner.login     |string      |迁移接受者的标识 |
+|owner.image_url     |string      |迁移接受者头像 |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 4,
+    "applied_transfer_projects": [
+        {
+            "project": {
+                "id": 86,
+                "identifier": "ceshi_repo1",
+                "name": "测试项目啊1",
+                "description": "二十多",
+                "is_public": true,
+                "owner": {
+                    "id": 52,
+                    "type": "Organization",
+                    "name": "身份卡手动阀",
+                    "login": "ceshi1",
+                    "image_url": "images/avatars/Organization/52?t=1618805056"
+                }
+            },
+            "user": {
+                "id": 6,
+                "type": "User",
+                "name": "yystopf",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+            },
+            "owner": {
+                "id": 52,
+                "type": "Organization",
+                "name": "身份卡手动阀",
+                "login": "ceshi1",
+                "image_url": "images/avatars/Organization/52?t=1618805056"
+            },
+            "id": 1,
+            "status": "canceled",
+            "created_at": "2021-04-25 18:06",
+            "time_ago": "16小时前"
+        },
+        ...
+    ]
+}
+```
+
+## 用户接受迁移
+用户接受迁移
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/users/yystopf/applied_transfer_projects/2/accept.json
+```
+
+```javascript
+await octokit.request('GET /api/users/:login/applied_transfer_projects/:id/accept.json')
+```
+
+### HTTP 请求
+`GET /api/users/:login/applied_transfer_projects/:id/accept.json`
+
+### 请求字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|login       |string   |用户标识 |
+|id          |int      |迁移id |
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |迁移id |
+|status         |string   |迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |迁移创建的时间 |
+|project.id     |int      |迁移项目的id |
+|project.identifier     |string      |迁移项目的标识 |
+|project.name     |string      |迁移项目的名称 |
+|project.description     |string      |迁移项目的描述 |
+|project.is_public     |bool      |迁移项目是否公开 |
+|project.owner.id     |bool      |迁移项目拥有者id |
+|project.owner.type     |string      |迁移项目拥有者类型 |
+|project.owner.name     |string      |迁移项目拥有者昵称 |
+|project.owner.login     |string      |迁移项目拥有者标识 |
+|project.owner.image_url     |string      |迁移项目拥有者头像 |
+|user.id     |int      |迁移创建者的id |
+|user.type     |string      |迁移创建者的类型 |
+|user.name     |string      |迁移创建者的名称 |
+|user.login     |string      |迁移创建者的标识 |
+|user.image_url     |string      |迁移创建者头像 |
+|owner.id     |int      |迁移接受者的id |
+|owner.type     |string      |迁移接受者的类型 |
+|owner.name     |string      |迁移接受者的名称 |
+|owner.login     |string      |迁移接受者的标识 |
+|owner.image_url     |string      |迁移接受者头像 |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 86,
+        "identifier": "ceshi_repo1",
+        "name": "测试项目啊1",
+        "description": "二十多",
+        "is_public": true,
+        "owner": {
+            "id": 52,
+            "type": "Organization",
+            "name": "身份卡手动阀",
+            "login": "ceshi1",
+            "image_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "yystopf",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "owner": {
+        "id": 52,
+        "type": "Organization",
+        "name": "身份卡手动阀",
+        "login": "ceshi1",
+        "image_url": "images/avatars/Organization/52?t=1618805056"
+    },
+    "id": 1,
+    "status": "canceled",
+    "created_at": "2021-04-25 18:06",
+    "time_ago": "16小时前"
+}
+```
+
+## 用户拒绝迁移
+用户拒绝迁移
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/users/yystopf/applied_transfer_projects/2/refuse.json
+```
+
+```javascript
+await octokit.request('GET /api/users/:login/applied_transfer_projects/:id/refuse.json')
+```
+
+### HTTP 请求
+`GET /api/users/:login/applied_transfer_projects/:id/refuse.json`
+
+### 请求字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|login       |string   |用户标识 |
+|id          |int      |迁移id |
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |迁移id |
+|status         |string   |迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |迁移创建的时间 |
+|project.id     |int      |迁移项目的id |
+|project.identifier     |string      |迁移项目的标识 |
+|project.name     |string      |迁移项目的名称 |
+|project.description     |string      |迁移项目的描述 |
+|project.is_public     |bool      |迁移项目是否公开 |
+|project.owner.id     |bool      |迁移项目拥有者id |
+|project.owner.type     |string      |迁移项目拥有者类型 |
+|project.owner.name     |string      |迁移项目拥有者昵称 |
+|project.owner.login     |string      |迁移项目拥有者标识 |
+|project.owner.image_url     |string      |迁移项目拥有者头像 |
+|user.id     |int      |迁移创建者的id |
+|user.type     |string      |迁移创建者的类型 |
+|user.name     |string      |迁移创建者的名称 |
+|user.login     |string      |迁移创建者的标识 |
+|user.image_url     |string      |迁移创建者头像 |
+|owner.id     |int      |迁移接受者的id |
+|owner.type     |string      |迁移接受者的类型 |
+|owner.name     |string      |迁移接受者的名称 |
+|owner.login     |string      |迁移接受者的标识 |
+|owner.image_url     |string      |迁移接受者头像 |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 86,
+        "identifier": "ceshi_repo1",
+        "name": "测试项目啊1",
+        "description": "二十多",
+        "is_public": true,
+        "owner": {
+            "id": 52,
+            "type": "Organization",
+            "name": "身份卡手动阀",
+            "login": "ceshi1",
+            "image_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "yystopf",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "owner": {
+        "id": 52,
+        "type": "Organization",
+        "name": "身份卡手动阀",
+        "login": "ceshi1",
+        "image_url": "images/avatars/Organization/52?t=1618805056"
+    },
+    "id": 1,
+    "status": "canceled",
+    "created_at": "2021-04-25 18:06",
+    "time_ago": "16小时前"
+}
+```

app/forms/issues/create_form.rb

@@ -0,0 +1,11 @@
+class Issues::CreateForm
+  include ActiveModel::Model
+
+  attr_accessor :subject
+
+  validates :subject, presence: { message: "不能为空" }
+
+  validates :subject, length: { maximum: 80, too_long: "不能超过80个字符" }
+
+
+end

app/forms/issues/update_form.rb

@@ -0,0 +1,10 @@
+class Issues::UpdateForm
+  include ActiveModel::Model
+
+  attr_accessor :subject
+
+  validates :subject, presence: { message: "不能为空" }
+
+  validates :subject, length: { maximum: 80, too_long: "不能超过80个字符" }
+
+end

app/forms/organizations/create_form.rb

@@ -0,0 +1,11 @@
+class Organizations::CreateForm < BaseForm
+  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  attr_accessor :name, :description, :website, :location, :repo_admin_change_team_access, :visibility, :max_repo_creation, :nickname
+
+  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: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
+
+end

app/forms/organizations/create_team_form.rb

@@ -0,0 +1,10 @@
+class Organizations::CreateTeamForm < BaseForm
+  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  attr_accessor :name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types
+
+  validates :name, :nickname, presence: true
+  validates :name, :nickname, length: { maximum: 100 }
+  validates :description, length: { maximum: 200 }
+  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
+
+end

app/forms/projects/create_form.rb

@@ -7,6 +7,10 @@ class Projects::CreateForm < BaseForm
             :project_category_id, :project_language_id, presence: true
   validates :repository_name, format: { with: REPOSITORY_NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
 
+  validates :name, length: { maximum: 50 }
+  validates :repository_name, length: { maximum: 100 }
+  validates :description, length: { maximum: 200 }
+
   validate :check_ignore, :check_license, :check_owner, :check_max_repo_creation
   validate do
     check_project_category(project_category_id)

app/forms/projects/update_form.rb

@@ -1,4 +1,11 @@
 class Projects::UpdateForm < BaseForm
-  attr_reader :name, :description, :repository_name, :project_category_id
+  attr_accessor :name, :description, :project_category_id, :project_language_id, :private
+  validates :name, :description, :project_category_id, :project_language_id, presence: true
+  validates :name, length: { maximum: 50 }
+  validates :description, length: { maximum: 200 }
+  validate do
+    check_project_category(project_category_id)
+    check_project_language(project_language_id)
+  end
 
 end

app/forms/users/login_form.rb

@@ -0,0 +1,8 @@
+class Users::LoginForm
+  include ActiveModel::Model
+
+  attr_accessor :password, :login
+
+  validates :login, presence: true
+  validates :password, presence: true, length: { minimum: 8, maximum: 16 }, format: { with: CustomRegexp::PASSWORD, message: "8~16位，支持字母数字和符号" }
+end

app/helpers/admins/faqs_helper.rb

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

app/helpers/admins/projects_helper.rb

@@ -0,0 +1,14 @@
+module Admins::ProjectsHelper
+
+  def link_to_project(project)
+    owner = project.owner
+
+    if owner.is_a?(User)
+      link_to(project.owner&.real_name, "/users/#{project&.owner&.login}", target: '_blank')
+    elsif owner.is_a?(Organization)
+      link_to(project.owner&.real_name, "/organize/#{project&.owner&.login}", target: '_blank')
+    else
+      ""
+    end
+  end
+end

app/helpers/application_helper.rb

@@ -35,12 +35,6 @@ module ApplicationHelper
     course.course_modules.find_by(module_type: "graduation").try(:id)
   end
 
-  # 是否关注
-  # from_user_id为被关注的用户
-  def follow?(from_user_id, user_id)
-    Watcher.where(watchable_type: 'Principal', watchable_id: from_user_id, user_id: user_id).exists?
-  end
-
   # git用户
   # git用户命名规则：login+"@educoder.net"
   def git_username(email)
@@ -144,17 +138,12 @@ module ApplicationHelper
     if File.exist?(disk_filename(source&.class, source&.id))
       ctime = File.ctime(disk_filename(source.class, source.id)).to_i
       if %w(User Organization).include?(source.class.to_s)
-        File.join(relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+        File.join("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
       else
         File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
       end
     elsif source.class.to_s == 'User'
-      str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
+      source.get_letter_avatar_url
-      File.join(relative_path, "#{source.class}", str)
-    elsif source.class.to_s == 'Subject'
-      File.join("images","educoder", "index", "subject", "subject#{rand(17)}.jpg")
-    elsif source.class.to_s == 'Shixun'
-      File.join("images","educoder", "index", "shixun", "shixun#{rand(23)}.jpg")
     end
   end
 

app/helpers/helps/faqs_helper.rb

@@ -0,0 +1,2 @@
+module Helps::FaqsHelper
+end

app/helpers/projects_helper.rb

@@ -34,15 +34,14 @@ module ProjectsHelper
   end
 
   def json_response(project, user)
-    # repo = project.repository
+    repo = Repository.includes(:mirror).select(:id, :mirror_url, :source_clone_url).find_by(project: project)
-    repo = Repository.includes(:mirror).select(:id, :mirror_url).find_by(project: project)
 
     tmp_json = {}
     unless project.common?
       tmp_json = tmp_json.merge({
         mirror_status: repo.mirror_status,
         mirror_num: repo.mirror_num,
-        mirror_url: repo.mirror_url,
+        mirror_url: repo.remote_mirror_url,
         first_sync: repo.first_sync?
       })
     end
@@ -90,8 +89,4 @@ module ProjectsHelper
   def render_educoder_avatar_url(project_educoder)
     [Rails.application.config_for(:configuration)['educoder']['cdn_url'], project_educoder&.image_url].join('/')
   end
-
-  def render_avatar_url(owner)
-    ['images', url_to_avatar(owner)].join('/')
-  end
 end

app/helpers/tag_chosen_helper.rb

@@ -124,14 +124,13 @@ module TagChosenHelper
   end
 
   def render_cache_collaborators(project)
-    cache_key = "all_collaborators/#{project.members.maximum('created_on')}"
+    cache_key = "all_collaborators/#{project.all_collaborators.maximum('created_on')}"
-
     Rails.cache.fetch(cache_key) do
-      project.members.includes(:user).collect do |event|
+      project.all_collaborators.order(created_on: :desc).collect do |user|
         {
-          id: event.user&.id,
+          id: user&.id,
-          name: event.user&.show_real_name,
+          name: user&.show_real_name,
-          avatar_url: url_to_avatar(event.user),
+          avatar_url: url_to_avatar(user),
           is_chosen: '0'
         }
       end
@@ -171,10 +170,8 @@ module TagChosenHelper
       # depended_issues_id = @depended_issues_id
 
     end
-    project_members = project.members_user_infos
     project_members_info = []  #指派给
-    project_members.includes(user: :user_extension).each do |member|
+    project.all_collaborators.includes(:user_extension).each do |user|
-      user = member&.user
       if user
         real_name = user.try(:show_real_name)
         user_id = user.id

app/jobs/send_transfer_project_applied_message_job.rb

@@ -0,0 +1,47 @@
+class SendTransferProjectAppliedMessageJob < ApplicationJob
+  queue_as :default
+
+  def perform(applied_transfer_project, applied_user, message_status)
+    project = applied_transfer_project.project 
+    owner = project.owner
+    return unless project.present?
+    return unless owner.present?
+    if owner.is_a?(Organization)
+      receivers = project.managers + owner.team_users.joins(:team).where(teams: {authorize: %w(owner admin)})
+    else
+      receivers = project.managers
+    end
+    receivers.each do |rec|
+      next if applied_user.id == rec.user_id # 自己不要给自己发通知
+      AppliedMessage.create!(user_id: rec.user_id, 
+                             applied: applied_transfer_project,
+                             status: message_status,
+                             name: build_name(project.name, applied_transfer_project&.owner&.real_name, message_status, applied_user&.real_name),
+                             applied_user_id: applied_user.id, 
+                             project_id: project.id)
+    end
+    if message_status == 'successed' # 如果转移成功，给转移发起者发通知已转移成功
+      AppliedMessage.find_or_create_by!(user_id: applied_transfer_project.user_id,
+                                        applied: applied_transfer_project,
+                                        status: message_status,
+                                        name: build_name(project.name, applied_transfer_project&.owner&.real_name, message_status),
+                                        applied_user_id: applied_user.id,
+                                        project_id: project.id)
+    end
+  end
+
+  private 
+  def build_name(repo_name, owner_name, message_status, applied_name="")
+    case message_status
+    when 'canceled'
+      return "取消转移【#{repo_name}】仓库"
+    when 'common'
+      return "正在将【#{repo_name}】仓库转移给【#{owner_name}】"
+    when 'successed'
+      return "【#{repo_name}】仓库成功转移给【#{owner_name}】"
+    when 'failure'
+      return "拒绝转移【#{repo_name}】仓库"
+    end
+    ""
+  end
+end

app/models/applied_message.rb

@@ -19,5 +19,10 @@
 class AppliedMessage < ApplicationRecord
   belongs_to :user
   belongs_to :applied, polymorphic: true
+  belongs_to :project
+  belongs_to :applied_user, class_name: 'User'
+
+  enum viewed: {waiting: 0, viewed: 1}
+  enum status: {canceled: -1, common: 0, successed: 1, failure: 2} # -1 已取消 0 正在操作 1 操作成功 2 操作失败
 
 end

app/models/applied_transfer_project.rb

@@ -0,0 +1,28 @@
+# == Schema Information
+#
+# Table name: applied_transfer_projects
+#
+#  id         :integer          not null, primary key
+#  project_id :integer
+#  owner_id   :integer
+#  user_id    :integer
+#  status     :integer          default("0")
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_applied_transfer_projects_on_owner_id    (owner_id)
+#  index_applied_transfer_projects_on_project_id  (project_id)
+#  index_applied_transfer_projects_on_user_id     (user_id)
+#
+
+class AppliedTransferProject < ApplicationRecord
+  belongs_to :project
+  belongs_to :user # 操作者
+  belongs_to :owner # 接收个人或组织
+
+  has_many :applied_messages, as: :applied, dependent: :destroy
+
+  enum status: {canceled: -1, common: 0, accepted: 1, refused: 2} # -1 已取消 0 待操作 1 已接收 2 已拒绝
+end

app/models/ci/user.rb

@@ -47,6 +47,7 @@
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
 #  gitea_token                :string(255)
+#  platform                   :string(255)
 #
 # Indexes
 #

app/models/concerns/project_operable.rb

@@ -11,6 +11,14 @@ module ProjectOperable
     has_many :team_projects, dependent: :destroy
   end
 
+  def set_owner_permission(creator)
+    return unless owner.is_a?(Organization)
+    owner.build_permit_team_projects!(id)
+    # 避免自己创建的项目，却无法拥有访问权，因为该用户所在团队暂未获得项目访问权
+    return if creator.nil? || owner.is_owner?(creator.id)
+    add_member!(creator.id, "Manager")
+  end
+
   def add_member!(user_id, role_name='Developer')
     member = members.create!(user_id: user_id)
     set_developer_role(member, role_name)
@@ -78,12 +86,16 @@ module ProjectOperable
     if owner.is_a?(User)
       reporters.exists?(user_id: user.id)
     elsif owner.is_a?(Organization)
-      reporters.exists?(user_id: user.id) || owner.is_read?(user.id)
+      reporters.exists?(user_id: user.id) || owner.is_only_read?(user.id)
     else
       false
     end
   end
 
+  def operator?(user)
+    user.admin? || !reporter?(user) 
+  end
+
   def set_developer_role(member, role_name)
     role = Role.find_by(name: role_name)
     member.member_roles.create!(role: role)
@@ -92,4 +104,22 @@ module ProjectOperable
   def has_menu_permission(unit_type)
     self.project_units.where(unit_type: unit_type).exists?
   end
+
+  def all_collaborators 
+    member_sql = User.joins(members: :roles).where(members: {project_id: self.id}, roles: {name: %w(Manager Developer Reporter)}).to_sql 
+    team_user_sql = User.joins(teams: :team_projects).where(team_projects: {project_id: self.id}).to_sql
+    return User.from("( #{ member_sql } UNION #{ team_user_sql } ) AS users").distinct
+  end
+
+  def all_developers
+    member_sql = User.joins(members: :roles).where(members: {project_id: self.id}, roles: {name: %w(Manager Developer)}).to_sql 
+    team_user_sql = User.joins(teams: :team_projects).where(teams: {authorize: %w(owner admin write)}, team_projects: {project_id: self.id}).to_sql
+    return User.from("( #{ member_sql } UNION #{ team_user_sql } ) AS users").distinct
+  end
+
+  def all_managers 
+    member_sql = User.joins(members: :roles).where(members: {project_id: self.id}, roles: {name: %w(Manager)}).to_sql 
+    team_user_sql = User.joins(teams: :team_projects).where(teams: {authorize: %w(owner admin)},team_projects: {project_id: self.id}).to_sql 
+    return User.from("( #{ member_sql} UNION #{ team_user_sql } ) AS users").distinct
+  end
 end

app/models/concerns/watchable.rb

@@ -6,6 +6,7 @@ module Watchable
     has_many :watcher_users, through: :watchers, source: :user, validate: false
 
     scope :watched_by, -> (user_id) { includes(:watchers).where(watchers: { user_id: user_id }) }
+    scope :following, -> (user_id) { watched_by(user_id) }
   end
 
   def watched?(watchable)
@@ -21,6 +22,24 @@ module Watchable
     obj.destroy! if obj.present?
   end
 
+  # 我正在关注的、我追随的
+  def following
+    User.following(self.id)
+  end
+
+  def following_count
+    following.size
+  end
+
+  # 关注我的、我的粉丝、我的追随者
+  def followers
+    watcher_users
+  end
+
+  def followers_count
+    followers.size
+  end
+
   module ClassMethods
   end
 end

app/models/faq.rb

@@ -0,0 +1,20 @@
+# == Schema Information
+#
+# Table name: faqs
+#
+#  id         :integer          not null, primary key
+#  question   :string(255)
+#  url        :string(255)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class Faq < ApplicationRecord
+  
+  validates :question, presence: true,length: { maximum: 100, too_long: "最多%{count}个字符" }
+  validates :url, format: { with: CustomRegexp::URL, multiline: true, message: "格式不正确" }
+
+  scope :select_without_id, -> { select(:question, :url) }
+  scope :search_question, ->(keyword) { where("question LIKE ?", "%#{keyword}%") unless keyword.blank?}
+
+end

app/models/organization.rb

@@ -47,6 +47,7 @@
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
 #  gitea_token                :string(255)
+#  platform                   :string(255)
 #
 # Indexes
 #
@@ -108,12 +109,23 @@ class Organization < Owner
     team_users.joins(:team).where(user_id: user_id, teams: {authorize: %w(read write admin owner)}).present?
   end
 
+  def is_only_read?(user_id)
+    team_users.joins(:team).where(user_id: user_id, teams: {authorize: %w(read)}).present?
+  end
+
   # 是不是所有者团队的最后一个成员
   def is_owner_team_last_one?(user_id)
     owner_team_users = team_users.joins(:team).where(teams: {authorize: %w(owner)})
     owner_team_users.pluck(:user_id).include?(user_id) && owner_team_users.size == 1
   end
 
+  # 为包含组织所有项目的团队创建项目访问权限
+  def build_permit_team_projects!(project_id)
+    teams.where(includes_all_project: true).each do |team|
+      TeamProject.build(id, team.id, project_id)
+    end
+  end
+
   def real_name
     name = lastname + firstname
     name = name.blank? ? (nickname.blank? ? login : nickname) : name

app/models/owner.rb

@@ -66,4 +66,6 @@ class Owner < ApplicationRecord
 
   has_many :projects, foreign_key: :user_id, dependent: :destroy
   has_many :repositories, foreign_key: :user_id, dependent: :destroy
+  has_many :applied_transfer_projects, dependent: :destroy
+
 end

app/models/project.rb

@@ -37,8 +37,6 @@
 #  rep_identifier         :string(255)
 #  project_category_id    :integer
 #  project_language_id    :integer
-#  license_id             :integer
-#  ignore_id              :integer
 #  praises_count          :integer          default("0")
 #  watchers_count         :integer          default("0")
 #  issues_count           :integer          default("0")
@@ -52,8 +50,11 @@
 #  open_devops_count      :integer          default("0")
 #  recommend              :boolean          default("0")
 #  platform               :integer          default("0")
+#  license_id             :integer
+#  ignore_id              :integer
 #  default_branch         :string(255)      default("master")
 #  website                :string(255)
+#  lesson_url             :string(255)
 #
 # Indexes
 #
@@ -71,9 +72,6 @@
 #
 
 
-
-
-
 class Project < ApplicationRecord
   include Matchable
   include Publicable
@@ -116,6 +114,7 @@ class Project < ApplicationRecord
   has_one :project_detail, dependent: :destroy
   has_many :team_projects, dependent: :destroy
   has_many :project_units, dependent: :destroy
+  has_one :applied_transfer_project,-> { order created_at: :desc }, dependent: :destroy
 
   after_save :check_project_members
   scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
@@ -162,6 +161,7 @@ class Project < ApplicationRecord
 
   #创建项目管理员
   def check_project_members
+    return if owner.is_a?(Organization)
     unless members.present? && members.exists?(user_id: self.user_id)
       member_params = {
         user_id: self.user_id,
@@ -298,4 +298,7 @@ class Project < ApplicationRecord
     update_column(:updated_on, time)
   end
 
+  def is_transfering
+    applied_transfer_project&.common? ? true : false
+  end
 end

app/models/project_unit.rb

@@ -20,13 +20,18 @@ class ProjectUnit < ApplicationRecord
 
   validates :unit_type, uniqueness: { scope: :project_id}
 
-  def self.init_types(project_id)
+  def self.init_types(project_id, project_type='common')
-    ProjectUnit::unit_types.each do |_, v|
+    unit_types = project_type == 'sync_mirror' ? ProjectUnit::unit_types.except("pulls") : ProjectUnit::unit_types
+    unit_types.each do |_, v|
       self.create!(project_id: project_id, unit_type: v)
     end
   end
 
   def self.update_by_unit_types!(project, types) 
+    # 同步镜像项目不能有合并请求模块
+    types.delete("pulls") if project.sync_mirror?
+    # 默认code类型自动创建
+    types << "code"
     project.project_units.where.not(unit_type: types).each(&:destroy!)
     types.each do |type|
       project.project_units.find_or_create_by!(unit_type: type)

app/models/repository.rb

@@ -22,6 +22,8 @@
 #  version_releases_count :integer          default("0")
 #  fork_url               :string(255)
 #  is_mirror              :boolean          default("0")
+#  accelerator_url        :string(255)      default("")
+#  source_clone_url       :string(255)      default("")
 #
 # Indexes
 #
@@ -76,4 +78,9 @@ class Repository < ApplicationRecord
     end
   end
 
+  def remote_mirror_url
+    source_clone_url.blank? ? mirror_url : source_clone_url
+  end
+  
+
 end

app/models/team.rb

@@ -14,6 +14,7 @@
 #  gtid                   :integer
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
+#  nickname               :string(255)
 #
 # Indexes
 #
@@ -32,9 +33,10 @@ class Team < ApplicationRecord
 
   enum authorize: {common: 0, read: 1, write: 2, admin: 3, owner: 4}
 
-  def self.build(organization_id, name, description, authorize, includes_all_project, can_create_org_project)
+  def self.build(organization_id, name, nickname, description, authorize, includes_all_project, can_create_org_project)
     self.create!(organization_id: organization_id,
                  name: name,
+                 nickname: nickname, 
                  description: description,
                  authorize: authorize,
                  includes_all_project: includes_all_project,

app/models/user.rb

@@ -47,6 +47,7 @@
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
 #  gitea_token                :string(255)
+#  platform                   :string(255)
 #
 # Indexes
 #
@@ -68,6 +69,7 @@ class User < Owner
   include Likeable
   include BaseModel
   include Droneable
+  include User::Avatar
   # include Searchable::Dependents::User
 
   # devops step
@@ -136,10 +138,6 @@ class User < Owner
 
   has_many :attachments,foreign_key: :author_id, :dependent => :destroy
 
-  # 关注
-  # has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注
-  # has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户
-
   has_one :ci_cloud_account, class_name: 'Ci::CloudAccount', dependent: :destroy
 
   # 认证
@@ -150,9 +148,14 @@ class User < Owner
   has_many :trail_auth_apply_actions, -> { where(container_type: 'TrialAuthorization') }, class_name: 'ApplyAction'
 
   # has_many :attendances
-
+  has_many :applied_messages, dependent: :destroy
+  has_many :operate_applied_messages, class_name: 'AppliedMessage', dependent: :destroy
   # 项目
   has_many :applied_projects, dependent: :destroy
+  has_many :operate_applied_transfer_projects, class_name: 'AppliedTransferProject', dependent: :destroy
+  has_many :members, dependent: :destroy 
+  has_many :team_users, dependent: :destroy
+  has_many :teams, through: :team_users
 
   # 教学案例
   # has_many :libraries, dependent: :destroy
@@ -191,6 +194,10 @@ class User < Owner
   validate :validate_sensitive_string
   validate :validate_password_length
 
+  def name
+    login
+  end
+  
   # 删除自动登录的token，一旦退出下次会提示需要登录
   def delete_autologin_token(value)
     Token.where(:user_id => id, :action => 'autologin', :value => value).delete_all
@@ -205,7 +212,7 @@ class User < Owner
   end
 
   def project_manager?(project)
-    project.managers.exists?(user: self) || self.admin?
+    project.manager?(self) || self.admin?
   end
 
   # 学号

app/models/user/avatar.rb

@@ -0,0 +1,43 @@
+require 'letter_avatar/has_avatar'
+require 'chinese_pinyin'
+
+class User
+  module Avatar
+    extend ActiveSupport::Concern
+    include LetterAvatar::HasAvatar
+
+    def username
+      self.lastname.blank? ? self.login :  Pinyin.t(self.lastname)
+    end
+
+    def get_letter_avatar_url(size = :lg)
+      avatar_path(self.username, size).split('public/')&.last
+    end
+
+    def self.get_letter_avatar_url(name)
+      return "" if name.blank?
+      avatar = LetterAvatar.generate Pinyin.t(name), 120
+      avatar.split('public/')&.last
+    end
+    
+    def avatar_path(username, size)
+      LetterAvatar.generate username, avatar_size(size)
+    end
+    
+    # 返回头像尺寸
+    # xs: 22px
+    # sm: 32px
+    # md: 48px
+    # lg: 120px
+    def avatar_size(size)
+      case size
+      when :xs then 22
+      when :sm then 32
+      when :md then 48
+      when :lg then 120
+      else size
+      end
+    end
+
+  end
+end

app/queries/projects/list_my_query.rb

@@ -18,7 +18,9 @@ class Projects::ListMyQuery < ApplicationQuery
     end
 
     if params[:category].blank?
-      projects = projects.members_projects(user.id)
+      normal_projects = projects.members_projects(user.id).to_sql
+      org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: user.id}).to_sql
+      projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
     elsif params[:category].to_s == "join"
       normal_projects = projects.where.not(user_id: user.id).members_projects(user.id).to_sql
       org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: user.id}).to_sql

app/services/gitea/accelerator/migrate_service.rb

@@ -0,0 +1,148 @@
+class Gitea::Accelerator::MigrateService < ApplicationService
+  attr_reader :params
+
+  # params description:
+  # {
+  #   auth_username	string
+  #   clone_addr*	string #clone地址
+  #   description	string
+  #   issues	boolean
+  #   labels	boolean
+  #   milestones	boolean
+  #   mirror	boolean
+  #   private	boolean
+  #   pull_requests	boolean
+  #   releases	boolean
+  #   repo_name*	string #仓库名称
+  #   uid*	integer($int64) #gitea用户id或组织id
+  #   wiki	boolean
+  # }
+  # EX:
+  # params = {
+  #   clone_addr: 'xxx.com',
+  #   repo_name: 'repo_name',
+  #   uid: 2,
+  #   private: false
+  # }
+
+  def initialize(params)
+    @params = params
+  end
+
+  def call
+    return error('[gitea:] accelerator config missing') if check_accelerator!
+    response = post(url, request_params)
+
+    render_status(response)
+  end
+
+  private
+
+  def request_params
+    {
+      uid: access_uid,
+      clone_addr: params[:clone_addr],
+      repo_name: params[:repository_name],
+      auth_username: params[:auth_username],
+      auth_password: params[:auth_password],
+      mirror: ActiveModel::Type::Boolean.new.cast(params[:is_mirror])
+    }
+  end
+
+  def url
+    "/repos/migrate".freeze
+  end
+
+  def post(url, params)
+    puts "[gitea] request params: #{params}"
+    puts "[gitea] access_username: #{access_username}"
+    puts "[gitea] access_password: #{access_password}"
+    conn.post do |req|
+      req.url full_url(url)
+      req.body = params.to_json
+    end
+  end
+
+  def conn
+    @client ||= begin
+      Faraday.new(url: domain) do |req|
+        req.request :url_encoded
+        req.headers['Content-Type'] = 'application/json'
+        req.response :logger # 显示日志
+        req.adapter Faraday.default_adapter
+        req.basic_auth(access_username, access_password)
+      end
+    end
+    @client
+  end
+
+  def base_url
+    accelerator["base_url"]
+  end
+
+  def domain
+    accelerator["domain"]
+  end
+
+  def api_url
+    [domain, base_url].join('')
+  end
+
+  def full_url(api_rest, action='post')
+    url = [api_url, api_rest].join('').freeze
+    url = action === 'get' ? url : URI.escape(url)
+    puts "[gitea] request url: #{url}"
+    url
+  end
+
+  def access_username
+    accelerator["access_key_id"]
+  end
+
+  def access_password
+    accelerator["access_key_secret"]
+  end
+
+  def access_uid
+    accelerator["access_admin_uid"]
+  end
+
+  def accelerator
+    Gitea.gitea_config[:accelerator]
+  end
+
+  def render_status(response)
+    puts "[gitea] response status: #{response.status}"
+    puts "[gitea] response body: #{response.body}"
+    case response.status
+    when 201
+      success
+    when 403
+      error('APIForbiddenError')
+    when 422
+      error('APIValidationError')
+    else
+      error("MigrateError")
+    end
+  end
+
+  def error(message)
+    {
+      status: :error,
+      message: message,
+      data: nil
+    }
+  end
+
+  def success(data=nil)
+    {
+      status: :success,
+      message: nil,
+      data: data
+    }
+  end
+
+  def check_accelerator!
+    accelerator.blank? || access_username.blank? || access_password.blank? || domain.blank?
+  end
+end

app/services/gitea/client_service.rb

@@ -176,6 +176,25 @@ class Gitea::ClientService < ApplicationService
     [status, message, body]
   end
 
+  def render_gitea_response(response)
+    status = response.status
+    body = response&.body
+
+    log_error(status, body)
+    message = nil
+    begin
+      translate = YAML.load(File.read('config/gitea_response.yml'))
+
+      self.class.to_s.underscore.split("/").map{|i| translate=translate[i]}
+      message = body.nil? ? translate[status]['default'] : JSON.parse(body)['message']
+      message = translate[status][message].nil? ? message : translate[status][message]
+  
+      return [status, message]
+    rescue
+      return [status, message]
+    end
+  end
+
   def get_body_by_status(status, body)
     body, message =
       case status

app/services/gitea/pull_request/merge_service.rb

@@ -20,7 +20,7 @@ class Gitea::PullRequest::MergeService < Gitea::ClientService
   def call
     response = post(url, request_params)
 
-    render_200_no_body(response)
+    render_gitea_response(response)
   end
 
   private

app/services/organizations/create_service.rb

@@ -54,7 +54,7 @@ class Organizations::CreateService < ApplicationService
   end
 
   def create_owner_info
-    @owner_team = Team.build(organization.id, "Owners", "", 4, true, true)
+    @owner_team = Team.build(organization.id, "Owners", "Owner团队", "", 4, true, true)
     TeamUnit.unit_types.keys.each do |u_type|
       TeamUnit.build(organization.id, owner_team.id, u_type)
     end

app/services/organizations/teams/create_service.rb

@@ -28,6 +28,10 @@ class Organizations::Teams::CreateService < ApplicationService
     params[:name]
   end
 
+  def nickname 
+    params[:nickname]
+  end
+
   def description
     params[:description]
   end
@@ -45,7 +49,7 @@ class Organizations::Teams::CreateService < ApplicationService
   end
 
   def create_team
-    @team = Team.build(org.id, name, description, authorize,
+    @team = Team.build(org.id, name, nickname, description, authorize,
                        includes_all_project, can_create_org_project)
   end
 

app/services/organizations/teams/update_service.rb

@@ -27,7 +27,7 @@ class Organizations::Teams::UpdateService < ApplicationService
     if team.authorize == "owner"
       update_params = params.slice(:description)
     else
-      update_params = params.slice(:name, :description, :authorize, :includes_all_project, :can_create_org_project)
+      update_params = params.slice(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project)
     end
     update_params
   end

app/services/projects/accept_transfer_service.rb

@@ -0,0 +1,49 @@
+class Projects::AcceptTransferService < ApplicationService
+  attr_accessor :applied_transfer_project, :owner
+  attr_reader :user, :project 
+
+  def initialize(user, project)
+    @user   = user
+    @project = project
+    @applied_transfer_project = project.applied_transfer_project
+    @owner = @applied_transfer_project.owner
+  end
+
+  def call 
+    Rails.logger.info("###### Project accept_transfer_service begin ######")
+    ActiveRecord::Base.transaction do
+      validate!
+      update_apply 
+      operate_project
+      send_apply_message
+    end
+
+    Rails.logger.info("##### Project accept_transfer_service end ######")
+
+
+    return @applied_transfer_project
+  end
+
+  private 
+  def validate! 
+    raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
+    raise Error, '未拥有接受转移权限' unless is_permit_operator
+  end
+
+  def is_permit_operator
+    return true if @user == @owner
+    return @owner.is_a?(Organization) && @owner.is_admin?(@user)
+  end
+
+  def update_apply 
+    @applied_transfer_project.update!(status: 'accepted')
+  end
+
+  def operate_project 
+    @project = Projects::TransferService.call(@project, @owner)
+  end
+
+  def send_apply_message 
+    SendTransferProjectAppliedMessageJob.perform_now(@applied_transfer_project, @user, 'successed')
+  end
+end

app/services/projects/apply_transfer_service.rb

@@ -0,0 +1,43 @@
+class Projects::ApplyTransferService < ApplicationService
+  attr_accessor :owner, :applied_transfer_project
+  attr_reader :user, :project, :params 
+
+  def initialize(user, project, params)
+    @user   = user
+    @project = project
+    @params = params
+    @owner = Owner.find_by(login: params[:owner_name])
+  end
+
+  def call 
+    Rails.logger.info("###### Project apply_transfer_service begin ######")
+    validate!
+    create_apply 
+    send_apply_message
+    Rails.logger.info("###### Project apply_transfer_service end ######")
+
+    return @applied_transfer_project
+  end
+
+  private 
+  def validate! 
+    raise Error, '仓库标识不正确' if @project.identifier != params[:identifier]
+    raise Error, '该仓库正在迁移' if @project.is_transfering
+    raise Error, '新拥有者不存在' unless @owner.present?
+    raise Error, '新拥有者已经存在同名仓库！' if Project.where(user_id: @owner.id, identifier: params[:identifier]).present?
+    raise Error, '未拥有转移权限' unless is_permit_owner
+  end
+
+  def is_permit_owner
+    return true unless @owner.is_a?(Organization)
+    return @owner.is_owner?(@user)
+  end
+
+  def create_apply 
+    @applied_transfer_project = AppliedTransferProject.create!(user_id: user.id, project_id: project.id, owner_id: @owner.id)
+  end
+
+  def send_apply_message 
+    SendTransferProjectAppliedMessageJob.perform_now(@applied_transfer_project, @user, 'common')
+  end
+end

app/services/projects/cancel_transfer_service.rb

@@ -0,0 +1,33 @@
+class Projects::CancelTransferService < ApplicationService
+  attr_accessor :applied_transfer_project
+  attr_reader :user, :project 
+
+  def initialize(user, project)
+    @user   = user
+    @project = project
+    @applied_transfer_project = project.applied_transfer_project
+  end
+
+  def call 
+    Rails.logger.info("###### Project cancel_transfer_service begin ######")
+    validate!
+    update_apply 
+    send_apply_message
+    Rails.logger.info("###### Project cancel_transfer_service end ######")
+
+    return @applied_transfer_project
+  end
+
+  private 
+  def validate! 
+    raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
+  end
+
+  def update_apply 
+    @applied_transfer_project.update!(status: 'canceled')
+  end
+
+  def send_apply_message 
+    SendTransferProjectAppliedMessageJob.perform_now(@applied_transfer_project, @user, 'canceled')
+  end
+end

app/services/projects/migrate_service.rb

@@ -1,5 +1,6 @@
 class Projects::MigrateService < ApplicationService
   attr_reader :user, :params
+  attr_accessor :project
 
   def initialize(user, params)
     @user    = user
@@ -9,8 +10,9 @@ class Projects::MigrateService < ApplicationService
   def call
     @project = Project.new(project_params)
     if @project.save!
-      ProjectUnit.init_types(@project.id)
+      ProjectUnit.init_types(@project.id, project.project_type)
       Project.update_mirror_projects_count!
+      @project.set_owner_permission(user)
       Repositories::MigrateService.new(user, @project, repository_params).call
     else
       #
@@ -48,7 +50,8 @@ class Projects::MigrateService < ApplicationService
       user_id: params[:user_id],
       login: params[:auth_username],
       password: params[:auth_password],
-      is_mirror: params[:is_mirror]
+      is_mirror: params[:is_mirror],
+      source_clone_url: params[:source_clone_url]
     }
   end
 

app/services/projects/refuse_transfer_service.rb

@@ -0,0 +1,40 @@
+class Projects::RefuseTransferService < ApplicationService
+  attr_accessor :applied_transfer_project, :owner
+  attr_reader :user, :project 
+
+  def initialize(user, project)
+    @user   = user
+    @project = project
+    @applied_transfer_project = project.applied_transfer_project
+    @owner = @applied_transfer_project.owner
+  end
+
+  def call 
+    Rails.logger.info("###### Project refuse_transfer_service begin ######")
+    validate!
+    update_apply 
+    send_apply_message
+    Rails.logger.info("###### Project refuse_transfer_service end ######")
+
+    return @applied_transfer_project
+  end
+
+  private 
+  def validate! 
+    raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
+    raise Error, '未拥有拒绝转移权限' unless is_permit_operator
+  end
+
+  def is_permit_operator
+    return true if @user == @owner
+    return @owner.is_a?(Organization) && @owner.is_admin?(@user)
+  end
+
+  def update_apply 
+    @applied_transfer_project.update!(status: 'refused')
+  end
+
+  def send_apply_message 
+    SendTransferProjectAppliedMessageJob.perform_now(@applied_transfer_project, @user, 'failure')
+  end
+end

app/services/projects/transfer_service.rb

@@ -23,6 +23,7 @@ class Projects::TransferService < ApplicationService
 
   private
   def update_owner
+    project.members.find_by(user_id: owner.id).destroy! if owner.is_a?(User)
     project.update!(user_id: new_owner.id)
   end
 
@@ -32,9 +33,8 @@ class Projects::TransferService < ApplicationService
 
   def update_visit_teams
     if new_owner.is_a?(Organization)
-      new_owner.teams.where(includes_all_project: true).each do |team|
+      # 为包含组织所有项目的团队创建项目访问权限
-        TeamProject.build(new_owner.id, team.id, project.id)
+      new_owner.build_permit_team_projects(project.id)
-      end
     else
       project.team_projects.each(&:destroy!)
     end

app/services/pull_requests/merge_service.rb

@@ -1,6 +1,6 @@
 class PullRequests::MergeService < ApplicationService
   attr_reader :owner, :repo, :pull, :current_user, :params
-
+  attr_accessor :status, :message
   # eq:
   # PullRequests::MergeService.call(owner, repo, pull, current_user, params)
   def initialize(owner, repo, pull, current_user, params)
@@ -15,6 +15,7 @@ class PullRequests::MergeService < ApplicationService
     ActiveRecord::Base.transaction do
       gitea_pull_merge!
     end
+    self
   end
 
   private
@@ -22,8 +23,7 @@ class PullRequests::MergeService < ApplicationService
   def gitea_pull_merge!
     result = Gitea::PullRequest::MergeService.call(@current_user.gitea_token, @owner.login,
       @repo.identifier, @pull.gpid, gitea_merge_pull_params)
-
+      @status, @message = result
-    result[:status] === 200 ? true : false
   end
 
   def gitea_merge_pull_params

app/services/repositories/create_service.rb

@@ -15,6 +15,7 @@ class Repositories::CreateService < ApplicationService
         create_gitea_repository
         sync_project
         sync_repository
+        @project.set_owner_permission(user)
         # if project.project_type == "common"
         #   chain_params = {
         #     type: "create",
@@ -44,19 +45,9 @@ class Repositories::CreateService < ApplicationService
       @gitea_repository = Gitea::Repository::CreateService.new(user.gitea_token, gitea_repository_params).call
     elsif project.owner.is_a?(Organization)
       @gitea_repository = Gitea::Organization::Repository::CreateService.call(user.gitea_token, project.owner.login, gitea_repository_params)
-      project.owner.teams.each do |team|
-        next unless team.includes_all_project
-        TeamProject.build(project.user_id, team.id, project.id)
-      end
-      create_manager_member
     end
   end
 
-  def create_manager_member
-    return if project.owner.is_owner?(user.id)
-    project.add_member!(user.id, "Manager")
-  end
-
   def sync_project
     if gitea_repository
       project.update_columns(

app/services/repositories/migrate_service.rb

@@ -21,7 +21,7 @@ class Repositories::MigrateService < ApplicationService
 
   private
   def repository_params
-    params.merge(project_id: project.id, identifier: params[:identifier])
+    params.merge(project_id: project.id)
   end
 
   def gitea_repository_params

app/views/admins/faqs/_form_modal.html.erb

@@ -0,0 +1,24 @@
+<div class="modal fade faq-change-modal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><%= type == "create" ? "新增" : "编辑" %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+       <%= form_for @faq, url: {controller: "faqs", action: "#{type}"} do |p| %>
+        <div class="modal-body">
+          <%= p.text_field :question,class: "form-control input-lg",placeholder: "问题",required: true, maxlength: 100%>
+        </div>
+        <div class="modal-body">
+          <%= p.text_field :url,class: "form-control input-lg",placeholder: "链接",required: true, maxlength: 100%>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+          <%= p.submit "确认", class: "btn btn-primary submit-btn" %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

app/views/admins/faqs/_list.html.erb

@@ -0,0 +1,33 @@
+<table class="table table-hover text-center subject-list-table">
+  <thead class="thead-light">
+    <tr>
+      <th width="5%">序号</th>
+      <th width="20%">标题</th>
+      <th width="30%">url</th>
+      <th width="10%"><%= sort_tag('创建于', name: 'created_at', path: admins_faqs_path) %></th>
+      <th width="10%"><%= sort_tag('更新于', name: 'updated_at', path: admins_faqs_path) %></th>
+      <th width="25%">操作</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if faqs.present? %>
+      <% faqs.each_with_index do |faq, index| %>
+        <tr class="user-item-<%= faq.id %>">
+          <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
+          <td><%= faq.question%></td>
+          <td><%= link_to faq.url, target: '_blank' %></td>
+          <td><%= display_text(faq.created_at&.strftime('%Y-%m-%d %H:%M')) %></td>
+          <td><%= display_text(faq.updated_at&.strftime('%Y-%m-%d %H:%M')) %></td>
+          <td class="action-container">
+            <%= link_to "编辑", edit_admins_faq_path(faq), remote: true, class: "action" %>
+            <%= link_to "删除", admins_faqs_path(faq.id), method: :delete, data:{confirm: "确认删除的吗？"}, class: "delete-project-action" %>
+          </td>
+        </tr>
+      <% end %>
+    <% else %>
+      <%= render 'admins/shared/no_data_for_table' %>
+    <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: faqs } %>

app/views/admins/faqs/edit.js.erb

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

app/views/admins/faqs/index.html.erb

@@ -0,0 +1,17 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('FAQ', admins_faqs_path) %>
+<% end %>
+
+<div class="box search-form-container faq-list-form">
+  <%= form_tag(admins_faqs_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '输入标题搜素') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+  <% end %>
+  <%= link_to "新增", new_admins_faq_path, remote: true, class: "btn btn-primary pull-right", "data-disabled-with":"...新增" %> 
+</div>
+
+<div class="box admin-list-container faqs-list-container">
+  <%= render partial: 'admins/faqs/list', locals: { faqs: @faqs } %>
+</div>
+<div id="faq-modals">
+</div>

app/views/admins/faqs/index.js.erb

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

app/views/admins/faqs/new.js.erb

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

app/views/admins/projects/shared/_list.html.erb

@@ -23,7 +23,7 @@
       <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
       <td><%= project.id %></td>
       <td class="text-left">
-        <%= link_to(project.name, "/projects/#{project.id}", target: '_blank') %>
+        <%= link_to(project.name, "/projects/#{project&.owner&.login}/#{project.identifier}", target: '_blank') %>
       </td>
       <td><%= project.is_public ? '√' : '' %></td>
       <td><%= project.issues.size %></td>
@@ -33,7 +33,7 @@
       <td><%= project.versions.size %></td>
       <td><%= project.members.size %></td>
       <td>
-        <%= project.owner ? link_to(project.owner&.real_name, "/users/#{project.owner&.login}", target: '_blank') : "" %>
+        <%= link_to_project(project) %>
       </td>
       <td><%= project.created_on&.strftime('%Y-%m-%d %H:%M') %></td>
       <td class="action-container">

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

@@ -38,6 +38,7 @@
         <li><%= sidebar_item(admins_cooperatives_path, '合作伙伴', icon: 'handshake-o', controller: 'admins-cooperatives') %></li>
         <li><%= sidebar_item(edit_admins_agreement_path, '服务协议', icon: 'file-text-o', controller: 'admins-agreements') %></li>
         <li><%= sidebar_item(edit_admins_help_center_path, '帮助中心', icon: 'question-circle-o', controller: 'admins-help_centers') %></li>
+        <li><%= sidebar_item(admins_faqs_path, 'FAQ', icon: 'question-circle', controller: 'admins-faqs') %></li>
       <% end %>
     </li>
     <li>

app/views/compare/show.json.jbuilder

@@ -4,7 +4,7 @@ json.commits do
   json.array! @compare_result['Commits'] do |commit|
     json.author do
       # TODO: 获取头像地址待优化
-      forge_user = User.includes(:user_extension).select(:id, :login).find_by(login: commit['Author']['Name'])
+      forge_user = User.includes(:user_extension).find_by(login: commit['Author']['Name'])
       json.login commit['Author']['Name']
       json.name commit['Author']['Name']
       json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user)
@@ -12,7 +12,7 @@ json.commits do
 
     json.committer do
       # TODO: 获取头像地址待优化
-      forge_user = User.includes(:user_extension).select(:id, :login).find_by(login: commit['Committer']['Name'])
+      forge_user = User.includes(:user_extension).find_by(login: commit['Committer']['Name'])
       json.login commit['Committer']['Name']
       json.name commit['Committer']['Name']
       json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user)

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

@@ -1,6 +1,6 @@
 json.id organization.id
 json.name organization.login
-json.nickname organization.nickname
+json.nickname organization.nickname.blank? ? organization.name : organization.nickname
 json.description organization.description
 json.website organization.website
 json.location organization.location

app/views/organizations/organizations/_simple.json.jbuilder

@@ -0,0 +1,5 @@
+json.id organization.id
+json.name organization.login
+json.nickname organization.nickname.blank? ? organization.name : organization.nickname
+json.description organization.description
+json.avatar_url url_to_avatar(organization)

app/views/organizations/organizations/recommend.json.jbuilder

@@ -0,0 +1,6 @@
+json.organizations @organizations do |organization|
+  json.id organization.id
+  json.name organization.login
+  json.nickname organization.nickname.blank? ? organization.name : organization.nickname
+  json.avatar_url url_to_avatar(organization)
+end

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

@@ -1,6 +1,7 @@
 json.id team_project.id
 json.project do
-  json.owner_name team_project&.project&.owner&.login
+  json.owner_login team_project&.project&.owner&.login
+  json.owner_name team_project&.project&.owner&.real_name
   json.owner_image_url url_to_avatar(team_project&.project&.owner)
   json.name team_project&.project&.name
   json.identifier team_project&.project&.identifier

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

@@ -1,5 +1,6 @@
 json.id team.id
 json.name team.name
+json.nickname team.nickname.blank? ? team.name : team.nickname
 json.description team.description
 json.authorize team.authorize
 json.includes_all_project team.includes_all_project

app/views/projects/_project_detail.json.jbuilder

@@ -26,7 +26,7 @@ json.author do
     json.name user.try(:show_real_name)
     json.type user&.type
     json.login user.login
-    json.image_url render_avatar_url(user)
+    json.image_url url_to_avatar(user)
   end
 end
 

app/views/projects/applied_transfer_projects/_detail.json.jbuilder

@@ -0,0 +1,21 @@
+project = object.project
+json.project do 
+  json.id project.id
+  json.identifier project.identifier
+  json.name project.name
+  json.description project.description
+  json.is_public project.is_public
+  json.owner do 
+    json.partial! "/users/user_simple", locals: {user: project.owner}
+  end
+end
+json.user do 
+  json.partial! "/users/user_simple", locals: {user: object.user}
+end
+json.owner do 
+  json.partial! "/users/user_simple", locals: {user: object.owner}
+end
+json.id object.id
+json.status object.status
+json.created_at format_time(object.created_at)
+json.time_ago time_from_now(object.created_at)

app/views/projects/applied_transfer_projects/cancel.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}

app/views/projects/applied_transfer_projects/create.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}

app/views/projects/applied_transfer_projects/organizations.json.jbuilder

@@ -0,0 +1,4 @@
+json.total_count @organizations.size
+json.organizations @organizations do |org|
+  json.partial! "/organizations/organizations/simple", locals: {organization: org}
+end

app/views/projects/index.json.jbuilder

@@ -28,7 +28,7 @@ json.projects @projects do |project|
       json.type user.type
       json.name user.try(:show_real_name)
       json.login user.login
-      json.image_url render_avatar_url(user)
+      json.image_url url_to_avatar(user)
     end
   end
 

app/views/projects/update.json.jbuilder

@@ -6,3 +6,4 @@ json.project_category_id @project.project_category_id
 json.project_language_id @project.project_language_id
 json.is_public @project.is_public
 json.website @project.website
+json.lesson_url @project.lesson_url

app/views/pull_requests/_commit.json.jbuilder

@@ -1,10 +1,10 @@
 json.author do
-  author = User.find_by(login: commit['Author']['Name'])
+  author = User.find_by(mail: commit['Author']['Email'])
   json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] }
 end
 
 json.committer do
-  author = User.find_by(login: commit['Committer']['Name'])
+  author = User.find_by(mail: commit['Committer']['Email'])
   json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] }
 end
 json.timestamp render_unix_time(commit['Committer']['When'])

app/views/pull_requests/_merge_item.json.jbuilder

@@ -5,10 +5,10 @@ json.issue_priories @project_priories
 json.project_author @project.owner.try(:show_real_name)
 json.project_name @project.try(:name)
 json.members do
-  json.array! @project_members.to_a.each do |member|
+  json.array! @project_members.to_a.each do |user|
-    json.id member.user_id
+    json.id user.id
-    json.login member.user.try(:login)
+    json.login user.try(:login)
-    json.name member.user.try(:show_real_name)
+    json.name user.try(:show_real_name)
-    json.avatar_url url_to_avatar(member.user)
+    json.avatar_url url_to_avatar(user)
   end
 end

app/views/repositories/_commit_author.json.jbuilder

@@ -7,5 +7,5 @@ else
   json.id nil
   json.login name 
   json.name name 
-  json.image_url File.join("avatars/User","b")
+  json.image_url User::Avatar.get_letter_avatar_url(name)
 end

app/views/repositories/commits.json.jbuilder

@@ -5,12 +5,15 @@ else
   json.total_count @hash_commit[:total_count]
   json.commits do
     json.array! @hash_commit[:body] do |commit|
-      json.commit1 commit
       commiter = commit['committer']
-      if commiter.present? 
+
-        commit_user_id = commiter['id']
+      forge_user = 
-        forge_user = User.simple_select.find_by(gitea_uid: commit_user_id)
+        if commiter.present? 
-      end
+          User.simple_select.find_by(mail: commiter['email'])
+        else
+          User.simple_select.find_by(mail: commit['commit']['committer']['email'])
+        end
+        
       json.sha commit['sha']
       json.message commit['commit']['message']
       json.timestamp render_unix_time(commit['commit']['author']['date'])
@@ -23,7 +26,7 @@ else
           json.login commit['commit']['author']['name']
           json.type nil
           json.name commit['commit']['author']['name']
-          json.image_url File.join("avatars/User","b")
+          json.image_url User::Avatar.get_letter_avatar_url(commit['commit']['author']['name'])
         end
       end
     end

app/views/repositories/detail.json.jbuilder

@@ -1,5 +1,6 @@
 json.content @project.content
 json.website @project.website
+json.lesson_url @project.lesson_url
 if @result[:readme].blank?
   json.readme nil
 else
@@ -20,7 +21,7 @@ json.versions_count @project.versions_count  #里程碑数量
 json.version_releases_count @project.releases_size(@user.try(:id), "all")
 json.version_releasesed_count @project.releases_size(@user.try(:id), "released")  #已发行的版本
 json.permission render_permission(@user, @project)
-json.mirror_url @project&.repository.mirror_url
+json.mirror_url @project&.repository.remote_mirror_url
 json.mirror @project&.repository.mirror_url.present?
 json.type @project.numerical_for_project_type
 json.open_devops @project.open_devops?
@@ -79,7 +80,7 @@ json.contributors do
   total_count = @result[:contributor].size
   json.list @result[:contributor].each do |contributor|
     user = User.find_by(gitea_uid: contributor["id"])
-    if contributor["login"] == "root"
+    if contributor["login"] == "root" || user.nil?
       total_count -= 1
       next
     end