参数管理

2021-03-03 14:58:51 +08:00
208 changed files with 596 additions and 5008 deletions
--- a/.gitignore
+++ b/.gitignore
@ -36,8 +36,6 @@ public/react/yarn.lock
 /.idea/*

 # Ignore react node_modules
-public/system/*
-public/react/*
 /public/react/.cache
 /public/react/node_modules/
 /public/react/config/stats.json
@ -83,5 +81,4 @@ docker/
 educoder.sql
 redis_data/
 Dockerfile
-dump.rdb
-.tags*
+dump.rdb
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,53 +0,0 @@
-# Changelog
-
-## [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
-  * Fix pull reqeust模块中用户头像显示问题
-  * Fix 解决issue模块中，指派用户的问题
-  * Fix 解决合并请求失败的后显示message信息不正确
-  * Fix 代码目录页面，readme文件提供单独的api
-
-* ENHANCEMENTS
-  * 重构项目详情页面
-
-## [v3.0.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2020-12-29
-
-* BUGFIXES
-  * Fix pull reqeust的访问权限问题 (#14156) (#14171)
-  * Fix 部分页面访问403的问题
-  * Fix 合并请求失败的问题
-  * Fix 代码目录页面，文件夹和文件图片不显示的问题
-  * Fix Issue列表中按‘负责人’过滤筛选时，部分项目成员不在搜索范围没的问题
-  * Fix 项目更新时间不同步的问题, 添加了定时任务
-* ENHANCEMENTS
-  * 提升获取版本库目录代码查询速度 (#43296)
-  * tag 列表慢查询速度问题 (#43332)
-  * API builder 模版中 render partial builder的性能问题
--- a/2
+++ b/2
@ -126,5 +126,3 @@ gem 'request_store'
 gem 'harmonious_dictionary', '~> 0.0.1'

 gem 'parallel', '~> 1.19', '>= 1.19.1'
-
-gem 'letter_avatar'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -162,7 +162,6 @@ 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)
@ -457,7 +456,6 @@ 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
--- a/README.md
+++ b/README.md
@ -11,32 +11,13 @@ Trustie （确实）是一个以大众化协同开发、开放式资源共享、
 ## 部署


-### Depends Versions
-
-* Ruby 2.4.5
-
-* Rails ~> 5.2
-
-* MySql ~> 5.6
-
-* Redis 5+
-
-* imagemagick
-
-### Steps
-
-#### 1. 克隆稳定版本
-```
-git clone -b standalone https://git.trustie.net/jasder/forgeplus.git
-```
-
-#### 2. 安装依赖包
+### 1. 安装依赖包

 ```bash
-cd forgeplus && bundle install
+bundle install
 ```

-#### 3. 配置初始化文件
+### 2. 配置初始化文件
 进入项目根目录执行一下命令：

 ```bash
@ -46,26 +27,12 @@ touch config/redis.yml
 touch config/elasticsearch.yml
 ```

-#### 4. 配置数据库
-数据库配置信息请查看/config/database.yml文件，
-项目默认采用mysql数据库, 如需更改，请自行修改配置信息，
-默认配置如下：
-
-```bash
-default: &default
-  adapter: mysql2
-  host: 127.0.0.1
-  encoding: utf8
-  username: root
-  password: 123456
-```
-
-#### 5. 配置gitea服务(可选)
+### 3. 配置gitea服务(可选)
 **如需要部署自己的gitea平台，请参考gitea官方平台：https://docs.gitea.io/zh-cn/install-from-binary/**

-**因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/Trustie/gitea-binary**
+**因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/jasder/gitea-binary

-**配置gitea服务步骤**
+#### 配置gitea服务步骤
 1. 部署gitea服务，并注册root账户
 2. 修改forge平台的 config/configuration.yml中的gitea服务指向地址，如：

@ -77,95 +44,75 @@ gitea:
  base_url: '/api/v1'
 ```

-#### 6. 安装redis环境
+### 4. 安装redis环境
 **请自行搜索各平台如何安装部署redis环境**

-#### 7. 安装imagemagick插件
- Mac OS X
+
+### 5. 创建数据库
+
 ```bash
- brew install imagemagick ghostscript
+rails db:create
 ```

- Linux
-```bash
-sudo apt-get install -y imagemagick
-```
-
-#### 8. 创建数据库
-**开发环境为development， 生成环境为production**
-```bash
-rails db:create  RAILS_ENV=development
-```
-
-#### 9. 导入数据表结构
+### 6. 导入数据表结构

 ```bash
 bundle exec rake sync_table_structure:import_csv
 ```

-#### 10. 执行migrate迁移文件
+### 7. 执行migrate迁移文件
 **开发环境为development， 生成环境为production**
 ```bash
 rails db:migrate RAILS_ENV=development
 ```

-#### 11. clone前端代码
-**将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
-```bash
-git clone -b standalone https://git.trustie.net/jasder/build.git
-```
-
-#### 12. 启动redis(此处已mac系统为例)
+### 8. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```

-#### 13. 启动sidekiq
+### 9. 启动sidekiq
 **开发环境为development， 生成环境为production**
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```

-#### 14. 启动rails服务
+### 10. 启动rails服务
 ```bash
 rails s
 ```

-#### 15. 浏览器访问
+### 11. 浏览器访问
 在浏览器中输入如下地址访问：
 ```bash
 http://localhost:3000/
 ```

-#### 16. 其他说明
-通过页面注册都第一个用户为平台管理员用户

 ## 页面展示

 - 代码库

-![](docs/figs/code.png?raw=true)
+![](docs/figs/code.png)


 - 任务管理
-![](docs/figs/issue_manage.png?raw=true)
+![](docs/figs/issue_manage.png)

 - 任务查看

-![](docs/figs/issue_view.png?raw=true)
+![](docs/figs/issue_view.png)

 - 任务指派

-![](docs/figs/issue_assign2.png?raw=true)
+![](docs/figs/issue_assign2.png)

 - 里程碑

-![](docs/figs/milestone.png?raw=true)
+![](docs/figs/milestone.png)

 ### API
- [API文档](https://forgeplus.trustie.net/docs/api)
- [API](showdoc.com.cn)
-  账号：forgeplus@admin.com 密码：forge123
+- [API](api_document.md)

 ## 贡献代码

--- a/api_document.md
+++ b/api_document.md
@ -4919,13 +4919,13 @@ curl --location --request POST 'http://localhost:3000/api/ci/secrets?owner=test&
 #### 参数删除

 ```
-DELETE  /api/ci/secrets/{id}?name={name}&owner={owner}&repo={repo}
+DELETE  /api/ci/secrets/{id}/{name}?owner={owner}&repo={repo}
 ```

 *示例*

 ```bash
-curl --location --request DELETE 'http://localhost:3000/api/ci/secrets/1?name=p1&owner=victor&repo=trustieTest' \
+curl --location --request DELETE 'http://localhost:3000/api/ci/secrets/1/p2?owner=victor&repo=trustieTest' \
 ```

 *请求参数说明:*
--- a/app/controllers/application_controller.rb
+++ b/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, :base_url
+	helper_method :current_user

 	# 所有请求必须合法签名
 	def check_sign
@ -680,14 +680,6 @@ class ApplicationController < ActionController::Base
 		relation.page(page).per(limit)
 	end

-	def kaminari_array_paginate(relation)
-		limit = params[:limit] || params[:per_page]
-		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
-		page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
-
-		Kaminari.paginate_array(relation).page(page).per(limit)
-	end
-
 	def strf_time(time)
 		time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M:%S")
 	end
@ -770,11 +762,6 @@ 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")
--- a/app/controllers/ci/secrets_controller.rb
+++ b/app/controllers/ci/secrets_controller.rb
@ -4,26 +4,28 @@ class Ci::SecretsController < Ci::BaseController

  # 参数列表
  def index
-    result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], nil).secrets
+    cloud_account = current_user.ci_cloud_account
+    result = Ci::Drone::API.new(@ci_user.user_hash, cloud_account.drone_url, params[:owner], params[:repo], nil).secrets
    @secrets = result
  end

  #新增、更新参数
  def create
+    cloud_account = current_user.ci_cloud_account
    options = {
        name: params[:name],
        data: params[:data]
    }
    id = params[:id]
    if id
-      result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).update_secret
+      result = Ci::Drone::API.new(@ci_user.user_hash, cloud_account.drone_url, params[:owner], params[:repo], options).update_secret
      if result["id"]
        render_ok
      else
        render_error(result["message"])
      end
    else
-      result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).create_secret
+      result = Ci::Drone::API.new(@ci_user.user_hash, cloud_account.drone_url, params[:owner], params[:repo], options).create_secret
      if result["id"]
        render_ok
      else
@ -36,18 +38,12 @@ class Ci::SecretsController < Ci::BaseController
  def destroy
    name = params[:name]
    if !name.blank?
-      Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], {name: name}).delete_secret
+      cloud_account = current_user.ci_cloud_account
+      Ci::Drone::API.new(@ci_user.user_hash, cloud_account.drone_url, params[:owner], params[:repo], {name: name}).delete_secret
      render_ok
    else
      render_error("参数名不能为空")
    end
-  rescue Exception => ex
-    render_ok
-  end
-
-  def ci_drone_url
-    user = User.find_by(login: params[:owner])
-    user&.ci_cloud_account.drone_url
  end

 end
--- a/app/controllers/concerns/paginate_helper.rb
+++ b/app/controllers/concerns/paginate_helper.rb
@ -1,14 +1,12 @@
 module PaginateHelper
+  def paginate(objs, **opts)
+    page     = params[:page].to_i <= 0 ? 1 : params[:page].to_i
+    per_page = params[:per_page].to_i > 0 && params[:per_page].to_i < 50 ? params[:per_page].to_i : opts[:per_page] || 20

-  def paginate(relation)
-    limit = params[:limit] || params[:per_page]
-    limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
-    page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
-
-    if relation.is_a?(Array)
-      Kaminari.paginate_array(relation).page(page).per(limit)
+    if objs.is_a?(Array)
+      Kaminari.paginate_array(objs).page(page).per(per_page)
    else
-      relation.page(page).per(limit)
+      objs.page(page).per(per_page)
    end
  end
 end
--- a/app/controllers/concerns/register_helper.rb
+++ b/app/controllers/concerns/register_helper.rb
@ -8,8 +8,6 @@ module RegisterHelper
    user.password = password
    user.platform = platform
    user.activate
-    
-    return unless user.valid?

    interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
    if interactor.success?
--- a/app/controllers/concerns/repository/languages_percentagable.rb
+++ b/app/controllers/concerns/repository/languages_percentagable.rb
@ -14,6 +14,6 @@ module Repository::LanguagesPercentagable
    hash.transform_values { |v|
      ActionController::Base.helpers
        .number_to_percentage((v * 100.0 / total_byte_size), precision: 1)
-    }.select{|k,v| v != "0.0%"}
+    }
  end
 end
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -12,7 +12,6 @@ class IssuesController < ApplicationController
  include TagChosenHelper

  def index
-    return render_not_found unless @project.has_menu_permission("issues")
    @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user))
    issues = @project.issues.issue_issue.issue_index_includes
    issues = issues.where(is_private: false) unless @user_admin_or_member
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@ -47,7 +47,7 @@ class MembersController < ApplicationController
  end

  def member_exists?
-    @project.members.exists?(params[:user_id])
+    @project.member?(params[:user_id])
  end

  def operate!
@ -59,6 +59,6 @@ class MembersController < ApplicationController
  end

  def check_member_not_exists!
-    return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless @project.member?(params[:user_id])
+    return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists?
  end
 end
--- a/app/controllers/organizations/base_controller.rb
+++ b/app/controllers/organizations/base_controller.rb
@ -1,34 +0,0 @@
-class Organizations::BaseController < ApplicationController
-  include ApplicationHelper
-  include PaginateHelper
-
-  protected
-
-  def can_edit_org?
-    current_user.admin? || @organization.is_owner?(current_user.id)
-  end
-
-  def check_user_can_edit_org
-    tip_exception("您没有权限进行该操作") unless can_edit_org?
-  end
-
-  def org_limited_condition
-    @organization.organization_extension.limited? && !current_user.logged?
-  end
-
-  def org_privacy_condition
-    @organization.organization_extension.privacy? && @organization.organization_users.where(user_id: current_user.id).blank?
-  end
-
-  def team_not_found_condition
-    !current_user&.admin? && @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
-  end
-
-  def user_mark
-    params[:username] || params[:id]
-  end
-
-  def project_mark
-    params[:repo_name] || params[:id]
-  end
-end
--- a/app/controllers/organizations/organization_users_controller.rb
+++ b/app/controllers/organizations/organization_users_controller.rb
@ -1,57 +0,0 @@
-class Organizations::OrganizationUsersController < Organizations::BaseController
-  before_action :load_organization
-  before_action :load_operate_user, :load_organization_user, :check_user_can_edit_org, only: [:destroy]
-
-  def index
-    @organization_users = @organization.organization_users.includes(:user)
-    search = params[:search].to_s.downcase
-    @organization_users = @organization_users.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
-
-    @organization_users = kaminari_paginate(@organization_users)
-  end
-
-  def destroy
-    tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(@operate_user.id)
-    ActiveRecord::Base.transaction do
-      @organization_user.destroy!
-      TeamUser.where(organization_id: @organization.id, user_id: @operate_user.id).map{|u| u.destroy!}
-      Gitea::Organization::OrganizationUser::DeleteService.call(@organization.gitea_token, @organization.login, @operate_user.login)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def quit
-    @organization_user = @organization.organization_users.find_by(user_id: current_user.id)
-    tip_exception("您不在该组织中") if @organization_user.nil?
-    tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(current_user.id)
-    ActiveRecord::Base.transaction do
-      @organization_user.destroy!
-      TeamUser.where(organization_id: @organization.id, user_id: current_user.id).map{|u| u.destroy!}
-      Gitea::Organization::OrganizationUser::DeleteService.call(@organization.gitea_token, @organization.login, current_user.login)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def load_operate_user
-    @operate_user = User.find_by(login: user_mark) if user_mark.present?
-    tip_exception("平台用户不存在") if @operate_user.nil?
-  end
-
-  def load_organization_user
-    @organization_user = OrganizationUser.find_by(organization_id: @organization.id, user_id: @operate_user.id)
-    tip_exception("组织成员不存在") if @organization_user.nil?
-  end
-end
--- a/app/controllers/organizations/organizations_controller.rb
+++ b/app/controllers/organizations/organizations_controller.rb
@ -1,109 +0,0 @@
-class Organizations::OrganizationsController < Organizations::BaseController
-  before_action :require_login, except: [:index, :show]
-  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]
-
-  def index
-    if current_user.logged?
-      logged_organizations_sql = Organization.with_visibility(%w(common limited)).to_sql
-      privacy_organizations_sql = Organization.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).to_sql
-      @organizations = Organization.from("( #{ logged_organizations_sql } UNION #{ privacy_organizations_sql } ) AS users")
-    else
-      @organizations = Organization.with_visibility("common")
-    end
-    @organizations = @organizations.ransack(login_cont: params[:search]).result if params[:search].present?
-    @organizations = @organizations.includes(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}")
-    @organizations = kaminari_paginate(@organizations)
-  end
-
-  def show
-    @can_create_project = @organization.can_create_project?(current_user.id)
-    @is_admin = can_edit_org?
-    @is_member = @organization.is_member?(current_user.id)
-  end
-
-  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
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def update
-    ActiveRecord::Base.transaction do
-      login = @organization.login
-      @organization.login = organization_params[:name] if organization_params[:name].present?
-      @organization.nickname = organization_params[:nickname] if organization_params[:nickname].present?
-      @organization.save!
-      @organization.organization_extension.update_attributes!(organization_params.except(:name, :nickname))
-      Gitea::Organization::UpdateService.call(@organization.gitea_token, login, @organization.reload)
-      Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def destroy
-    tip_exception("密码不正确") unless current_user.check_password?(password)
-    ActiveRecord::Base.transaction do
-      Gitea::Organization::DeleteService.call(@organization.gitea_token, @organization.login)
-      @organization.destroy!
-    end
-    render_ok
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def convert_image!
-    return unless params[:image].present?
-    max_size = EduSetting.get('upload_avatar_max_size') || 2 * 1024 * 1024 # 2M
-    if params[:image].class == ActionDispatch::Http::UploadedFile
-      @image = params[:image]
-      render_error('请上传文件') if @image.size.zero?
-      render_error('文件大小超过限制') if @image.size > max_size.to_i
-    else
-      image = params[:image].to_s.strip
-      return render_error('请上传正确的图片') if image.blank?
-      @image = Util.convert_base64_image(image, max_size: max_size.to_i)
-    end
-  rescue Base64ImageConverter::Error => ex
-    render_error(ex.message)
-  end
-
-  def avatar_path(organization)
-    ApplicationController.helpers.disk_filename(organization.class, organization.id)
-  end
-
-  def organization_params
-    params.permit(:name, :description, :website, :location,
-                  :repo_admin_change_team_access, :visibility,
-                  :max_repo_creation, :nickname)
-  end
-
-  def password
-    params.fetch(:password, "")
-  end
-
-  def load_organization
-    @organization = Organization.find_by(login: params[:id]) || Organization.find_by(id: params[:id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def sort_by
-    params.fetch(:sort_by, "created_at")
-  end
-
-  def sort_direction
-    params.fetch(:sort_direction, "desc")
-  end
-
-end
--- a/app/controllers/organizations/projects_controller.rb
+++ b/app/controllers/organizations/projects_controller.rb
@ -1,45 +0,0 @@
-class Organizations::ProjectsController < Organizations::BaseController
-  before_action :load_organization
-
-  def index
-    public_projects_sql = @organization.projects.where(is_public: true).to_sql
-    private_projects_sql = @organization.projects
-                               .where(is_public: false)
-                               .joins(team_projects: {team: :team_users})
-                               .where(team_users: {user_id: current_user.id}).to_sql
-    @projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects")
-
-    @projects = @projects.ransack(name_or_identifier_cont: params[:search]).result if params[:search].present?
-    @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
-    @projects = paginate(@projects)
-  end
-
-  def search
-    tip_exception("请输入搜索关键词") if params[:search].nil?
-    public_projects_sql = @organization.projects.where(is_public: true).to_sql
-    private_projects_sql = @organization.projects
-                               .where(is_public: false)
-                               .joins(team_projects: {team: :team_users})
-                               .where(team_users: {user_id: current_user.id}).to_sql
-    @projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects")
-
-    @projects = @projects.ransack(name_or_identifier_cont: params[:search]).result
-    @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
-  end
-
-  private
-
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def sort
-    params.fetch(:sort_by, "updated_on")
-  end
-
-  def sort_direction
-    params.fetch(:sort_direction, "desc")
-  end
-end
--- a/app/controllers/organizations/team_projects_controller.rb
+++ b/app/controllers/organizations/team_projects_controller.rb
@ -1,58 +0,0 @@
-class Organizations::TeamProjectsController < Organizations::BaseController
-  before_action :load_organization
-  before_action :load_team
-  before_action :load_operate_project, :check_user_can_edit_org, only: [:create, :destroy]
-  before_action :load_team_project, only: [:destroy]
-
-  def index
-    @team_projects = @team.team_projects
-
-    @team_projects = paginate(@team_projects)
-  end
-
-  def create
-    tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
-    ActiveRecord::Base.transaction do
-      @team_project = TeamProject.build(@organization.id, @team.id, @operate_project.id)
-      Gitea::Organization::TeamProject::CreateService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier)
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def destroy
-    tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
-    ActiveRecord::Base.transaction do
-      @team_project.destroy!
-      Gitea::Organization::TeamProject::DeleteService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def load_team
-    @team = Team.find_by_id(params[:team_id])
-    return render_not_found("组织团队不存在") if @team.nil?
-    return render_forbidden("没有查看组织团队的权限") if team_not_found_condition
-  end
-
-  def load_operate_project
-    @operate_project = Project.find_by(id: project_mark) || Project.find_by(identifier: project_mark)
-    tip_exception("项目不存在") if @operate_project.nil?
-  end
-
-  def load_team_project
-    @team_project = TeamProject.find_by(organization_id: @organization.id, team_id: @team.id, project_id: @operate_project.id)
-    tip_exception("组织团队项目不存在") if @team_project.nil?
-  end
-end
--- a/app/controllers/organizations/team_users_controller.rb
+++ b/app/controllers/organizations/team_users_controller.rb
@ -1,76 +0,0 @@
-class Organizations::TeamUsersController < Organizations::BaseController
-  before_action :load_organization, :load_team
-  before_action :load_operate_user, only: [:create, :destroy]
-  before_action :load_team_user, only: [:destroy]
-  before_action :check_user_can_edit_org, only: [:create, :destroy]
-
-  def index
-    @team_users = @team.team_users.includes(:user)
-
-    search = params[:search].to_s.downcase
-    @team_users = @team_users.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
-
-    @team_users = kaminari_paginate(@team_users)
-  end
-
-  def create
-    ActiveRecord::Base.transaction do
-      @team_user = TeamUser.build(@organization.id, @operate_user.id, @team.id)
-      @organization_user = OrganizationUser.build(@organization.id, @operate_user.id)
-      Gitea::Organization::TeamUser::CreateService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def destroy
-    tip_exception("您不能从所有者团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(@operate_user.id)
-    ActiveRecord::Base.transaction do
-      @team_user.destroy!
-      Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def quit
-    @team_user = @team.team_users.find_by(user_id: current_user.id)
-    tip_exception("您不在该组织团队中") if @team_user.nil?
-    tip_exception("您不能从所有者团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(current_user.id)
-    ActiveRecord::Base.transaction do
-      @team_user.destroy!
-      Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, current_user.login)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def load_team
-    @team = Team.find_by_id(params[:team_id])
-    return render_not_found("组织团队不存在") if @team.nil?
-    return render_forbidden("没有查看组织团队的权限") if team_not_found_condition
-  end
-
-  def load_operate_user
-    @operate_user = User.find_by(login: user_mark) if user_mark.present?
-    tip_exception("平台用户不存在") if @operate_user.nil?
-  end
-
-  def load_team_user
-    @team_user = TeamUser.find_by(team_id: @team.id, user_id: @operate_user.id)
-    tip_exception("组织团队成员不存在") if @team_user.nil?
-  end
-
-end
--- a/app/controllers/organizations/teams_controller.rb
+++ b/app/controllers/organizations/teams_controller.rb
@ -1,80 +0,0 @@
-class Organizations::TeamsController < Organizations::BaseController
-  before_action :load_organization
-  before_action :load_team, only: [:show, :update, :destroy]
-  before_action :check_user_can_edit_org, only: [:create, :update, :destroy]
-
-  def index
-    #if @organization.is_owner?(current_user) || current_user.admin?
-      @teams = @organization.teams
-    #else
-    #  @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
-    #end
-    @is_admin = can_edit_org?
-    @teams = @teams.includes(:team_units, :team_users)
-
-    @teams = kaminari_paginate(@teams)
-  end
-
-  def search
-    tip_exception("请输入搜索关键词") if params[:search].nil?
-    if @organization.is_owner?(current_user) || current_user.admin?
-      @teams = @organization.teams
-    else
-      @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
-    end
-    @is_admin = can_edit_org?
-    @teams  = @teams.ransack(name_cont: params[:search]).result if params[:search].present?
-    @teams = @teams.includes(:team_units, :team_users)
-  end
-
-  def show
-    @is_admin = can_edit_org?
-    @is_member = @team.is_member?(current_user.id)
-  end
-
-  def create
-    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
-    @team = Organizations::Teams::UpdateService.call(current_user, @team, team_params)
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def destroy
-    tip_exception("组织团队不允许被删除") if @team.owner?
-    ActiveRecord::Base.transaction do
-      Gitea::Organization::Team::DeleteService.call(@organization.gitea_token, @team.gtid)
-      @team.destroy!
-    end
-    render_ok
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def team_params
-    params.permit(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
-  end
-
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def load_team
-    @team = Team.find_by_id(params[:id])
-    return render_not_found("组织团队不存在") if @team.nil?
-    return render_forbidden("没有查看组织团队的权限") if team_not_found_condition
-  end
-end
--- a/app/controllers/owners_controller.rb
+++ b/app/controllers/owners_controller.rb
@ -1,12 +0,0 @@
-class OwnersController < ApplicationController
-  before_action :require_login
-
-  def index
-    @owners = []
-    @owners += [current_user]
-    @owners += Organization.joins(team_users: :team)
-                   .where(team_users: {user_id: current_user.id},
-                          teams: {can_create_org_project: true})
-                   .distinct
-  end
-end
--- a/app/controllers/projects/project_units_controller.rb
+++ b/app/controllers/projects/project_units_controller.rb
@ -1,24 +0,0 @@
-class Projects::ProjectUnitsController < Projects::BaseController
-  def index 
-    @project_units = @project.project_units
-  end
-
-  def create 
-    if current_user.admin? || @project.manager?(current_user)
-      ActiveRecord::Base.transaction do 
-        ProjectUnit.update_by_unit_types!(@project, unit_types)
-        render_ok
-      end
-    else 
-      render_forbidden('你没有权限操作')
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private 
-  def unit_types
-    params.fetch(:unit_types, [])
-  end
-end
--- a/app/controllers/projects/teams_controller.rb
+++ b/app/controllers/projects/teams_controller.rb
@ -1,47 +0,0 @@
-class Projects::TeamsController < Projects::BaseController
-  before_action :load_operate_team, only: [:create, :destroy]
-  before_action :load_team_project, only: :destroy
-
-  def index
-    if @project.owner.is_a?(Organization)
-      @teams = Team.joins(:team_projects).where(team_projects: {project_id: @project.id})
-    else
-      @teams = Team.none
-    end
-    @teams = paginate(@teams)
-  end
-
-  def create
-    ActiveRecord::Base.transaction do
-      @team_project = TeamProject.build(@owner.id, @operate_team.id, @project.id)
-      Gitea::Organization::TeamProject::CreateService.call(@owner.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def destroy
-    ActiveRecord::Base.transaction do
-      @team_project.destroy!
-      Gitea::Organization::TeamProject::DeleteService.call(@owner.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def load_operate_team
-    @operate_team = Team.find_by(id: params[:team_id]) || Team.find_by(id: params[:id])
-    tip_exception("项目不存在") if @operate_team.nil?
-    tip_exception("该组织团队拥有组织所有项目，无法进行操作") if @operate_team.includes_all_project
-  end
-
-  def load_team_project
-    @team_project = TeamProject.find_by(organization_id: @owner.id, team_id: @operate_team.id, project_id: @project.id)
-    tip_exception("组织团队项目不存在") if @team_project.nil?
-  end
-end
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -2,32 +2,16 @@ class ProjectsController < ApplicationController
  include ApplicationHelper
  include OperateProjectAbilityAble
  include ProjectsHelper
-  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 :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about]
  before_action :load_project, except: %i[index group_type_list migrate create recommend]
  before_action :authorizate_user_can_edit_project!, only: %i[update]
  before_action :project_public?, only: %i[fork_users praise_users watch_users]

-  def menu_list
-    menu = []
-
-    menu.append(menu_hash_by_name("home"))
-    menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
-    menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
-    menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls")
-    menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops")
-    menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions")
-    menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources")
-    menu.append(menu_hash_by_name("activity"))
-    menu.append(menu_hash_by_name("setting")) if current_user.admin? || @project.manager?(current_user)
-
-    render json: menu
-  end
-
  def index
    scope = Projects::ListQuery.call(params)

    # @projects = kaminari_paginate(scope)
-    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
+    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, owner: :user_extension)

    category_id = params[:category_id]
    @total_count =
@ -60,10 +44,7 @@ class ProjectsController < ApplicationController
  end

  def branches
-    return @branches = [] unless @project.forge?
-
-    result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
-    @branches =  result.is_a?(Hash) && result.key?(:status) ? [] : result
+    @branches = @project.forge? ? Gitea::Repository::Branches::ListService.new(@owner, @project.identifier).call : []
  end

  def group_type_list
@ -89,19 +70,17 @@ class ProjectsController < ApplicationController
  def update
    ActiveRecord::Base.transaction do
      # Projects::CreateForm.new(project_params).validate!
-      private = params[:private] || false
-
-      new_project_params = project_params.except(:private).merge(is_public: !private)
-      @project.update_attributes!(new_project_params)
+      private = params[:private]
      gitea_params = {
        private: private,
-        default_branch: @project.default_branch,
-        website: @project.website
+        default_branch: params[:default_branch]
      }
      if [true, false].include? private
+        new_project_params = project_params.merge(is_public: !private)
        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
        @project.repository.update_column(:hidden, private)
      end
+      @project.update_attributes!(new_project_params)
    end
  rescue Exception => e
    uid_logger_error(e.message)
@ -112,7 +91,7 @@ class ProjectsController < ApplicationController
  end

  def destroy
-    if current_user.admin? || @project.manager?(current_user)
+    if  current_user.admin? ||  @project.owner?(current_user)
      ActiveRecord::Base.transaction do
        Gitea::Repository::DeleteService.new(@project.owner, @project.identifier).call
        @project.destroy!
@ -149,7 +128,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: :user_extension).limit(5)
  end

  def about
@ -183,8 +162,8 @@ class ProjectsController < ApplicationController

  private
  def project_params
-    params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url,
-                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
+    params.permit(:user_id, :name, :description, :repository_name,
+                  :project_category_id, :project_language_id, :license_id, :ignore_id)
  end

  def mirror_params
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@ -8,7 +8,6 @@ class PullRequestsController < ApplicationController


  def index
-    return render_not_found unless @project.has_menu_permission("pulls")
    # @issues = Gitea::PullRequest::ListService.new(@user,@repository.try(:identifier)).call   #通过gitea获取
    issues = @project.issues.issue_pull_request.issue_index_includes.includes(pull_request: :user)
    issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
@ -140,7 +139,7 @@ class PullRequestsController < ApplicationController
  end

  def pr_merge
-    return render_forbidden("你没有权限操作.") unless current_user.project_manager?(@project)
+    return render_forbidden("你没有权限操作.") if @project.reporter?(current_user)

    if params[:do].blank?
      normal_status(-1, "请选择合并方式")
@ -229,8 +228,7 @@ class PullRequestsController < ApplicationController
    }
    @requests_params = @local_params.merge({
      assignee: current_user.try(:login),
-      # assignees: ["#{params[:assigned_login].to_s}"],
-      assignees: ["#{current_user.try(:login).to_s}"],
+      assignees: ["#{params[:assigned_login].to_s}"],
      labels: params[:issue_tag_ids],
      due_date: Time.now
    })
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -7,29 +7,10 @@ class RepositoriesController < ApplicationController
  before_action :load_repository
  before_action :authorizate!, except: [:sync_mirror, :tags, :commit]
  before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
-  before_action :get_ref, only: %i[entries sub_entries top_counts file]
+  before_action :get_ref, only: %i[entries sub_entries top_counts]
  before_action :get_latest_commit, only: %i[entries sub_entries top_counts]
  before_action :get_statistics, only: %i[top_counts]

-  def files
-    result = @project.educoder? ? nil : Gitea::Repository::Files::GetService.call(@owner, @project.identifier, @ref, params[:search], @owner.gitea_token)
-    render json: result
-  end
-
-  # 新版项目详情
-  def detail
-    @user = current_user
-    @result = Repositories::DetailService.call(@owner, @repository, @user)
-    @project_fork_id = @project.try(:forked_from_project_id)
-    if @project_fork_id.present?
-      @fork_project = Project.find_by(id: @project_fork_id)
-      @fork_project_user = @fork_project.owner
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
  def show
    @user = current_user
    @repo = @project.repository
@ -103,17 +84,10 @@ class RepositoriesController < ApplicationController
  end

  def tags
-    result = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]})
-
-    @tags = result.is_a?(Hash) && result.key?(:status) ? [] : result
-  end
-
-  def contributors
-    @contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
+    @tags = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]})
  end

  def edit
-    return render_forbidden if !@project.manager?(current_user) && !current_user.admin?
  end

  def create_file
@ -212,7 +186,7 @@ class RepositoriesController < ApplicationController
  end

  def get_ref
-    @ref = params[:ref] || @project&.default_branch
+    @ref = params[:ref] || "master"
  end

  def get_latest_commit
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@ -1,57 +1,6 @@
 class SettingsController < ApplicationController
  def show
-    @old_projects_url = nil
-    get_add_menu
-    get_common_menu
-    get_personal_menu
-
+    @old_projects_url = nil 
+    @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
  end
-
-  private
-    def get_add_menu
-      @add = []
-      Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
-        hash = {}
-        site.each {|k, v|
-          hash.merge!("#{k}":  get_site_url(k, v))
-        }
-        @add << hash
-      end
-    end
-
-    def get_common_menu
-      @common = {}
-      Site.common.select(:url, :key).each do |site|
-        next if site["url"].to_s.include?("current_user") && !User.current.logged?
-        @common.merge!("#{site["key"]}": append_http(reset_site_url(site["url"])))
-      end
-    end
-
-    def get_personal_menu
-      @personal = []
-      if User.current.logged?
-        Site.personal.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
-          hash = {}
-          site.each {|k, v|
-            hash.merge!("#{k}": get_site_url(k, v))
-          }
-          @personal << hash
-        end
-      end
-    end
-
-    def get_site_url(key, value)
-      key.to_s === "url" ? append_http(reset_site_url(value)) : reset_site_url(value)
-    end
-
-    def reset_site_url(url)
-      return url unless url.to_s.include?("current_user")
-
-      split_arr = url.split('current_user')
-      split_arr.length > 1 ? split_arr.join(current_user&.login) : (split_arr << current_user&.login).join('')
-    end
-
-    def append_http(url)
-      url.to_s.start_with?("http") ? url : [request.protocol, request.host_with_port, url].join('')
-    end
 end
--- a/app/controllers/users/organizations_controller.rb
+++ b/app/controllers/users/organizations_controller.rb
@ -1,25 +0,0 @@
-class Users::OrganizationsController < Users::BaseController
-
-  def index
-    if current_user.logged?
-      logged_organizations_sql = observed_user.organizations.with_visibility(%w(common limited)).to_sql
-      privacy_organizations_sql = observed_user.organizations.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).to_sql
-      @organizations = Organization.from("( #{ logged_organizations_sql } UNION #{ privacy_organizations_sql } ) AS users")
-    else
-      @organizations = observed_user.organizations.with_visibility("common")
-    end
-
-    @organizations = @organizations.ransack(login_cont: params[:search]).result if params[:search].present?
-    @organizations = @organizations.includes(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}")
-    @organizations = kaminari_paginate(@organizations)
-  end
-
-  private
-  def sort_by
-    params.fetch(:sort_by, "created_at")
-  end
-
-  def sort_direction
-    params.fetch(:sort_direction, "desc")
-  end
-end
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -2,9 +2,9 @@ class UsersController < ApplicationController
  include ApplicationHelper
  include Ci::DbConnectable

-  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard]
-  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard]
-  before_action :require_login, only: %i[me list sync_user_info]
+  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users]
+  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users]
+  before_action :require_login, only: %i[me list]
  before_action :connect_to_ci_db, only: [:get_user_info]
  skip_before_action :check_sign, only: [:attachment_show]

@ -31,7 +31,6 @@ class UsersController < ApplicationController
      #用户的组织数量
      # @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_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? @user.projects : @user.projects.visible
      @projects_common_count = user_projects.common.size
      @projects_mirrior_count = user_projects.mirror.size
@ -56,9 +55,6 @@ class UsersController < ApplicationController
    @watchers = paginate(watchers)
  end

-  def hovercard
-  end
-
  def update
    @user = User.find params[:id]
    @user.update!(user_params)
@ -236,26 +232,6 @@ class UsersController < ApplicationController
    render_ok
  end

-  def sync_user_info
-    user = User.find_by_login params[:login]
-    return render_forbidden unless user === current_user
-
-    sync_params = {
-      email: params[:email],
-      password: params[:password]
-    }
-
-    Users::UpdateInfoForm.new(sync_params.merge(login: params[:login])).validate!
-
-    interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
-    if interactor.success?
-      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_EDIT_INFO)
-      render_ok
-    else
-      render_error(interactor.error)
-    end
-  end
-
  private
  def load_user
    @user = User.find_by_login(params[:id]) || User.find_by(id: params[:id])
--- a/app/controllers/version_releases_controller.rb
+++ b/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, :created_at).includes(:attachments)
+    @forge_releases = @repository.version_releases.select(:id,:version_gid).includes(:attachments)
  end

  def new
@ -124,7 +124,7 @@ class VersionReleasesController < ApplicationController

  private
  def set_user
-    @user = @repository.owner
+    @user = @repository.user
  end

  def find_version
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@ -5,7 +5,6 @@ class VersionsController < ApplicationController
  before_action :set_version, only: [:edit, :update, :destroy, :show,:update_status]

  def index
-    return render_not_found unless @project.has_menu_permission("versions")
    @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
    order_name = params[:order_name] || "created_on"
    order_type = params[:order_type] || "desc"
--- a/app/docs/slate/source/includes/_projects.md
+++ b/app/docs/slate/source/includes/_projects.md
@ -168,55 +168,6 @@ Remember — a happy kitten is an authenticated kitten!
 </aside>


-## 项目导航
-获取项目导航信息
-
-> 示例:
-
-```shell
-curl -X GET \
-http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
-```
-
-```javascript
-await octokit.request('GET /api/yystopf/ceshi/menu_list')
-```
-
-### HTTP 请求
-`GET api/:owner/:repo/menu_list`
-
-### 请求参数
-参数    | 必选 | 默认 | 类型 | 字段说明
--------- | ------- | ------- | -------- | ----------
-owner             |是| |string |用户登录名
-repo             |是| |string |项目标识identifier
-
-### 返回字段说明
-参数  | 类型 | 字段说明
--------- | ----------- | -----------
-menu_name     |string|导航名称， home:主页,code:代码库,issues:易修,pulls:合并请求,devops:工作流,versions:里程碑,activity:动态,setting:仓库设置
-
-
-> 返回的JSON示例:
-
-```json
-[
-    {
-        "menu_name": "home"
-    },
-    {
-        "menu_name": "code"
-    },
-    {
-        "menu_name": "pulls"
-    },
-    {
-        "menu_name": "activity"
-    }
-]
-```
-
-
 ## 项目主页
 获取项目主页信息

@ -261,84 +212,6 @@ attachments     |array|附件
 Remember — a happy kitten is an authenticated kitten!
 </aside>

-## 项目模块信息
-项目模块信息
-
-> 示例:
-
-```shell
-curl -X GET \
-http://localhost:3000/api/yystopf/ceshi/project_units.json
-```
-
-```javascript
-await octokit.request('GET /api/yystopf/ceshi/project_units')
-```
-
-### HTTP 请求
-`GET /api/yystopf/ceshi/project_units`
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
--------- | ----------- | -----------
-|type          |string|模块名称 |
-
-> 返回的JSON示例:
-
-```json
-[
-    {
-        "type": "code"
-    },
-    {
-        "type": "pulls"
-    },
-    {
-        "type": "issues"
-    }
-]
-```
-
-## 更改项目模块展示
-更改项目模块展示
-
-> 示例:
-
-```shell
-curl -X POST \
-H  "accept: application/json" \
-H  "Content-Type: application/json" \
-d "{ \"unit_typs\": [\"code\", \"pulls\"]}" \
-http://localhost:3000/api/yystopf/ceshi/project_units.json
-```
-
-```javascript
-await octokit.request('POST /api/yystopf/ceshi/project_units')
-```
-
-### HTTP 请求
-`POST /api/yystopf/ceshi/project_units`
-
-### 请求参数
-参数    | 必选 | 默认 | 类型 | 字段说明
--------- | ------- | ------- | -------- | ----------
-|unit_types |是| |array    | 项目模块内容， 支持以下参数:code:代码库,issues:易修,pulls:合并请求,devops:工作流,versions:里程碑 |
-
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
--------- | ----------- | -----------
-|status          |int|返回状态， 0: 表示操作成功 |
-|message         |string|返回信息说明|
-
-> 返回的JSON示例:
-
-```json
-{
-    "status": 0,
-    "message": "success"
-}
-```

 ## 创建项目
 创建项目
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@ -97,182 +97,6 @@ await octokit.request('GET /api/jasder/jasder_test/simple.json')
 }
 ```

-## 仓库详情(新版)
-仓库详情
-
-> 示例:
-
-```shell
-curl -X GET http://localhost:3000/api/yystopf/ceshi/detail.json
-```
-
-```javascript
-await octokit.request('GET /api/yystopf/ceshi/detail.json')
-```
-
-### HTTP 请求
-`GET /api/:owner/:repo/detail`
-
-### 请求参数:
-参数    | 必选 | 默认 | 类型 | 字段说明
--------- | ------- | ------- | -------- | ----------
-|owner             |是| |string |用户登录名  |
-|repo             |是| |string |项目标识identifier  |
-
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
--------- | ----------- | -----------
-|content                          |string   |仓库简介   |
-|website                          |string   |仓库网址   |
-|readme                           |string   |readme文件｜
-|identifier                       |string   |项目标识   |
-|name                             |string   |项目名称   |
-|issues_count                     |int      |项目issue数量|
-|pull_requests_count              |int      |项目合并请求数量|
-|project_identifier               |int      |项目标识|
-|praises_count                    |int      |项目点赞数量|
-|forked_count                     |int      |项目复刻数量|
-|watchers_count                   |int      |项目关注数量|
-|versions_count                   |int      |项目里程碑数量|
-|version_releases_count           |int      |项目发行版数量|
-|version_releasesed_count         |int      |项目发行版已发行数量|
-|permission                       |string   |项目权限|
-|mirror_url                       |string   |镜像地址|
-|mirror                           |bool     |是否为镜像项目|
-|type                             |int      |项目类型 0 普通项目 1 普通镜像项目 2 同步镜像项目|
-|open_devops                      |int      |是否开启devops|
-|watched                          |bool     |是否关注|
-|praised                          |bool     |是否点赞|
-|status                           |int      |项目状态|
-|forked_from_project_id           |int      |fork项目id|
-|fork_info                        |object   |fork项目信息|
-|size                             |string   |仓库大小|
-|ssh_url                          |string   |项目ssh地址|
-|clone_url                        |string   |项目克隆地址|
-|default_branch                   |string   |仓库默认分支|
-|empty                            |bool     |仓库是否为空|
-|full_name                        |string   |仓库全称|
-|private                          |bool     |仓库是否为私有项目|
-|license_name                     |string   |许可证名称|
-|release_versions.list.name       |string   |项目issue数量|
-|release_versions.list.tag_name   |string   |发行版标签名称|
-|release_versions.list.created_at |string   |发行版创建时间|
-|release_versions.total_count  |int         |发行版数量|
-|branches.list.name            |string      |分支名称|
-|branches.total_count          |int         |分支数量|
-|tags.list.name                |string      |标签名称|
-|tags.total_count              |int         |标签数量|
-|contributors.list.contributions|int        |贡献数量|
-|contributors.list.login       |string      |贡献者登录名|
-|contributors.list.name        |string      |贡献者用户名称|
-|contributors.list.image_url   |string      |贡献者头像|
-|languages                     |object      |项目语言占比|
-
-> 返回的JSON示例:
-
-```json
-{
-    "content": "仓库简介",
-    "website": "仓库网址",
-    "readme": {
-        "type": "file",
-        "encoding": "base64",
-        "size": 9,
-        "name": "README.md",
-        "path": "README.md",
-        "content": "# ceshi\n\n",
-        "sha": ""
-    },
-    "identifier": "ceshi",
-    "name": "测试项目",
-    "project_id": 2,
-    "repo_id": 2,
-    "issues_count": 0,
-    "pull_requests_count": 0,
-    "project_identifier": "ceshi",
-    "praises_count": 0,
-    "forked_count": 0,
-    "watchers_count": 0,
-    "versions_count": 0,
-    "version_releases_count": 0,
-    "version_releasesed_count": 0,
-    "permission": "Reporter",
-    "mirror_url": null,
-    "mirror": false,
-    "type": 0,
-    "open_devops": false,
-    "watched": false,
-    "praised": false,
-    "status": 1,
-    "forked_from_project_id": 1,
-    "fork_info": {
-        "fork_form_name": "测试项目",
-        "fork_project_user_login": "ceshi_org",
-        "fork_project_identifier": "ceshi",
-        "fork_project_user_name": "ceshi_org"
-    },
-    "size": "25.0 KB",
-    "ssh_url": "virus@localhost:yystopf/ceshi.git",
-    "clone_url": "http://localhost:10080/yystopf/ceshi.git",
-    "default_branch": "master",
-    "empty": false,
-    "full_name": "yystopf/ceshi",
-    "private": false,
-    "license_name": "gnu-javamail-exception",
-    "release_versions": {
-        "list": [
-            {
-                "id": 2,
-                "name": "vvvv",
-                "tag_name": "v1.1",
-                "created_at": "2019-07-18 10:16"
-            }
-        ],
-        "total_count": 1
-    },
-    "branches": {
-        "list": [
-            {
-                "name": "master"
-            }
-        ],
-        "total_count": 1
-    },
-    "tags": {
-        "list": [
-            {
-                "name": "v1.1"
-            },
-            {
-                "name": "v1.0"
-            }
-        ],
-        "total_count": 2
-    },
-    "contributors": {
-        "list": [
-            {
-                "contributions": 1,
-                "gid": 2,
-                "login": "yystopf",
-                "type": "User",
-                "name": "yystopf",
-                "image_url": "avatars/User/b"
-            }
-        ],
-        "total_count": 1
-    },
-    "languages": {
-        "HTML": "50.9%",
-        "Ruby": "25.6%",
-        "JavaScript": "21.4%",
-        "CSS": "1.3%",
-        "CoffeeScript": "0.7%",
-        "Shell": "0.1%"
-    }
-}
-```

 ## 编辑仓库信息
 编辑仓库信息
@ -639,78 +463,6 @@ await octokit.request('GET /api/jasder/jasder_test/collaborators.json')
  Success Data.
 </aside>

-## 获取仓库所有文件
-获取仓库所有文件
-
-> 示例:
-
-```shell
-curl -X GET \
-d "ref=develop" \
-http://localhost:3000/api/yystopf/ceshi/files.json
-```
-
-```javascript
-await octokit.request('GET /api/yystopf/ceshi/files.json')
-```
-
-### HTTP 请求
-`GET /api/:owner/:repo/files`
-
-### 请求参数:
-参数    | 必选 | 默认 | 类型 | 字段说明
--------- | ------- | ------- | -------- | ----------
-|owner    |是|      |string |用户登录名  |
-|repo     |是|      |string |项目标识identifier  |
-|search   |否|      |string |文件搜索关键词  |
-|ref      |是|      |string |分支名，默认为仓库默认分支  |
-
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
--------- | ----------- | -----------
-|name     |string       |文件名称|
-|path     |string       |文件路径|
-|sha      |string       |文件标识|
-|type     |string       |文件类型|
-|size     |int          |文件大小|
-|url      |string       |文件地址|
-
-
-> 返回的JSON示例:
-
-```json
-[
-    {
-        "name": ".gitignore",
-        "path": ".gitignore",
-        "sha": "f83922d01ae60f6e637a1a2b9f08871b4f87dfc8",
-        "type": "file",
-        "size": 63,
-        "url": "http://localhost:10080/api/v1/repos/yystopf/ceshi/contents/.gitignore?ref=master",
-        "html_url": "http://localhost:10080/yystopf/ceshi/src/branch/master/.gitignore"
-    },
-    {
-        "name": "LICENSE",
-        "path": "LICENSE",
-        "sha": "8f3b9ab0d08afd3a624d822e3971a2f42b3bc2b9",
-        "type": "file",
-        "size": 341,
-        "url": "http://localhost:10080/api/v1/repos/yystopf/ceshi/contents/LICENSE?ref=master",
-        "html_url": "http://localhost:10080/yystopf/ceshi/src/branch/master/LICENSE"
-    },
-    {
-        "name": "README.md",
-        "path": "README.md",
-        "sha": "1bc8a60ac6ddc876ebc4b60fc68991435bfad93e",
-        "type": "file",
-        "size": 9,
-        "url": "http://localhost:10080/api/v1/repos/yystopf/ceshi/contents/README.md?ref=master",
-        "html_url": "http://localhost:10080/yystopf/ceshi/src/branch/master/README.md"
-    }
-]
-```
-

 ## 获取仓库代码目录
 获取仓库代码目录
--- a/app/forms/organizations/create_form.rb
+++ b/app/forms/organizations/create_form.rb
@ -1,8 +0,0 @@
-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, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
-
-end
--- a/app/forms/organizations/create_team_form.rb
+++ b/app/forms/organizations/create_team_form.rb
@ -1,8 +0,0 @@
-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, :authorize, presence: true
-  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
-
-end
--- a/app/forms/projects/create_form.rb
+++ b/app/forms/projects/create_form.rb
@ -1,13 +1,13 @@
 class Projects::CreateForm < BaseForm
  REPOSITORY_NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
  attr_accessor :user_id, :name, :description, :repository_name, :project_category_id,
-                :project_language_id, :ignore_id, :license_id, :private, :owner
+                :project_language_id, :ignore_id, :license_id, :private

  validates :user_id, :name, :description,:repository_name,
            :project_category_id, :project_language_id, presence: true
  validates :repository_name, format: { with: REPOSITORY_NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }

-  validate :check_ignore, :check_license, :check_owner, :check_max_repo_creation
+  validate :check_ignore, :check_license
  validate do
    check_project_category(project_category_id)
    check_project_language(project_language_id)
@ -20,15 +20,4 @@ class Projects::CreateForm < BaseForm
  def check_ignore
    raise "ignore_id值无效." if ignore_id && Ignore.find_by(id: ignore_id).blank?
  end
-
-  def check_owner
-    @owner = Owner.find_by(id: user_id)
-    raise "user_id值无效." if user_id && owner.blank?
-  end
-
-  def check_max_repo_creation
-    return unless owner.is_a?(Organization)
-    return if owner.max_repo_creation <= -1
-    raise "已超过组织设置最大仓库数" if owner.max_repo_creation == owner.num_projects
-  end
 end
--- a/app/forms/projects/migrate_form.rb
+++ b/app/forms/projects/migrate_form.rb
@ -2,7 +2,7 @@ class Projects::MigrateForm < BaseForm
  REPOSITORY_NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
  URL_REGEX = /\A(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?\z/i

-  attr_accessor :user_id, :name, :description, :repository_name, :project_category_id, :project_language_id, :clone_addr, :private, :is_mirror, :auth_username, :auth_password, :owner
+  attr_accessor :user_id, :name, :description, :repository_name, :project_category_id, :project_language_id, :clone_addr, :private, :is_mirror, :auth_username, :auth_password

  validates :user_id, :name, :description,:repository_name, :project_category_id, :project_language_id, presence: true
  validates :repository_name, format: { with: REPOSITORY_NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
@ -12,18 +12,6 @@ class Projects::MigrateForm < BaseForm
    check_repository_name(user_id, repository_name) unless repository_name.blank?
    check_project_category(project_category_id)
    check_project_language(project_language_id)
-    check_owner
-    check_max_repo_creation
  end

-  def check_owner
-    @owner = Owner.find_by(id: user_id)
-    raise "user_id值无效." if user_id && owner.blank?
-  end
-
-  def check_max_repo_creation
-    return unless owner.is_a?(Organization)
-    return if owner.max_repo_creation <= -1
-    raise "已超过组织设置最大仓库数" if owner.max_repo_creation == owner.num_projects
-  end
 end
--- a/app/forms/users/update_info_form.rb
+++ b/app/forms/users/update_info_form.rb
@ -1,9 +0,0 @@
-class Users::UpdateInfoForm
-  include ActiveModel::Model
-
-  attr_accessor :email, :password, :login
-
-  validates :email, presence: true, format: { with: CustomRegexp::EMAIL }
-  validates :password, presence: true
-  validates :login, presence: true
-end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -35,6 +35,12 @@ 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)
@ -137,13 +143,18 @@ module ApplicationHelper
  def url_to_avatar(source)
    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("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+      if source.class.to_s == 'User'
+        File.join(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'
-      source.get_letter_avatar_url
+      str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
+      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

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@ -1,9 +1,4 @@
 module ProjectsHelper
-  def menu_hash_by_name(name)
-    {
-      menu_name: name
-    }
-  end

  def render_zh_project_type(project_type)
    case project_type
@ -66,14 +61,12 @@ module ProjectsHelper
      {
        login: project.project_educoder.owner,
        name: project.project_educoder.owner,
-        type: 'Educoder',
        image_url: project.project_educoder.image_url
      }
    else
      {
        login: @owner.login,
        name: @owner.real_name,
-        type: @owner.type,
        image_url: url_to_avatar(@owner)
      }
    end
@ -90,4 +83,8 @@ 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
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@ -1,6 +1,7 @@
 module RepositoriesHelper
  def render_permission(user, project)
    return "Admin" if user&.admin?
+    return "Owner" if user === project.owner
    project.get_premission(user)
  end

@ -27,43 +28,39 @@ module RepositoriesHelper

  def render_commit_author(author_json)
    return nil if author_json.blank?
-    find_user_by_login author_json['name']
+    find_user_by_login author_json['login']
  end

  def readme_render_decode64_content(str, path)
    return nil if str.blank?
-    begin
-      content = Base64.decode64(str).force_encoding('UTF-8')
+    content = Base64.decode64(str).force_encoding('UTF-8')

-      c_regex = /\!\[.*?\]\((.*?)\)/
-      src_regex = /src=\"(.*?)\"/
-      ss = content.to_s.scan(c_regex)
-      ss_src = content.to_s.scan(src_regex)
-      total_images = ss + ss_src
-      if total_images.length > 0
-        total_images.each do |s|
-          image_title = /\"(.*?)\"/
-          r_content = s[0]
-          remove_title = r_content.to_s.scan(image_title)
-          if remove_title.length > 0
-            r_content = r_content.gsub(/#{remove_title[0]}/, "").strip
-          end
-          if r_content.include?("?")
-            new_r_content = r_content + "&raw=true"
-          else
-            new_r_content = r_content + "?raw=true"
-          end
-          unless r_content.include?("http://") || r_content.include?("https://") || r_content.include?("mailto:")
-            new_r_content = "#{path}" + new_r_content
-          end
-          content = content.gsub(/#{r_content}/, new_r_content)
+    c_regex = /\!\[.*?\]\((.*?)\)/
+    src_regex = /src=\"(.*?)\"/
+    ss = content.to_s.scan(c_regex)
+    ss_src = content.to_s.scan(src_regex)
+    total_images = ss + ss_src
+    if total_images.length > 0
+      total_images.each do |s|
+        image_title = /\"(.*?)\"/
+        r_content = s[0]
+        remove_title = r_content.to_s.scan(image_title)
+        if remove_title.length > 0
+          r_content = r_content.gsub(/#{remove_title[0]}/, "").strip
        end
+        if r_content.include?("?")
+          new_r_content = r_content + "&raw=true"
+        else
+          new_r_content = r_content + "?raw=true"
+        end
+        unless r_content.include?("http://") || r_content.include?("https://") || r_content.include?("mailto:")
+          new_r_content = "#{path}" + new_r_content
+        end
+        content = content.gsub(/#{r_content}/, new_r_content)
      end
-  
-      return content
-    rescue
-      return str
    end
+
+    return content
  end

  # unix_time values for example: 1604382982
--- a/app/jobs/sync_mirrored_repository_job.rb
+++ b/app/jobs/sync_mirrored_repository_job.rb
@ -5,7 +5,7 @@ class SyncMirroredRepositoryJob < ApplicationJob
    repo = Repository.find_by(id: repo_id)
    current_user = User.find_by(id: user_id)
    return if repo.blank? || current_user.blank?
-    result = Gitea::Repository::SyncMirroredService.new(repo.owner.login, repo.identifier, token: current_user.gitea_token).call
+    result = Gitea::Repository::SyncMirroredService.new(repo.user.login, repo.identifier, token: current_user.gitea_token).call
    repo&.mirror.set_status! if result[:status] === 200
  end
 end
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@ -17,7 +17,7 @@
 #  disk_directory            :string(255)
 #  attachtype                :integer          default("1")
 #  is_public                 :integer          default("1")
-#  copy_from                 :string(255)
+#  copy_from                 :integer
 #  quotes                    :integer          default("0")
 #  is_publish                :integer          default("1")
 #  publish_time              :datetime
@ -26,15 +26,15 @@
 #  cloud_url                 :string(255)      default("")
 #  course_second_category_id :integer          default("0")
 #  delay_publish             :boolean          default("0")
-#  link                      :string(255)
-#  clone_id                  :integer
 #
 # Indexes
 #
 #  index_attachments_on_author_id                        (author_id)
-#  index_attachments_on_clone_id                         (clone_id)
 #  index_attachments_on_container_id_and_container_type  (container_id,container_type)
+#  index_attachments_on_course_second_category_id        (course_second_category_id)
 #  index_attachments_on_created_on                       (created_on)
+#  index_attachments_on_is_public                        (is_public)
+#  index_attachments_on_quotes                           (quotes)
 #

 class Attachment < ApplicationRecord
--- a/app/models/chart_rule.rb
+++ b/app/models/chart_rule.rb
@ -1,21 +1,3 @@
-# == Schema Information
-#
-# Table name: chart_rules
-#
-#  id                   :integer          not null, primary key
-#  rule_type            :string(255)
-#  content              :text(65535)
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
-#  competition_id       :integer
-#  competition_stage_id :integer
-#
-# Indexes
-#
-#  index_chart_rules_on_competition_id        (competition_id)
-#  index_chart_rules_on_competition_stage_id  (competition_stage_id)
-#
-
 class ChartRule < ApplicationRecord

  validates :content, length: { maximum: 1000, too_long: "不能超过1000个字符" }
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@ -1,22 +1,3 @@
-# == Schema Information
-#
-# Table name: stages
-#
-#  id            :integer          not null
-#  subject_id    :integer
-#  name          :string(255)
-#  description   :text(65535)
-#  user_id       :integer
-#  position      :integer
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
-#  shixuns_count :integer          default("0")
-#
-# Indexes
-#
-#  index_stages_on_subject_id  (subject_id)
-#
-
 class Ci::Stage < Ci::RemoteBase
  self.primary_key = 'stage_id'

--- a/app/models/ci/user.rb
+++ b/app/models/ci/user.rb
@ -39,14 +39,13 @@
 #  business                   :boolean          default("0")
 #  profile_completed          :boolean          default("0")
 #  laboratory_id              :integer
-#  is_shixun_marker           :boolean          default("0")
-#  admin_visitable            :boolean          default("0")
-#  collaborator               :boolean          default("0")
+#  platform                   :string(255)      default("0")
+#  gitea_token                :string(255)
 #  gitea_uid                  :integer
+#  is_shixun_marker           :boolean          default("0")
 #  is_sync_pwd                :boolean          default("1")
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
-#  gitea_token                :string(255)
 #
 # Indexes
 #
@ -54,9 +53,8 @@
 #  index_users_on_homepage_engineer  (homepage_engineer)
 #  index_users_on_homepage_teacher   (homepage_teacher)
 #  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login) UNIQUE
-#  index_users_on_mail               (mail) UNIQUE
-#  index_users_on_phone              (phone) UNIQUE
+#  index_users_on_login              (login)
+#  index_users_on_mail               (mail)
 #  index_users_on_type               (type)
 #

--- a/app/models/concerns/.keep
+++ b/app/models/concerns/.keep
--- a/app/models/concerns/project_operable.rb
+++ b/app/models/concerns/project_operable.rb
@ -8,12 +8,11 @@ module ProjectOperable
    has_many :developers,           -> { joins(:roles).where(roles: { name: 'Developer' }) }, class_name: 'Member'
    has_many :reporters,            -> { joins(:roles).where(roles: { name: 'Reporter' }) }, class_name: 'Member'
    has_many :writable_members,     -> { joins(:roles).where.not(roles: {name: 'Reporter'}) }, class_name: 'Member'
-    has_many :team_projects, dependent: :destroy
  end

  def add_member!(user_id, role_name='Developer')
    member = members.create!(user_id: user_id)
-    set_developer_role(member, role_name)
+    set_developer_role(member)
  end

  def remove_member!(user_id)
@ -22,13 +21,7 @@ module ProjectOperable
  end

  def member?(user_id)
-    if owner.is_a?(User)
-      members.exists?(user_id: user_id)
-    elsif owner.is_a?(Organization)
-      members.exists?(user_id: user_id) || team_projects.joins(team: :team_users).where(team_users: {user_id: user_id}).present?
-    else
-      false
-    end
+    members.exists?(user_id: user_id)
  end

  # 除了项目创建者本身
@ -42,54 +35,27 @@ module ProjectOperable
  end

  def owner?(user)
-    if owner.is_a?(User)
-      self.owner == user
-    elsif owner.is_a?(Organization)
-      owner.is_owner?(user.id)
-    else
-      false
-    end
+    self.owner == user
  end

  # 项目管理员(包含项目拥有者)，权限：仓库设置、仓库可读可写
  def manager?(user)
-    if owner.is_a?(User)
-      managers.exists?(user_id: user.id)
-    elsif owner.is_a?(Organization)
-      managers.exists?(user_id: user.id) || owner.is_admin?(user.id)
-    else
-      false
-    end
+    managers.exists?(user_id: user.id)
  end

  # 项目开发者，可读可写权限
  def develper?(user)
-    if owner.is_a?(User)
-      developers.exists?(user_id: user.id)
-    elsif owner.is_a?(Organization)
-      developers.exists?(user_id: user.id) || owner.is_write?(user.id)
-    else
-      false
-    end
+    developers.exists?(user_id: user.id)
  end

  # 报告者，只有可读权限
  def reporter?(user)
-    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)
-    else
-      false
-    end
+    reporters.exists?(user_id: user.id)
  end

-  def set_developer_role(member, role_name)
-    role = Role.find_by(name: role_name)
+  def set_developer_role(member)
+    role = Role.find_by_name 'Developer'
    member.member_roles.create!(role: role)
  end

-  def has_menu_permission(unit_type)
-    self.project_units.where(unit_type: unit_type).exists?
-  end
 end
--- a/app/models/concerns/watchable.rb
+++ b/app/models/concerns/watchable.rb
@ -6,7 +6,6 @@ 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)
@ -22,24 +21,6 @@ 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
--- a/app/models/discuss.rb
+++ b/app/models/discuss.rb
@ -1,38 +1,3 @@
-# == Schema Information
-#
-# Table name: discusses
-#
-#  id              :integer          not null, primary key
-#  user_id         :integer
-#  dis_type        :string(255)
-#  dis_id          :integer
-#  content         :text(65535)
-#  parent_id       :integer
-#  root_id         :integer
-#  praise_count    :integer
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  challenge_id    :integer
-#  reward          :integer
-#  hidden          :boolean          default("0")
-#  last_reply_id   :integer
-#  position        :integer
-#  praises_count   :integer          default("0")
-#  sticky          :boolean          default("0")
-#  course_sticky   :boolean          default("0")
-#  course_hidden   :boolean          default("0")
-#  copy_message_id :integer
-#
-# Indexes
-#
-#  index_discusses_on_challenge_id         (challenge_id)
-#  index_discusses_on_copy_message_id      (copy_message_id)
-#  index_discusses_on_course_hidden        (course_hidden)
-#  index_discusses_on_course_sticky        (course_sticky)
-#  index_discusses_on_dis_id_and_dis_type  (dis_id,dis_type)
-#  index_discusses_on_user_id              (user_id)
-#
-
 class Discuss < ApplicationRecord
  default_scope { order(created_at: :desc) }

--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@ -1,24 +1,5 @@
-# == Schema Information
-#
-# Table name: forge_activities
-#
-#  id             :integer          not null, primary key
-#  user_id        :integer
-#  project_id     :integer
-#  forge_act_id   :integer
-#  forge_act_type :string(255)
-#  org_id         :integer
-#  created_at     :datetime         not null
-#  updated_at     :datetime         not null
-#
-# Indexes
-#
-#  forge_act_index                         (project_id,forge_act_id,created_at,forge_act_type)
-#  index_forge_activities_on_forge_act_id  (forge_act_id)
-#
-
 class ForgeActivity < ApplicationRecord
  belongs_to :user
  belongs_to :project
  belongs_to :forge_act, polymorphic: true
-end
+end
--- a/app/models/help.rb
+++ b/app/models/help.rb
@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: helps
-#
-#  id          :integer          not null, primary key
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  about_us    :text(65535)
-#  agreement   :text(65535)
-#  status      :text(65535)
-#  help_center :text(65535)
-#  join_us     :text(65535)
-#
-
 class Help < ApplicationRecord

-end
+end
--- a/app/models/laboratory.rb
+++ b/app/models/laboratory.rb
@ -10,12 +10,6 @@
 #  sync_course  :boolean          default("0")
 #  sync_subject :boolean          default("0")
 #  sync_shixun  :boolean          default("0")
-#  is_local     :boolean          default("0")
-#
-# Indexes
-#
-#  index_laboratories_on_identifier  (identifier) UNIQUE
-#  index_laboratories_on_school_id   (school_id)
 #

 class Laboratory < ApplicationRecord
--- a/app/models/laboratory_setting.rb
+++ b/app/models/laboratory_setting.rb
@ -6,10 +6,6 @@
 #  laboratory_id :integer
 #  config        :text(65535)
 #
-# Indexes
-#
-#  index_laboratory_settings_on_laboratory_id  (laboratory_id)
-#

 class LaboratorySetting < ApplicationRecord
  belongs_to :laboratory
--- a/app/models/license.rb
+++ b/app/models/license.rb
@ -7,6 +7,7 @@
 #  content    :text(65535)
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  is_secret  :boolean          default("0")
 #

 class License < ApplicationRecord
--- a/app/models/live_link.rb
+++ b/app/models/live_link.rb
@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: live_links
-#
-#  id          :integer          not null, primary key
-#  course_id   :integer
-#  user_id     :integer
-#  url         :string(255)
-#  description :text(65535)
-#  on_status   :boolean          default("0")
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  course_name :string(255)
-#  platform    :string(255)
-#  live_time   :datetime
-#  duration    :integer
-#  position    :integer
-#
-# Indexes
-#
-#  index_live_links_on_course_id  (course_id)
-#  index_live_links_on_user_id    (user_id)
-#
-
 class LiveLink < ApplicationRecord
  # belongs_to :course
  belongs_to :user
--- a/app/models/member.rb
+++ b/app/models/member.rb
@ -11,6 +11,7 @@
 #  course_group_id     :integer          default("0")
 #  is_collect          :integer          default("1")
 #  graduation_group_id :integer          default("0")
+#  is_apply_signature  :boolean          default("0")
 #
 # Indexes
 #
--- a/app/models/message_detail.rb
+++ b/app/models/message_detail.rb
@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: message_details
-#
-#  id         :integer          not null, primary key
-#  content    :text(4294967295)
-#  message_id :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#
-# Indexes
-#
-#  index_message_details_on_message_id  (message_id)
-#
-
 class MessageDetail < ApplicationRecord
  # belongs_to :message, :touch => true
  validates :content, length: { maximum: 10000, too_long: "内容不能超过10000个字符" }
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@ -1,131 +0,0 @@
-# == Schema Information
-#
-# Table name: users
-#
-#  id                         :integer          not null, primary key
-#  login                      :string(255)      default(""), not null
-#  hashed_password            :string(40)       default(""), not null
-#  firstname                  :string(30)       default(""), not null
-#  lastname                   :string(255)      default(""), not null
-#  mail                       :string(60)
-#  admin                      :boolean          default("0"), not null
-#  status                     :integer          default("1"), not null
-#  last_login_on              :datetime
-#  language                   :string(5)        default("")
-#  auth_source_id             :integer
-#  created_on                 :datetime
-#  updated_on                 :datetime
-#  type                       :string(255)
-#  identity_url               :string(255)
-#  mail_notification          :string(255)      default(""), not null
-#  salt                       :string(64)
-#  gid                        :integer
-#  visits                     :integer          default("0")
-#  excellent_teacher          :integer          default("0")
-#  excellent_student          :integer          default("0")
-#  phone                      :string(255)
-#  authentication             :boolean          default("0")
-#  grade                      :integer          default("0")
-#  experience                 :integer          default("0")
-#  nickname                   :string(255)
-#  show_realname              :boolean          default("1")
-#  professional_certification :boolean          default("0")
-#  ID_number                  :string(255)
-#  certification              :integer          default("0")
-#  homepage_teacher           :boolean          default("0")
-#  homepage_engineer          :boolean          default("0")
-#  is_test                    :integer          default("0")
-#  ecoder_user_id             :integer          default("0")
-#  business                   :boolean          default("0")
-#  profile_completed          :boolean          default("0")
-#  laboratory_id              :integer
-#  is_shixun_marker           :boolean          default("0")
-#  admin_visitable            :boolean          default("0")
-#  collaborator               :boolean          default("0")
-#  gitea_uid                  :integer
-#  is_sync_pwd                :boolean          default("1")
-#  watchers_count             :integer          default("0")
-#  devops_step                :integer          default("0")
-#  gitea_token                :string(255)
-#
-# Indexes
-#
-#  index_users_on_ecoder_user_id     (ecoder_user_id)
-#  index_users_on_homepage_engineer  (homepage_engineer)
-#  index_users_on_homepage_teacher   (homepage_teacher)
-#  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login) UNIQUE
-#  index_users_on_mail               (mail) UNIQUE
-#  index_users_on_phone              (phone) UNIQUE
-#  index_users_on_type               (type)
-#
-
-class Organization < Owner
-  alias_attribute :name, :login
-  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
-
-  default_scope { where(type: "Organization") }
-
-  has_one :organization_extension, dependent: :destroy
-  has_many :teams, dependent: :destroy
-  has_many :organization_users, dependent: :destroy
-  has_many :team_users, dependent: :destroy
-
-  validates :login, presence: true
-  validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false
-  validates :login, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
-
-  delegate :description, :website, :location, :repo_admin_change_team_access,
-           :visibility, :max_repo_creation, :num_projects, :num_users, :num_teams, to: :organization_extension, allow_nil: true
-
-  scope :with_visibility, ->(visibility) { joins(:organization_extension).where(organization_extensions: {visibility: visibility}) if visibility.present? }
-
-  def self.build(name, nickname, gitea_token=nil)
-    self.create!(login: name, nickname: nickname, gitea_token: gitea_token)
-  end
-
-  def can_create_project?(user_id)
-    team_users.joins(:team).where(user_id: user_id, teams: {can_create_org_project: true}).present?
-  end
-
-  def is_member?(user_id)
-    organization_users.where(user_id: user_id).present?
-  end
-
-  def is_owner?(user_id)
-    team_users.joins(:team).where(user_id: user_id, teams: {authorize: %w(owner)}).present?
-  end
-
-  def is_admin?(user_id)
-    team_users.joins(:team).where(user_id: user_id, teams: {authorize: %w(admin owner)}).present?
-  end
-
-  def is_write?(user_id)
-    team_users.joins(:team).where(user_id: user_id, teams: {authorize: %w(write admin owner)}).present?
-  end
-
-  def is_read?(user_id)
-    team_users.joins(:team).where(user_id: user_id, teams: {authorize: %w(read write admin owner)}).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 real_name
-    name = lastname + firstname
-    name = name.blank? ? (nickname.blank? ? login : nickname) : name
-    name.gsub(/\s+/, '').strip    #6.11 -hs
-  end
-
-  def show_real_name
-    name = lastname + firstname
-    if name.blank?
-      nickname.blank? ? login : nickname
-    else
-      name
-    end
-  end
-end
--- a/app/models/organization_extension.rb
+++ b/app/models/organization_extension.rb
@ -1,42 +0,0 @@
-# == Schema Information
-#
-# Table name: organization_extensions
-#
-#  id                            :integer          not null, primary key
-#  organization_id               :integer
-#  description                   :string(255)
-#  website                       :string(255)
-#  location                      :string(255)
-#  repo_admin_change_team_access :boolean          default("0")
-#  visibility                    :integer          default("0")
-#  max_repo_creation             :integer          default("-1")
-#  created_at                    :datetime         not null
-#  updated_at                    :datetime         not null
-#  num_projects                  :integer          default("0")
-#  num_users                     :integer          default("0")
-#  num_teams                     :integer          default("0")
-#
-# Indexes
-#
-#  index_organization_extensions_on_organization_id  (organization_id)
-#
-
-class OrganizationExtension < ApplicationRecord
-
-  belongs_to :organization
-  has_many :organization_users, foreign_key: :organization_id, primary_key: :organization_id
-  has_many :projects, foreign_key: :user_id, primary_key: :organization_id
-  has_many :teams, foreign_key: :organization_id, primary_key: :organization_id
-
-  enum visibility: {common: 0, limited: 1, privacy: 2}
-
-  def self.build(organization_id, description, website, location, repo_admin_change_team_access, visibility, max_repo_creation)
-    self.create!(organization_id: organization_id,
-                 description: description,
-                 website: website,
-                 location: location,
-                 repo_admin_change_team_access: repo_admin_change_team_access,
-                 visibility: visibility,
-                 max_repo_creation: max_repo_creation)
-  end
-end
--- a/app/models/organization_user.rb
+++ b/app/models/organization_user.rb
@ -1,34 +0,0 @@
-# == Schema Information
-#
-# Table name: organization_users
-#
-#  id              :integer          not null, primary key
-#  user_id         :integer
-#  organization_id :integer
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#
-# Indexes
-#
-#  index_organization_users_on_organization_id  (organization_id)
-#  index_organization_users_on_user_id          (user_id)
-#
-
-class OrganizationUser < ApplicationRecord
-
-  belongs_to :organization
-  belongs_to :organization_extension, foreign_key: :organization_id, primary_key: :organization_id, counter_cache: :num_users
-  belongs_to :user
-
-  validates :user_id, uniqueness: {scope: :organization_id}
-
-  def self.build(organization_id, user_id)
-    org_user = self.find_by(organization_id: organization_id, user_id: user_id)
-    return org_user unless org_user.nil?
-    self.create!(organization_id: organization_id, user_id: user_id)
-  end
-
-  def teams
-    organization.teams.joins(:team_users).where(team_users: {user_id: user_id})
-  end
-end
--- a/app/models/owner.rb
+++ b/app/models/owner.rb
@ -1,69 +0,0 @@
-# == Schema Information
-#
-# Table name: users
-#
-#  id                         :integer          not null, primary key
-#  login                      :string(255)      default(""), not null
-#  hashed_password            :string(40)       default(""), not null
-#  firstname                  :string(30)       default(""), not null
-#  lastname                   :string(255)      default(""), not null
-#  mail                       :string(60)
-#  admin                      :boolean          default("0"), not null
-#  status                     :integer          default("1"), not null
-#  last_login_on              :datetime
-#  language                   :string(5)        default("")
-#  auth_source_id             :integer
-#  created_on                 :datetime
-#  updated_on                 :datetime
-#  type                       :string(255)
-#  identity_url               :string(255)
-#  mail_notification          :string(255)      default(""), not null
-#  salt                       :string(64)
-#  gid                        :integer
-#  visits                     :integer          default("0")
-#  excellent_teacher          :integer          default("0")
-#  excellent_student          :integer          default("0")
-#  phone                      :string(255)
-#  authentication             :boolean          default("0")
-#  grade                      :integer          default("0")
-#  experience                 :integer          default("0")
-#  nickname                   :string(255)
-#  show_realname              :boolean          default("1")
-#  professional_certification :boolean          default("0")
-#  ID_number                  :string(255)
-#  certification              :integer          default("0")
-#  homepage_teacher           :boolean          default("0")
-#  homepage_engineer          :boolean          default("0")
-#  is_test                    :integer          default("0")
-#  ecoder_user_id             :integer          default("0")
-#  business                   :boolean          default("0")
-#  profile_completed          :boolean          default("0")
-#  laboratory_id              :integer
-#  platform                   :string(255)      default("0")
-#  gitea_token                :string(255)
-#  gitea_uid                  :integer
-#  is_shixun_marker           :boolean          default("0")
-#  is_sync_pwd                :boolean          default("1")
-#  watchers_count             :integer          default("0")
-#  devops_step                :integer          default("0")
-#
-# Indexes
-#
-#  index_users_on_ecoder_user_id     (ecoder_user_id)
-#  index_users_on_homepage_engineer  (homepage_engineer)
-#  index_users_on_homepage_teacher   (homepage_teacher)
-#  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login)
-#  index_users_on_mail               (mail)
-#  index_users_on_type               (type)
-#
-
-class Owner < ApplicationRecord
-  self.abstract_class = true
-  self.table_name = "users"
-
-  include ProjectAbility
-
-  has_many :projects, foreign_key: :user_id, dependent: :destroy
-  has_many :repositories, foreign_key: :user_id, dependent: :destroy
-end
--- a/app/models/project.rb
+++ b/app/models/project.rb
@ -1,76 +1,73 @@
-# == Schema Information
-#
-# Table name: projects
-#
-#  id                     :integer          not null, primary key
-#  name                   :string(255)      default(""), not null
-#  description            :text(4294967295)
-#  homepage               :string(255)      default("")
-#  is_public              :boolean          default("1"), not null
-#  parent_id              :integer
-#  created_on             :datetime
-#  updated_on             :datetime
-#  identifier             :string(255)
-#  status                 :integer          default("1"), not null
-#  lft                    :integer
-#  rgt                    :integer
-#  inherit_members        :boolean          default("0"), not null
-#  project_type           :integer          default("0")
-#  hidden_repo            :boolean          default("0"), not null
-#  attachmenttype         :integer          default("1")
-#  user_id                :integer
-#  dts_test               :integer          default("0")
-#  enterprise_name        :string(255)
-#  organization_id        :integer
-#  project_new_type       :integer
-#  gpid                   :integer
-#  forked_from_project_id :integer
-#  forked_count           :integer          default("0")
-#  publish_resource       :integer          default("0")
-#  visits                 :integer          default("0")
-#  hot                    :integer          default("0")
-#  invite_code            :string(255)
-#  qrcode                 :string(255)
-#  qrcode_expiretime      :integer          default("0")
-#  script                 :text(65535)
-#  training_status        :integer          default("0")
-#  rep_identifier         :string(255)
-#  project_category_id    :integer
-#  project_language_id    :integer
-#  praises_count          :integer          default("0")
-#  watchers_count         :integer          default("0")
-#  issues_count           :integer          default("0")
-#  pull_requests_count    :integer          default("0")
-#  language               :string(255)
-#  versions_count         :integer          default("0")
-#  issue_tags_count       :integer          default("0")
-#  closed_issues_count    :integer          default("0")
-#  open_devops            :boolean          default("0")
-#  gitea_webhook_id       :integer
-#  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
-#
-#  index_projects_on_forked_from_project_id  (forked_from_project_id)
-#  index_projects_on_identifier              (identifier)
-#  index_projects_on_is_public               (is_public)
-#  index_projects_on_lft                     (lft)
-#  index_projects_on_name                    (name)
-#  index_projects_on_platform                (platform)
-#  index_projects_on_project_type            (project_type)
-#  index_projects_on_recommend               (recommend)
-#  index_projects_on_rgt                     (rgt)
-#  index_projects_on_status                  (status)
-#  index_projects_on_updated_on              (updated_on)
-#
-
+# == Schema Information
+#
+# Table name: projects
+#
+#  id                     :integer          not null, primary key
+#  name                   :string(255)      default(""), not null
+#  description            :text(4294967295)
+#  homepage               :string(255)      default("")
+#  is_public              :boolean          default("1"), not null
+#  parent_id              :integer
+#  created_on             :datetime
+#  updated_on             :datetime
+#  identifier             :string(255)
+#  status                 :integer          default("1"), not null
+#  lft                    :integer
+#  rgt                    :integer
+#  inherit_members        :boolean          default("0"), not null
+#  project_type           :integer          default("0")
+#  hidden_repo            :boolean          default("0"), not null
+#  attachmenttype         :integer          default("1")
+#  user_id                :integer
+#  dts_test               :integer          default("0")
+#  enterprise_name        :string(255)
+#  organization_id        :integer
+#  project_new_type       :integer
+#  gpid                   :integer
+#  forked_from_project_id :integer
+#  forked_count           :integer          default("0")
+#  publish_resource       :integer          default("0")
+#  visits                 :integer          default("0")
+#  hot                    :integer          default("0")
+#  invite_code            :string(255)
+#  qrcode                 :string(255)
+#  qrcode_expiretime      :integer          default("0")
+#  script                 :text(65535)
+#  training_status        :integer          default("0")
+#  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")
+#  pull_requests_count    :integer          default("0")
+#  language               :string(255)
+#  versions_count         :integer          default("0")
+#  issue_tags_count       :integer          default("0")
+#  closed_issues_count    :integer          default("0")
+#  open_devops            :boolean          default("0")
+#  gitea_webhook_id       :integer
+#  open_devops_count      :integer          default("0")
+#  recommend              :boolean          default("0")
+#  platform               :integer          default("0")
+#
+# Indexes
+#
+#  index_projects_on_forked_from_project_id  (forked_from_project_id)
+#  index_projects_on_identifier              (identifier)
+#  index_projects_on_is_public               (is_public)
+#  index_projects_on_lft                     (lft)
+#  index_projects_on_name                    (name)
+#  index_projects_on_platform                (platform)
+#  index_projects_on_project_type            (project_type)
+#  index_projects_on_recommend               (recommend)
+#  index_projects_on_rgt                     (rgt)
+#  index_projects_on_status                  (status)
+#  index_projects_on_updated_on              (updated_on)
+#
+
 class Project < ApplicationRecord
  include Matchable
  include Publicable
@ -88,8 +85,7 @@ class Project < ApplicationRecord

  belongs_to :ignore, optional: true
  belongs_to :license, optional: true
-  belongs_to :owner, class_name: 'Owner', foreign_key: :user_id, optional: true
-  belongs_to :organization_extension, foreign_key: :user_id, primary_key: :organization_id, optional: true, counter_cache: :num_projects
+  belongs_to :owner, class_name: 'User', foreign_key: :user_id, optional: true
  belongs_to :project_category, optional: true , :counter_cache => true
  belongs_to :project_language, optional: true , :counter_cache => true
  has_many :project_trends, dependent: :destroy
@ -110,16 +106,12 @@ class Project < ApplicationRecord
  has_many :praise_treads, as: :praise_tread_object, dependent: :destroy
  has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
  has_one :project_detail, dependent: :destroy
-  has_many :team_projects, dependent: :destroy
-  has_many :project_units, 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)}
  scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)}
  scope :recommend,           -> { visible.project_statics_select.where(recommend: true) }

-  delegate :content, to: :project_detail, allow_nil: true
-  delegate :name, to: :license, prefix: true, allow_nil: true


  def self.search_project(search)
@ -158,7 +150,6 @@ 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,
@ -240,12 +231,10 @@ class Project < ApplicationRecord
  end

  def get_premission user
-    return "Owner" if owner?(user)
-    return "Manager" if manager?(user)
-    return "Developer" if develper?(user)
-    return "Reporter" if reporter?(user)
+    permission = "Reporter"
+    member = members.find_by(user: user)

-    return ""
+    member&.roles&.last&.name || permission
  end

  def fork_project
@ -259,7 +248,7 @@ class Project < ApplicationRecord
  def self.find_with_namespace(namespace_path, identifier)
    logger.info "########namespace_path: #{namespace_path} ########identifier: #{identifier} "

-    user = Owner.find_by_login namespace_path
+    user = User.find_by_login namespace_path
    project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
    return nil if project.blank?

--- a/app/models/project_category.rb
+++ b/app/models/project_category.rb
@ -8,6 +8,11 @@
 #  projects_count :integer          default("0")
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
+#  ancestry       :string(255)
+#
+# Indexes
+#
+#  index_project_categories_on_ancestry  (ancestry)
 #

 class ProjectCategory < ApplicationRecord
--- a/app/models/project_unit.rb
+++ b/app/models/project_unit.rb
@ -1,35 +0,0 @@
-# == Schema Information
-#
-# Table name: project_units
-#
-#  id         :integer          not null, primary key
-#  project_id :integer
-#  unit_type  :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#
-# Indexes
-#
-#  index_project_units_on_project_id  (project_id)
-#
-
-class ProjectUnit < ApplicationRecord
-  belongs_to :project
-
-  enum unit_type: {code: 1, issues: 2, pulls: 3, devops: 4, versions: 5, resources: 6}
-
-  validates :unit_type, uniqueness: { scope: :project_id}
-
-  def self.init_types(project_id)
-    ProjectUnit::unit_types.each do |_, v|
-      self.create!(project_id: project_id, unit_type: v)
-    end
-  end
-
-  def self.update_by_unit_types!(project, types) 
-    project.project_units.where.not(unit_type: types).each(&:destroy!)
-    types.each do |type|
-      project.project_units.find_or_create_by!(unit_type: type)
-    end
-  end
-end
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@ -25,6 +25,7 @@
 #
 # Indexes
 #
+#  index_repositories_on_identifier  (identifier)
 #  index_repositories_on_project_id  (project_id)
 #  index_repositories_on_user_id     (user_id)
 #
@ -32,7 +33,7 @@
 class Repository < ApplicationRecord
  self.inheritance_column = nil # FIX  The single-table inheritance mechanism failed
  belongs_to :project, :touch => true
-  belongs_to :owner, class_name: 'Owner', foreign_key: :user_id, optional: true
+  belongs_to :user, optional: true
  has_one :mirror, foreign_key: :repo_id
  has_one :ci_cloud_account, class_name: 'Ci::CloudAccount', foreign_key: :repo_id
  has_many :version_releases, dependent: :destroy
@ -40,8 +41,6 @@ class Repository < ApplicationRecord

  validates :identifier, presence: true

-  delegate :default_branch, to: :project, allow_nil: true
-
  def to_param
    self.identifier.parameterize
  end
--- a/app/models/school.rb
+++ b/app/models/school.rb
@ -1,39 +1,3 @@
-# == Schema Information
-#
-# Table name: schools
-#
-#  id                 :integer          not null, primary key
-#  name               :string(255)
-#  province           :string(255)
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  logo_link          :string(255)
-#  pinyin             :string(255)
-#  school_type        :integer          default("0")
-#  city               :string(255)
-#  address            :string(255)
-#  auto_users_trial   :boolean          default("0")
-#  shool_code         :string(255)
-#  authorization_time :datetime
-#  ec_auth            :integer          default("0")
-#  identifier         :string(255)
-#  is_online          :boolean          default("0")
-#  video_name         :string(255)
-#  video_desc         :string(255)
-#  course_link        :string(255)
-#  course_name        :string(255)
-#  partner_id         :integer
-#  customer_id        :integer
-#  school_property_id :integer
-#
-# Indexes
-#
-#  index_schools_on_customer_id         (customer_id)
-#  index_schools_on_identifier          (identifier)
-#  index_schools_on_partner_id          (partner_id)
-#  index_schools_on_school_property_id  (school_property_id)
-#
-
 class School < ApplicationRecord
  has_many :departments, dependent: :destroy

--- a/app/models/site.rb
+++ b/app/models/site.rb
@ -1,72 +0,0 @@
-# == Schema Information
-#
-# Table name: sites
-#
-#  id         :integer          not null, primary key
-#  name       :string(255)
-#  url        :string(255)
-#  key        :string(255)
-#  site_type  :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#
-
-class Site < ApplicationRecord
-  # add: 添加类链接
-  # personal: 个人名下类链接,
-  # common: 普通链接
-  enum site_type: { add: 0, personal: 1, common: 2 }
-
-  def self.set_default_menu
-    set_add_menu!
-    set_personal_menu!
-    set_common_menu!
-  end
-
-  private
-    def self.set_add_menu!
-      adds= [
-        {name: '新建镜像项目', key: 'add_mirror_project', url: '/projects/mirror/new'},
-        {name: '新建托管项目', key: 'add_common', url: '/projects/deposit/new'},
-        {name: '新建组织', key: 'add_r', url: '/organize/new'}]
-
-      adds.each { |ele|
-        Site.find_or_create_by(key: ele[:key]) do |site|
-          site.name = ele[:name]
-          site.url = ele[:url]
-          site.site_type = Site.site_types[:add]
-        end
-      }
-    end
-
-    def self.set_personal_menu!
-      personals = [
-        {name: '个人中心', key: 'my_page', url: '/users/current_user'},
-        {name: '我的组织', key: 'my_organizes', url: '/users/current_user/organizes'}
-      ]
-
-      personals.each { |ele|
-        Site.find_or_create_by(key: ele[:key]) do |site|
-          site.name = ele[:name]
-          site.url = ele[:url]
-          site.site_type = Site.site_types[:personal]
-        end
-      }
-    end
-
-    def self.set_common_menu!
-      commons = [
-        {name: '通知', key: 'notice', url: '/users/current_user/user_messages'},
-        {name: '找回密码', key: 'lost_password', url: '/account/lost_password'},
-        {name: '注册', key: 'register', url: '/login?login=false'}
-      ]
-
-      commons.each { |ele|
-        Site.find_or_create_by(key: ele[:key]) do |site|
-          site.name = ele[:name]
-          site.url = ele[:url]
-          site.site_type = Site.site_types[:common]
-        end
-      }
-    end
-end
--- a/app/models/team.rb
+++ b/app/models/team.rb
@ -1,56 +0,0 @@
-# == Schema Information
-#
-# Table name: teams
-#
-#  id                     :integer          not null, primary key
-#  organization_id        :integer
-#  name                   :string(255)
-#  description            :string(255)
-#  authorize              :integer          default("0")
-#  num_projects           :integer          default("0")
-#  num_users              :integer          default("0")
-#  includes_all_project   :boolean          default("0")
-#  can_create_org_project :boolean          default("0")
-#  gtid                   :integer
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
-#  nickname               :string(255)
-#
-# Indexes
-#
-#  index_teams_on_organization_id  (organization_id)
-#
-
-class Team < ApplicationRecord
-
-  belongs_to :organization
-  belongs_to :organization_extension, foreign_key: :organization_id, primary_key: :organization_id, counter_cache: :num_teams
-  has_many :team_projects, dependent: :destroy
-  has_many :team_units, dependent: :destroy
-  has_many :team_users, dependent: :destroy
-
-  validates :name, uniqueness: {scope: :organization_id}
-
-  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)
-    self.create!(organization_id: organization_id,
-                 name: name,
-                 description: description,
-                 authorize: authorize,
-                 includes_all_project: includes_all_project,
-                 can_create_org_project: can_create_org_project)
-  end
-
-  def setup_team_project!
-    return unless includes_all_project
-    organization.projects.each do |project|
-      TeamProject.build(organization.id, id, project.id)
-    end
-  end
-
-  def is_member?(user_id)
-    team_users.where(user_id: user_id).present?
-  end
-
-end
--- a/app/models/team_project.rb
+++ b/app/models/team_project.rb
@ -1,30 +0,0 @@
-# == Schema Information
-#
-# Table name: team_projects
-#
-#  id              :integer          not null, primary key
-#  organization_id :integer
-#  project_id      :integer
-#  team_id         :integer
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#
-# Indexes
-#
-#  index_team_projects_on_organization_id  (organization_id)
-#  index_team_projects_on_project_id       (project_id)
-#  index_team_projects_on_team_id          (team_id)
-#
-
-class TeamProject < ApplicationRecord
-
-  belongs_to :organization
-  belongs_to :project
-  belongs_to :team, counter_cache: :num_projects
-
-  validates :project_id, uniqueness: {scope: [:organization_id, :team_id]}
-
-  def self.build(organization_id, team_id, project_id)
-    self.find_or_create_by!(organization_id: organization_id, team_id: team_id, project_id: project_id)
-  end
-end
--- a/app/models/team_unit.rb
+++ b/app/models/team_unit.rb
@ -1,31 +0,0 @@
-# == Schema Information
-#
-# Table name: team_units
-#
-#  id              :integer          not null, primary key
-#  organization_id :integer
-#  team_id         :integer
-#  unit_type       :integer
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#
-# Indexes
-#
-#  index_team_units_on_organization_id  (organization_id)
-#  index_team_units_on_team_id          (team_id)
-#
-
-class TeamUnit < ApplicationRecord
-
-  belongs_to :organization
-  belongs_to :team
-
-  enum unit_type: {code: 1, issues: 2, pulls: 3, releases: 4}
-
-  validates :unit_type, uniqueness: { scope: [:organization_id, :team_id]}
-
-  def self.build(organization_id, team_id, unit_type)
-    self.create!(organization_id: organization_id, team_id: team_id, unit_type: unit_type)
-  end
-
-end
--- a/app/models/team_user.rb
+++ b/app/models/team_user.rb
@ -1,30 +0,0 @@
-# == Schema Information
-#
-# Table name: team_users
-#
-#  id              :integer          not null, primary key
-#  organization_id :integer
-#  team_id         :integer
-#  user_id         :integer
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#
-# Indexes
-#
-#  index_team_users_on_organization_id  (organization_id)
-#  index_team_users_on_team_id          (team_id)
-#  index_team_users_on_user_id          (user_id)
-#
-
-class TeamUser < ApplicationRecord
-
-  belongs_to :organization
-  belongs_to :team, counter_cache: :num_users
-  belongs_to :user
-
-  validates :user_id, uniqueness: {scope: [:organization_id, :team_id]}
-
-  def self.build(organization_id, user_id, team_id)
-    self.create!(organization_id: organization_id, user_id: user_id, team_id: team_id)
-  end
-end
--- a/app/models/trustie/course.rb
+++ b/app/models/trustie/course.rb
@ -1,87 +1,4 @@
-# == Schema Information
-#
-# Table name: courses
-#
-#  id                         :integer          not null, primary key
-#  tea_id                     :integer
-#  name                       :string(255)
-#  state                      :integer
-#  code                       :string(255)
-#  time                       :integer
-#  extra                      :string(255)
-#  created_at                 :datetime         not null
-#  updated_at                 :datetime         not null
-#  location                   :string(255)
-#  term                       :string(255)
-#  string                     :string(255)
-#  password                   :string(255)
-#  setup_time                 :string(255)
-#  endup_time                 :string(255)
-#  class_period               :integer          default("0")
-#  school_id                  :integer
-#  description                :text(65535)
-#  status                     :integer          default("1")
-#  attachmenttype             :integer          default("2")
-#  lft                        :integer
-#  rgt                        :integer
-#  is_public                  :integer          default("1")
-#  inherit_members            :integer          default("1")
-#  open_student               :integer          default("0")
-#  outline                    :integer          default("0")
-#  publish_resource           :integer          default("0")
-#  is_delete                  :integer          default("0")
-#  end_time                   :integer
-#  end_term                   :string(255)
-#  is_excellent               :integer          default("0")
-#  excellent_option           :integer          default("0")
-#  is_copy                    :integer          default("0")
-#  visits                     :integer          default("0")
-#  syllabus_id                :integer
-#  invite_code                :string(255)
-#  qrcode                     :string(255)
-#  qrcode_expiretime          :integer          default("0")
-#  invite_code_halt           :integer          default("0")
-#  os_allow                   :integer          default("0")
-#  credit                     :float(24)
-#  is_end                     :boolean          default("0")
-#  end_date                   :date
-#  choose_group_allow         :boolean          default("0")
-#  homepage_show              :boolean          default("0")
-#  course_list_id             :integer
-#  members_count              :integer          default("0")
-#  homework_commons_count     :integer          default("0")
-#  show_unit                  :boolean          default("0")
-#  teacher_list               :string(255)      default("老师")
-#  student_list               :string(255)      default("学生")
-#  is_hidden                  :boolean          default("0")
-#  course_members_count       :integer          default("0")
-#  course_groups_count        :integer          default("0")
-#  authentication             :boolean          default("0")
-#  professional_certification :boolean          default("0")
-#  graduation_topics_count    :integer          default("0")
-#  graduation_tasks_count     :integer          default("0")
-#  polls_count                :integer          default("0")
-#  exercises_count            :integer          default("0")
-#  start_date                 :date
-#  subject_id                 :integer          default("0")
-#  excellent                  :boolean          default("0")
-#  email_notify               :boolean          default("0")
-#  sticky                     :boolean          default("0")
-#  sticky_time                :datetime
-#  laboratory_id              :integer
-#  mooc_course_id             :integer
-#
-# Indexes
-#
-#  index_courses_on_invite_code              (invite_code) UNIQUE
-#  index_courses_on_laboratory_id            (laboratory_id)
-#  index_courses_on_mooc_course_id           (mooc_course_id)
-#  index_courses_on_school_id_and_is_delete  (school_id,is_delete)
-#  index_courses_on_subject_id               (subject_id)
-#  index_courses_on_tea_id                   (tea_id)
-#
-
 class Trustie::Course < Trustie::Database
  has_many :course_groups, class_name: "Trustie::CourseGroup"
  has_many :homework_commons, class_name: "Trustie::HomeworkCommon"
-end
+end
--- a/app/models/trustie/course_group.rb
+++ b/app/models/trustie/course_group.rb
@ -1,25 +1,3 @@
-# == Schema Information
-#
-# Table name: course_groups
-#
-#  id                   :integer          not null, primary key
-#  name                 :string(255)
-#  course_id            :integer
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
-#  members_count        :integer
-#  invite_code          :string(255)
-#  position             :integer          default("0")
-#  course_members_count :integer          default("0")
-#  invite_code_halt     :boolean          default("0")
-#  invite_code_set      :integer          default("0")
-#
-# Indexes
-#
-#  index_course_groups_on_course_id    (course_id)
-#  index_course_groups_on_invite_code  (invite_code) UNIQUE
-#
-
 class Trustie::CourseGroup < Trustie::Database
  belongs_to :course, class_name: "Trustie::Course"
-end
+end
--- a/app/models/trustie/homework_common.rb
+++ b/app/models/trustie/homework_common.rb
@ -1,54 +1,3 @@
-# == Schema Information
-#
-# Table name: homework_commons
-#
-#  id                          :integer          not null, primary key
-#  name                        :string(255)
-#  user_id                     :integer
-#  description                 :text(65535)
-#  publish_time                :datetime
-#  end_time                    :datetime
-#  homework_type               :integer          default("1")
-#  late_penalty                :string(255)      default("0")
-#  course_id                   :integer
-#  created_at                  :datetime         not null
-#  updated_at                  :datetime         not null
-#  teacher_priority            :integer          default("1")
-#  anonymous_comment           :boolean          default("0")
-#  quotes                      :integer          default("0")
-#  is_open                     :integer          default("0")
-#  simi_time                   :datetime
-#  score_open                  :boolean          default("0")
-#  anonymous_appeal            :boolean          default("0")
-#  homework_bank_id            :integer
-#  is_update                   :boolean          default("0")
-#  is_public                   :boolean          default("0")
-#  reference_answer            :text(65535)
-#  answer_public               :boolean          default("0")
-#  archive_time                :datetime
-#  allow_late                  :boolean          default("0")
-#  late_time                   :datetime
-#  work_public                 :boolean          default("0")
-#  explanation                 :text(65535)
-#  unified_setting             :boolean          default("1")
-#  comment_public              :boolean          default("1")
-#  course_homework_category_id :integer
-#  work_efficiency             :boolean          default("0")
-#  eff_score                   :float(24)        default("0")
-#  max_efficiency              :float(24)        default("0")
-#  course_second_category_id   :integer          default("0")
-#  calculation_time            :datetime
-#  position                    :integer          default("0")
-#  total_score                 :float(24)        default("100")
-#  category_position           :integer          default("0")
-#
-# Indexes
-#
-#  index_homework_commons_on_course_id_and_id           (course_id,id)
-#  index_homework_commons_on_course_second_category_id  (course_second_category_id)
-#  index_homework_commons_on_homework_bank_id           (homework_bank_id)
-#
-
 class Trustie::HomeworkCommon < Trustie::Database
  belongs_to :course, class_name: "Trustie::Course"
-end
+end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -39,14 +39,13 @@
 #  business                   :boolean          default("0")
 #  profile_completed          :boolean          default("0")
 #  laboratory_id              :integer
-#  is_shixun_marker           :boolean          default("0")
-#  admin_visitable            :boolean          default("0")
-#  collaborator               :boolean          default("0")
+#  platform                   :string(255)      default("0")
+#  gitea_token                :string(255)
 #  gitea_uid                  :integer
+#  is_shixun_marker           :boolean          default("0")
 #  is_sync_pwd                :boolean          default("1")
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
-#  gitea_token                :string(255)
 #
 # Indexes
 #
@ -54,21 +53,20 @@
 #  index_users_on_homepage_engineer  (homepage_engineer)
 #  index_users_on_homepage_teacher   (homepage_teacher)
 #  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login) UNIQUE
-#  index_users_on_mail               (mail) UNIQUE
-#  index_users_on_phone              (phone) UNIQUE
+#  index_users_on_login              (login)
+#  index_users_on_mail               (mail)
 #  index_users_on_type               (type)
 #

-class User < Owner
-  default_scope {where(type: %w(User AnonymousUser))}
+class User < ApplicationRecord
  extend Enumerize

  include Watchable
  include Likeable
  include BaseModel
+  include ProjectOperable
+  include ProjectAbility
  include Droneable
-  include User::Avatar
  # include Searchable::Dependents::User

  # devops step
@ -137,6 +135,11 @@ 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_many :watchers, as: :watchable, dependent: :destroy
+
  has_one :ci_cloud_account, class_name: 'Ci::CloudAccount', dependent: :destroy

  # 认证
@ -151,21 +154,21 @@ class User < Owner
  # 项目
  has_many :applied_projects, dependent: :destroy

+  has_many :projects, dependent: :destroy
+  has_many :repositories, dependent: :destroy
+
  # 教学案例
  # has_many :libraries, dependent: :destroy
  has_many :project_trends, dependent: :destroy
  has_many :oauths , dependent: :destroy

-  has_many :organization_users, dependent: :destroy
-  has_many :organizations, through: :organization_users
-
  # Groups and active users
  scope :active, lambda { where(status: STATUS_ACTIVE) }
  scope :like, lambda { |keywords|
    where("LOWER(concat(lastname, firstname, login, mail)) LIKE ?", "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
  }

-  scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname, :gitea_uid, :type)}
+  scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname, :gitea_uid)}

  attr_accessor :password, :password_confirmation

@ -188,10 +191,6 @@ 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
@ -206,7 +205,7 @@ class User < Owner
  end

  def project_manager?(project)
-    project.manager?(self) || self.admin?
+    project.managers.exists?(user: self) || self.admin?
  end

  # 学号
--- a/app/models/user/avatar.rb
+++ b/app/models/user/avatar.rb
@ -1,43 +0,0 @@
-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
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@ -12,9 +12,7 @@
 #
 # Indexes
 #
-#  index_user_actions_on_ip                       (ip)
-#  index_user_actions_on_user_id                  (user_id)
-#  index_user_actions_on_user_id_and_action_type  (user_id,action_type)
+#  index_user_actions_on_ip  (ip)
 #

 class UserAction < ApplicationRecord
--- a/app/models/user_agent.rb
+++ b/app/models/user_agent.rb
@ -10,13 +10,10 @@
 #  updated_at      :datetime         not null
 #  register_status :integer          default("0")
 #  action_status   :integer          default("0")
-#  is_delete       :boolean          default("0")
-#  user_id         :integer
 #
 # Indexes
 #
-#  index_user_agents_on_ip       (ip)
-#  index_user_agents_on_user_id  (user_id)
+#  index_user_agents_on_ip  (ip) UNIQUE
 #

 class UserAgent < ApplicationRecord
--- a/app/models/user_extension.rb
+++ b/app/models/user_extension.rb
@ -22,9 +22,6 @@
 #  school_id          :integer
 #  description        :string(255)      default("")
 #  department_id      :integer
-#  honor              :text(65535)
-#  edu_background     :integer
-#  edu_entry_year     :integer
 #
 # Indexes
 #
--- a/app/queries/ci/builds/list_query.rb
+++ b/app/queries/ci/builds/list_query.rb
@ -25,7 +25,7 @@ class Ci::Builds::ListQuery < ApplicationQuery
        scope
      end

-    builds = builds.by_branch(params[:branch]) if params[:branch]
+    builds = scope.by_branch(params[:branch]) if params[:branch]

    custom_sort(builds, params[:sort_by], params[:sort_direction])
  end
--- a/app/queries/projects/list_my_query.rb
+++ b/app/queries/projects/list_my_query.rb
@ -17,12 +17,15 @@ class Projects::ListMyQuery < ApplicationQuery
      projects = Project.visible
    end

+    if params[:is_public].present?
+      projects = projects.is_private.members_projects(user.id) if params[:is_public].to_s == "private"
+      projects = projects.visible.members_projects(user.id) if params[:is_public].to_s == "public"
+    end
+
    if params[:category].blank?
      projects = projects.members_projects(user.id)
    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
-      projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
+      projects = projects.where.not(user_id: user.id).members_projects(user.id)
    elsif params[:category].to_s == "manage"
      projects = projects.where(user_id: user.id)
    elsif params[:category].to_s == "watched"  #我关注的
@ -36,11 +39,6 @@ class Projects::ListMyQuery < ApplicationQuery
    #   projects = projects.is_private.joins(:members).where(members: { user_id: user.id })
    end

-    if params[:is_public].present?
-      projects = projects.is_private if params[:is_public].to_s == "private"
-      projects = projects.visible if params[:is_public].to_s == "public"
-    end
-
    if params[:project_type].to_s === "common"
      projects = projects.common
    elsif params[:project_type].to_s === "mirror"
--- a/app/services/gitea/client_service.rb
+++ b/app/services/gitea/client_service.rb
@ -132,8 +132,7 @@ class Gitea::ClientService < ApplicationService
    when 204

      puts "[gitea] "
-      # raise Error, "[gitea] delete ok"
-      {status: 204}
+      raise Error, "[gitea] delete ok"
    when 409
      message = "创建失败，请检查该分支合并是否已存在"
      raise Error, mark + message
--- a/app/services/gitea/organization/create_service.rb
+++ b/app/services/gitea/organization/create_service.rb
@ -1,44 +0,0 @@
-class Gitea::Organization::CreateService < Gitea::ClientService
-  attr_reader :token, :org
-
-  def initialize(token, org)
-    @token = token
-    @org = org
-  end
-
-  def call
-    response = post(url, request_params)
-    render_status(response)
-  end
-
-  private
-  def request_params
-    create_params = {
-        username: org.login,
-        description: org.description,
-        location: org.location,
-        repo_admin_change_team_access: org.repo_admin_change_team_access,
-        visibility: visibility(org.visibility),
-        website: org.website,
-        max_repo_creation: org.max_repo_creation
-    }
-    Hash.new.merge(token: token, data: create_params)
-  end
-
-  def visibility(visibility)
-    case visibility
-    when "common"
-      "public"
-    when "limited"
-      "limited"
-    when "privacy"
-      "private"
-    else
-      "public"
-    end
-  end
-
-  def url
-    "/orgs".freeze
-  end
-end
--- a/app/services/gitea/organization/delete_service.rb
+++ b/app/services/gitea/organization/delete_service.rb
@ -1,23 +0,0 @@
-class Gitea::Organization::DeleteService < Gitea::ClientService
-  attr_reader :token, :name
-
-  def initialize(token, name)
-    @token = token
-    @name = name
-  end
-
-  def call
-    response = delete(url, params)
-    render_status(response)
-  end
-
-  private
-
-  def params
-    Hash.new.merge(token: token)
-  end
-
-  def url
-    "/orgs/#{name}".freeze
-  end
-end
--- a/app/services/gitea/organization/get_service.rb
+++ b/app/services/gitea/organization/get_service.rb
@ -1,21 +0,0 @@
-class Gitea::Organization::GetService < Gitea::ClientService
-  attr_reader :org
-
-  def initialize(org)
-    @org = org
-  end
-
-  def call
-    response = get(url, params)
-    render_status(response)
-  end
-
-  private
-  def params
-    Hash.new.merge(token: org.gitea_token)
-  end
-
-  def url
-    "/orgs/#{org.login}".freeze
-  end
-end
--- a/app/services/gitea/organization/organization_user/delete_service.rb
+++ b/app/services/gitea/organization/organization_user/delete_service.rb
@ -1,23 +0,0 @@
-class Gitea::Organization::OrganizationUser::DeleteService < Gitea::ClientService
-  attr_reader :token, :org_name, :username
-
-  def initialize(token, org_name, username)
-    @token = token
-    @org_name = org_name
-    @username = username
-  end
-
-  def call
-    response = delete(url, params)
-    render_status(response)
-  end
-
-  private
-  def params
-    Hash.new.merge(token: token)
-  end
-
-  def url
-    "/orgs/#{org_name}/members/#{username}"
-  end
-end
--- a/app/services/gitea/organization/repository/create_service.rb
+++ b/app/services/gitea/organization/repository/create_service.rb
@ -1,25 +0,0 @@
-class Gitea::Organization::Repository::CreateService < Gitea::ClientService
-  attr_reader :token, :org_name, :params
-
-  def initialize(token, org_name, params)
-    @token = token
-    @org_name = org_name
-    @params = params
-  end
-
-  def call
-    response = post(url, request_params)
-    render_201_response(response)
-  end
-
-  private
-
-  def request_params
-    create_params = params.merge(readme: "readme")
-    Hash.new.merge(token: token, data: create_params)
-  end
-
-  def url
-    "/orgs/#{org_name}/repos".freeze
-  end
-end
--- a/app/services/gitea/organization/team/create_service.rb
+++ b/app/services/gitea/organization/team/create_service.rb
@ -1,50 +0,0 @@
-class Gitea::Organization::Team::CreateService < Gitea::ClientService
-  attr_reader :token, :org, :team
-
-  def initialize(token, org, team)
-    @token = token
-    @org = org
-    @team = team
-  end
-
-  def call
-    response = post(url, request_params)
-    render_status(response)
-  end
-
-  private
-  def request_params
-    create_params = {
-        name: team.name,
-        description: team.description,
-        permission: permission(team.authorize),
-        includes_all_repositories: team.includes_all_project,
-        can_create_org_repo: team.can_create_org_project,
-        units: unit_arrays
-    }
-    Hash.new.merge(token: token, data: create_params)
-  end
-
-  def permission(authorize)
-    case authorize
-    when "read"
-      "read"
-    when "write"
-      "write"
-    when "admin"
-      "admin"
-    when "owner"
-      "owner"
-    else
-      "none"
-    end
-  end
-
-  def unit_arrays
-    team.team_units.pluck(:unit_type).collect{|t|"repo.#{t}"}
-  end
-
-  def url
-    "/orgs/#{org.login}/teams".freeze
-  end
-end
--- a/app/services/gitea/organization/team/delete_service.rb
+++ b/app/services/gitea/organization/team/delete_service.rb
@ -1,22 +0,0 @@
-class Gitea::Organization::Team::DeleteService < Gitea::ClientService
-  attr_reader :token, :gtid
-
-  def initialize(token, gtid)
-    @token = token
-    @gtid = gtid
-  end
-
-  def call
-    response = delete(url, params)
-    render_status(response)
-  end
-
-  private
-  def params
-    Hash.new.merge(token: token)
-  end
-
-  def url
-    "/teams/#{gtid}".freeze
-  end
-end
--- a/app/services/gitea/organization/team/update_service.rb
+++ b/app/services/gitea/organization/team/update_service.rb
@ -1,49 +0,0 @@
-class Gitea::Organization::Team::UpdateService < Gitea::ClientService
-  attr_reader :token, :team
-
-  def initialize(token, team)
-    @token = token
-    @team = team
-  end
-
-  def call
-    response = patch(url, request_params)
-    render_status(response)
-  end
-
-  private
-  def request_params
-    update_params = {
-        name: team.name,
-        description: team.description,
-        permission: permission(team.authorize),
-        includes_all_repositories: team.includes_all_project,
-        can_create_org_repo: team.can_create_org_project,
-        units: unit_arrays
-    }
-    Hash.new.merge(token: token, data: update_params)
-  end
-
-  def permission(authorize)
-    case authorize
-    when "read"
-      "read"
-    when "write"
-      "write"
-    when "admin"
-      "admin"
-    when "owner"
-      "owner"
-    else
-      "none"
-    end
-  end
-
-  def unit_arrays
-    team.team_units.pluck(:unit_type).collect{|t|"repo.#{t}"}
-  end
-
-  def url
-    "/teams/#{team.gtid}".freeze
-  end
-end
--- a/app/services/gitea/organization/team_project/create_service.rb
+++ b/app/services/gitea/organization/team_project/create_service.rb
@ -1,24 +0,0 @@
-class Gitea::Organization::TeamProject::CreateService < Gitea::ClientService
-  attr_reader :token, :gtid, :org_name, :repo_name
-
-  def initialize(token, gtid, org_name, repo_name)
-    @token = token
-    @gtid = gtid
-    @org_name = org_name
-    @repo_name = repo_name
-  end
-
-  def call
-    response = put(url, request_params)
-    render_status(response)
-  end
-
-  private
-  def request_params
-    Hash.new.merge(token: token)
-  end
-
-  def url
-    "/teams/#{gtid}/repos/#{org_name}/#{repo_name}".freeze
-  end
-end
--- a/app/services/gitea/organization/team_project/delete_service.rb
+++ b/app/services/gitea/organization/team_project/delete_service.rb
@ -1,24 +0,0 @@
-class Gitea::Organization::TeamProject::DeleteService < Gitea::ClientService
-  attr_reader :token, :gtid, :org_name, :repo_name
-
-  def initialize(token, gtid, org_name, repo_name)
-    @token = token
-    @gtid = gtid
-    @org_name = org_name
-    @repo_name = repo_name
-  end
-
-  def call
-    response = delete(url, params)
-    render_status(response)
-  end
-
-  private
-  def params
-    Hash.new.merge(token: token)
-  end
-
-  def url
-    "/teams/#{gtid}/repos/#{org_name}/#{repo_name}".freeze
-  end
-end
--- a/app/services/gitea/organization/team_user/create_service.rb
+++ b/app/services/gitea/organization/team_user/create_service.rb
@ -1,23 +0,0 @@
-class Gitea::Organization::TeamUser::CreateService < Gitea::ClientService
-  attr_reader :token, :gtid, :username
-
-  def initialize(token, gtid, username)
-    @token = token
-    @gtid = gtid
-    @username = username
-  end
-
-  def call
-    response = put(url, request_params)
-    render_status(response)
-  end
-
-  private
-  def request_params
-    Hash.new.merge(token: token)
-  end
-
-  def url
-    "/teams/#{gtid}/members/#{username}".freeze
-  end
-end
--- a/app/services/gitea/organization/team_user/delete_service.rb
+++ b/app/services/gitea/organization/team_user/delete_service.rb
@ -1,23 +0,0 @@
-class Gitea::Organization::TeamUser::DeleteService < Gitea::ClientService
-  attr_reader :token, :gtid, :username
-
-  def initialize(token, gtid, username)
-    @token = token
-    @gtid = gtid
-    @username = username
-  end
-
-  def call
-    response = delete(url, params)
-    render_status(response)
-  end
-
-  private
-  def params
-    Hash.new.merge(token: token)
-  end
-
-  def url
-    "/teams/#{gtid}/members/#{username}"
-  end
-end
--- a/app/services/gitea/organization/update_service.rb
+++ b/app/services/gitea/organization/update_service.rb
@ -1,45 +0,0 @@
-class Gitea::Organization::UpdateService < Gitea::ClientService
-  attr_reader :token, :login, :org
-
-  def initialize(token, login, org)
-    @token = token
-    @login = login
-    @org = org
-  end
-
-  def call
-    response = patch(url, request_params)
-    render_status(response)
-  end
-
-  private
-  def request_params
-    update_params = {
-        name: org.login,
-        description: org.description,
-        location: org.location,
-        repo_admin_change_team_access: org.repo_admin_change_team_access,
-        visibility: visibility(org.visibility),
-        website: org.website,
-        max_repo_creation: org.max_repo_creation
-    }
-    Hash.new.merge(token: token, data: update_params)
-  end
-
-  def visibility(visibility)
-    case visibility
-    when "common"
-      "public"
-    when "limited"
-      "limited"
-    when "privacy"
-      "private"
-    else
-      "public"
-    end
-  end
-
-  def url
-    "/orgs/#{login}".freeze
-  end
-end
--- a/app/services/gitea/repository/contributors/get_service.rb
+++ b/app/services/gitea/repository/contributors/get_service.rb
@ -1,22 +0,0 @@
-class Gitea::Repository::Contributors::GetService < Gitea::ClientService
-  attr_reader :owner, :repo_name
-
-  def initialize(owner, repo_name)
-    @owner = owner 
-    @repo_name = repo_name
-  end
-
-  def call
-    response = get(url, params)
-    render_status(response)
-  end
-
-  private 
-  def params
-    Hash.new.merge(token: owner.gitea_token)
-  end
-
-  def url 
-    "/repos/#{owner.login}/#{repo_name}/contributors"
-  end
-end
--- a/app/services/gitea/repository/files/get_service.rb
+++ b/app/services/gitea/repository/files/get_service.rb
@ -1,25 +0,0 @@
-class Gitea::Repository::Files::GetService < Gitea::ClientService 
-  attr_reader :owner, :repo_name, :ref, :q, :token
-
-  def initialize(owner, repo_name, ref, q=nil, token=nil)
-    @owner = owner 
-    @repo_name = repo_name 
-    @ref = ref 
-    @q = q 
-    @token = token
-  end
-
-  def call 
-    response = get(url, params)
-    render_status(response)
-  end
-
-  private 
-  def params
-    Hash.new.merge(token: token, ref: ref, q: q)
-  end
-
-  def url 
-    "/repos/#{owner.login}/#{repo_name}/find"
-  end
-end
--- a/app/services/gitea/repository/transfer_service.rb
+++ b/app/services/gitea/repository/transfer_service.rb
@ -1,27 +0,0 @@
-class Gitea::Repository::TransferService < Gitea::ClientService
-  attr_reader :token, :owner, :repo, :new_owner
-
-  def initialize(token, owner, repo, new_owner)
-    @token = token
-    @owner = owner
-    @repo = repo
-    @new_owner = new_owner
-  end
-
-  def call
-    response = post(url, request_params)
-    render_status(response)
-  end
-
-  private
-  def request_params
-    transfer_params = {
-        new_owner: new_owner
-    }
-    Hash.new.merge(token: token, data: transfer_params)
-  end
-
-  def url
-    "/repos/#{owner}/#{repo}/transfer".freeze
-  end
-end
--- a/app/services/gitea/versions/create_service.rb
+++ b/app/services/gitea/versions/create_service.rb
@ -18,8 +18,7 @@ class Gitea::Versions::CreateService < Gitea::ClientService
  end

  def call
-    response = post(url, request_params)
-    render_status(response)
+    post(url, request_params)
  end

  private
--- a/Show More
+++ b/Show More