FIX CORS problem for develop

fix cherry pick merge 458fca9992
Reset settings show.json about navbar url
2021-01-29 11:13:03 +08:00 · 2021-01-29 11:11:37 +08:00 · 2020-10-16 16:43:57 +08:00 · 2020-10-16 16:26:15 +08:00 · 2020-10-16 15:11:10 +08:00 · 2020-10-16 15:07:05 +08:00
916 changed files with 59099 additions and 1218563 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/.trustie-pipeline.yml
+++ b/.trustie-pipeline.yml
@ -1,22 +0,0 @@
-kind: pipeline
-name: default
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: install
-  image: ruby:2.4.5
-  commands:
-  - gem install bundler
-  - bundle -v
-  - bundle  install --jobs=1 --retry=1
-
- name: test
-  image: ruby:2.4.5
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  commands:
-  - rake
--- 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/10
+++ b/10
@ -1,6 +1,8 @@
 source 'https://gems.ruby-china.com'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }

+ruby '2.3.7'
+
 gem 'rails', '~> 5.2.0'
 gem 'mysql2', '>= 0.4.4', '< 0.6.0'
 gem 'puma', '~> 3.11'
@ -12,11 +14,14 @@ gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.5'
 gem 'groupdate', '~> 4.1.0'
 gem 'chartkick'
+# gem 'grape', '~> 0.9.0'
 gem 'grape-entity', '~> 0.7.1'
 gem 'kaminari', '~> 1.1', '>= 1.1.1'

 gem 'bootsnap', '>= 1.1.0', require: false

+gem 'gitlab', path: 'lib/gitlab-cli'
+
 gem 'chinese_pinyin'

 gem 'rack-cors'
@ -43,7 +48,7 @@ gem 'redcarpet', '~> 3.4'

 gem 'rqrcode', '~> 0.10.1'
 gem 'rqrcode_png'
-
+gem 'acts_as_tree', '~> 2.9', '>= 2.9.1'
 gem 'acts-as-taggable-on', '~> 6.0'

 # a tree structure
@ -70,7 +75,6 @@ group :development do
  gem 'listen', '>= 3.0.5', '< 3.2'
  gem 'spring'
  gem 'spring-watcher-listen', '~> 2.0.0'
-  gem "annotate", "~> 2.6.0"
 end

 group :test do
@ -100,7 +104,6 @@ gem 'rails-i18n', '~> 5.1'
 # job
 gem 'sidekiq'
 gem 'sinatra'
-gem "sidekiq-cron", "~> 1.1"

 # batch insert
 gem 'bulk_insert'
@ -127,4 +130,3 @@ gem 'harmonious_dictionary', '~> 0.0.1'

 gem 'parallel', '~> 1.19', '>= 1.19.1'

-gem 'letter_avatar'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,3 +1,10 @@
+PATH
+  remote: lib/gitlab-cli
+  specs:
+    gitlab (3.2.0)
+      httparty
+      terminal-table
+
 GEM
  remote: https://gems.ruby-china.com/
  specs:
@ -50,13 +57,12 @@ GEM
      activerecord (>= 5.0, < 6.1)
    acts_as_list (0.9.19)
      activerecord (>= 3.0)
+    acts_as_tree (2.9.1)
+      activerecord (>= 3.0.0)
    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
    ancestry (3.0.7)
      activerecord (>= 3.2.0)
-    annotate (2.6.5)
-      activerecord (>= 2.3.0)
-      rake (>= 0.8.7)
    archive-zip (0.12.0)
      io-like (~> 0.3.0)
    arel (9.0.0)
@ -118,17 +124,12 @@ GEM
    enumerize (2.3.1)
      activesupport (>= 3.2)
    erubi (1.9.0)
-    et-orbi (1.2.4)
-      tzinfo
    execjs (2.7.0)
    faraday (0.15.4)
      multipart-post (>= 1.2, < 3)
    ffi (1.12.2)
    font-awesome-sass (4.7.0)
      sass (>= 3.2)
-    fugit (1.4.1)
-      et-orbi (~> 1.1, >= 1.1.8)
-      raabro (~> 1.4)
    globalid (0.4.2)
      activesupport (>= 4.2.0)
    grape-entity (0.7.1)
@ -139,6 +140,9 @@ GEM
    harmonious_dictionary (0.0.1)
    hashie (3.6.0)
    htmlentities (4.3.4)
+    httparty (0.18.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
    i18n (1.8.2)
      concurrent-ruby (~> 1.0)
    io-like (0.3.1)
@ -162,7 +166,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)
@ -176,6 +179,9 @@ GEM
      mimemagic (~> 0.3.2)
    maruku (0.7.3)
    method_source (0.9.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.1009)
    mimemagic (0.3.4)
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
@ -217,7 +223,6 @@ GEM
    prettier (0.18.2)
    public_suffix (4.0.3)
    puma (3.12.2)
-    raabro (1.4.0)
    rack (2.0.9)
    rack-cors (1.1.1)
      rack (>= 2.0.0)
@ -360,9 +365,6 @@ GEM
      rack (< 2.1.0)
      rack-protection (>= 1.5.0)
      redis (>= 3.3.5, < 5)
-    sidekiq-cron (1.2.0)
-      fugit (~> 1.1)
-      sidekiq (>= 4.2.1)
    simple_form (5.0.2)
      actionpack (>= 5.0)
      activemodel (>= 5.0)
@ -402,6 +404,8 @@ GEM
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
    thor (1.0.1)
    thread_safe (0.3.6)
    tilt (2.0.10)
@ -434,8 +438,8 @@ DEPENDENCIES
  active_decorator
  acts-as-taggable-on (~> 6.0)
  acts_as_list
+  acts_as_tree (~> 2.9, >= 2.9.1)
  ancestry
-  annotate (~> 2.6.0)
  awesome_print
  axlsx (~> 3.0.0.pre)
  axlsx_rails (~> 0.5.2)
@ -451,13 +455,13 @@ DEPENDENCIES
  enumerize
  faraday (~> 0.15.4)
  font-awesome-sass (= 4.7.0)
+  gitlab!
  grape-entity (~> 0.7.1)
  groupdate (~> 4.1.0)
  harmonious_dictionary (~> 0.0.1)
  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
@ -488,7 +492,6 @@ DEPENDENCIES
  searchkick
  selenium-webdriver
  sidekiq
-  sidekiq-cron (~> 1.1)
  simple_form
  simple_xlsx_reader
  sinatra
@ -502,5 +505,8 @@ DEPENDENCIES
  web-console (>= 3.3.0)
  wkhtmltopdf-binary

+RUBY VERSION
+   ruby 2.3.7p456
+
 BUNDLED WITH
   2.1.4
--- a/README.md
+++ b/README.md
--- a/api_document.md
+++ b/api_document.md
--- a/app/assets/javascripts/admins/forum_sections/index.js
+++ b/app/assets/javascripts/admins/forum_sections/index.js
@ -0,0 +1,4 @@
+$(document).on('turbolinks:load', function() {
+  var $addSectionModal = $('.admin-import-user-modal');
+  
+});
--- a/app/assets/javascripts/customers.js
+++ b/app/assets/javascripts/customers.js
@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
--- a/app/assets/stylesheets/admins/banned_users.scss
+++ b/app/assets/stylesheets/admins/banned_users.scss
@ -0,0 +1,7 @@
+// .admins-banned-users-index-page {
+//   .width240 {
+//     width: 240px;
+//   }
+//   .mr15{margin-right: 15px;}
+//   .mt2{margin-top: 2px;}
+// }
--- a/app/assets/stylesheets/admins/common.scss
+++ b/app/assets/stylesheets/admins/common.scss
@ -136,5 +136,36 @@
    background: #fff;
  }
  .mt-10{margin-top: 10px;}
+  .nav_blueline_status{
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    li {
+      padding: 0px 15px;
+      border-radius: 15px;
+      border: 1px solid #CDCDCD;
+      height: 30px;
+      line-height: 30px;
+      float: left;
+      margin-right: 30px;
+      a {
+        color: #CDCDCD!important;
+        display: block;
+      }
+    };
+    li.active {
+      border: 1px solid #4CACFF;
+      a {
+        color: #4CACFF!important;
+    }
+    }
+  }
+  .fr{float: right;}
+  .width240 {
+    width: 240px;
+  }
+  .mr15{margin-right: 15px;}
+  .mt2{margin-top: 2px;}
 }

+
--- a/app/assets/stylesheets/admins/forum_moderators.scss
+++ b/app/assets/stylesheets/admins/forum_moderators.scss
@ -0,0 +1,11 @@
+.admins-forum-moderators-index-page {
+  .df{
+    display: flex;
+  }
+  .flex1 {
+    flex: 1;
+}
+.text-center {
+  text-align: center;
+}
+}
--- a/app/assets/stylesheets/admins/forum_sections.scss
+++ b/app/assets/stylesheets/admins/forum_sections.scss
@ -0,0 +1,128 @@
+.admins-forum-sections-index-page {
+  .color-grey{color: #888;}
+  .grid-item-top {
+    display: grid;
+    grid-template-columns: max-content 1fr;
+    align-self: start;
+  }
+  .mt20{margin-top: 20px;}
+  .none{display: none;}
+  .color-red{color: red!important;}
+  .upload-image-100 {
+    height: 100px;
+    width: 100px;
+    border-radius: 8px;
+    text-align: center;
+    /* line-height: 100px; */
+    background: #f5f5f5;
+    color: #999;
+    position: relative;
+  }
+  .pointer {
+    cursor: pointer;
+  }
+  .avatar100{
+    height: 100px;
+    width: 100px;
+    border-radius: 8px;
+}
+.upload-image-100:hover .admin-show-again-upload{display: block;}
+.admin-show-again-upload {
+  bottom: 0;
+  width: 100px;
+  height: 100%;
+  line-height: 100px;
+  /* top: 0; */
+  background: rgba(0,0,0,0.6);
+  color: #fff;
+  position: absolute;
+  border-radius: 8px;
+}
+.menu_operate {
+  position: relative;
+  cursor: pointer;
+  .operateList {
+    position: absolute;
+    right: -110px;
+    top: 9px;
+    background: #fff;
+    width: 100px;
+    color: #999;
+    box-shadow: 0px 0px 9px rgba(0,0,0,0.2);
+    z-index: 100;
+    display: none;
+    a {
+      display: block;
+      height: 30px;
+      line-height: 30px;
+      padding: 0px 10px;
+  }
+
+}
+.operateList.active {
+  display: block !important;
+}
+}
+.color-grey-6 {
+  color: #666!important;
+}
+.set_l_submenu {
+  padding-left: 50px;
+  display: none;
+  width: 180px;
+  list-style-type: none;
+  li{
+    padding: 4px 0;
+  }
+}
+.set_l_submenu.active {
+  display: block;
+}
+.set_l_premenu {
+  position: relative;
+  display: flex;
+  height: 30px;
+  line-height: 30px;
+  cursor: pointer;
+}
+.df{
+  display: flex;
+}
+.flex1 {
+  flex: 1;
+}
+.text-center {
+text-align: center;
+}
+.grid-item-left {
+  display: grid;
+  grid-template-columns:1fr max-content;
+  align-self: start;
+}
+.ml20{margin-left: 20px;}
+
+.forum-moderators-items {
+  padding: 10px 30px;
+  max-height: 175px;
+  overflow-y: auto;
+  background: #F4FAFF;
+  margin-top: 20px;
+}
+.mr4 {margin-right: 4px;}
+.blue-user-btn {
+  margin: 0 5px;
+  padding: 2px 8px;
+  background: #F4F8FA!important;
+  color: #fff!important;
+  border: 1px solid #4CACFF;
+  border-radius: 4px;
+  white-space: nowrap;
+}
+.mr5 {
+  margin-right: 5px;
+}
+.moderator-list-content{
+  display: inline-block;
+  margin: 5px 0;
+}
+}
--- a/app/assets/stylesheets/admins/memos.scss
+++ b/app/assets/stylesheets/admins/memos.scss
@ -0,0 +1,5 @@
+.admins-memos-index-page {
+  .users-list-container {
+    text-align: center;
+  }
+}
--- a/app/assets/stylesheets/customers.scss
+++ b/app/assets/stylesheets/customers.scss
@ -0,0 +1,3 @@
+// Place all the styles related to the customers controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -110,33 +110,33 @@ class AccountsController < ApplicationController
  # params[:login] 邮箱或者手机号
  # params[:code]  验证码
  # code_type 1：注册手机验证码  8：邮箱注册验证码
-  # 本地forge注册入口
  def register
    begin
      # 查询验证码是否正确;type只可能是1或者8
      type = phone_mail_type(params[:login].strip)
-      # code = params[:code].strip
+      code = params[:code].strip

      if type == 1
        uid_logger("start register by phone:  type is #{type}")
        pre = 'p'
        email = nil
        phone = params[:login]
-        # verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 1).last
-        # TODO: 暂时限定邮箱注册
-        return normal_status(-1, '只支持邮箱注册')
+        verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 1).last
      else
        uid_logger("start register by email:  type is #{type}")
        pre = 'm'
        email = params[:login]
        phone = nil
-        return normal_status(-1, "该邮箱已注册") if User.exists?(mail: params[:login])
-        return normal_status(-1, "邮箱格式错误") unless params[:login] =~ CustomRegexp::EMAIL
-        # verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
+        verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
      end
-      # uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
+      uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
      # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
      # todo 上线前请删除万能验证码"513231"
+      unless code == "513231" && request.subdomain == "test-newweb"
+        return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
+        return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
+      end
+
      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:password] =~ CustomRegexp::PASSWORD

      code = generate_identifier User, 8, pre
@ -146,20 +146,23 @@ class AccountsController < ApplicationController
      # 现在因为是验证码，所以在注册的时候就可以激活
      @user.activate
      # 必须要用save操作，密码的保存是在users中
-
-      interactor = Gitea::RegisterInteractor.call({username: login, email: email, password: params[:password]})
-      if interactor.success?
-        gitea_user = interactor.result
-        result = Gitea::User::GenerateTokenService.new(login, params[:password]).call
-        @user.gitea_token = result['sha1']
-        @user.gitea_uid = gitea_user[:body]['id']
-        if @user.save!
-          UserExtension.create!(user_id: @user.id)
-          successful_authentication(@user)
-          normal_status("注册成功")
-        end
-      else
-        tip_exception(-1, interactor.error)
+      if @user.save!
+        # todo user_extension
+        UserExtension.create!(user_id: @user.id)
+        # 注册完成，手机号或邮箱想可以奖励500金币
+        # RewardGradeService.call(
+        #   @user,
+        #   container_id: @user.id,
+        #   container_type: pre == 'p' ? 'Phone' : 'Mail',
+        #   score: 500
+        # )
+        # 注册时，记录是否是引流用户
+        ip = request.remote_ip
+        ua = UserAgent.find_by_ip(ip)
+        ua.update_column(:agent_type, UserAgent::USER_REGISTER) if ua
+        successful_authentication(@user)
+        # session[:user_id] = @user.id
+        normal_status("注册成功")
      end
    rescue Exception => e
      uid_logger_error(e.message)
--- a/app/controllers/admins/apply_destroy_controller.rb
+++ b/app/controllers/admins/apply_destroy_controller.rb
@ -0,0 +1,31 @@
+class Admins::ApplyDestroyController < Admins::BaseController
+  def index 
+    memos = Memo.where(destroy_status: 1).includes(:author).order("created_at desc")
+    @memos = paginate memos
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def confirm_apply_destroy
+    memo = Memo.find(params[:id])
+    apply_status = params[:confirm]
+    if apply_status == "delete"
+      memo.destroy
+      extra = "d_2"
+      Tiding.create!(:user_id => memo.author_id, :trigger_user_id => 0,
+        container_id: memo.id, container_type: 'Memo',
+        :viewed => 0, :tiding_type => "System", :extra => "d_2")
+    else
+      memo.common!
+      memo.save
+      extra = "d_3"
+      Tiding.create!(:user_id => memo.author_id, :trigger_user_id => 0,
+        container_id: memo.id, container_type: 'Memo',
+        :viewed => 0, :tiding_type => "System", :extra => "d_3")
+    end
+    @status = 1
+    @message = "操作成功"
+  end
+end
--- a/app/controllers/admins/banned_users_controller.rb
+++ b/app/controllers/admins/banned_users_controller.rb
@ -0,0 +1,66 @@
+class Admins::BannedUsersController < Admins::BaseController
+  # include Admins::BaseHelper
+
+  def index
+    @menu_type = 8
+    @sub_type = 6
+    #被禁言的用户
+    all_banned_users = BannedForum.includes(:memo, :author, user: :user_extensions)
+    banned_true = all_banned_users.where(is_banned: true)
+    @banned_users_size = banned_true.size
+    @banned_type = params[:banned_type] || "banned"
+    @search_params = params[:search] || nil
+    if @banned_type == "banned"
+      banned_users = banned_true
+
+    else
+      banned_users = all_banned_users.where(is_banned: false)
+    end
+
+    if @search_params.present?
+      banned_users = banned_users.joins(:user).where("LOWER(users.login) LIKE ? or LOWER(concat(users.lastname, users.firstname)) LIKE ?", "%#{@search_params}%", "%#{@search_params}%")
+    end
+
+    banned_users = banned_users.order("updated_at desc")
+    @banned_users_count = banned_users.size
+    @banned_users = paginate banned_users
+    # page = (params[:page] || 1).to_i
+    # per_page = 15
+
+    
+    # @banned_users_pages = Paginator.new @banned_users_count, per_page, page
+    # @banned_users = banned_users.limit(@banned_users_pages.per_page).offset(@banned_users_pages.offset).to_a
+
+  end
+
+  def confirm_banned
+    if params[:user_id].blank? || params[:id].blank?
+      @status = -1
+      @message = "参数缺失"
+    else
+      before_users_banned = BannedForum.where(user_id:params[:user_id])
+
+      banned_params = {
+        user_id: params[:user_id],
+        author_id: current_user.id,
+        memo_id: params[:id],
+        is_banned: false,
+        banned_count: before_users_banned.present? ? (before_users_banned.last.banned_count + 1) : 1
+      }
+      new_banned = BannedForum.new(banned_params)
+      if new_banned.save
+        before_users_banned&.update_all(is_banned: false) if before_users_banned.present?
+        @status = 1
+        @message = "取消禁言成功"
+      else
+        @status = -1
+        @message = "取消禁言失败，请稍后重试"
+      end
+    end
+
+
+  end
+
+
+
+end
--- a/app/controllers/admins/base_controller.rb
+++ b/app/controllers/admins/base_controller.rb
@ -43,4 +43,30 @@ class Admins::BaseController < ApplicationController
  def setup_laboratory
    Laboratory.current = Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1)
  end
+
+  def up_and_down(opr,current_target,position,model_name)
+    modal_target = model_name.capitalize.classify.constantize
+    if model_name == "forum_section"  #只有root才能移动
+      modal_target = modal_target.roots
+    end
+    if opr.to_s == "up"
+      last_target = modal_target.where("position > ?",position)&.first
+      if last_target.present?
+        current_target.update_attribute(:position, last_target.position)
+        last_target.update_attribute(:position, position) # 重新获取当前问题的位置
+        return 0
+      else
+        return -1
+      end
+    elsif opr.to_s == "down"
+      next_target = modal_target.where("position < ?",position)&.last
+      if next_target.present?
+        current_target.update_attribute(:position, next_target.position)
+        next_target.update_attribute(:position, position)
+        return 0
+      else
+        return -1
+      end
+    end
+  end
 end
--- a/app/controllers/admins/forum_applies_controller.rb
+++ b/app/controllers/admins/forum_applies_controller.rb
@ -0,0 +1,89 @@
+class Admins::ForumAppliesController < Admins::BaseController
+  # include Admins::BaseHelper
+
+  def index
+    @menu_type = 8
+    @sub_type = 7
+    all_forum_applies = ApplyForum.includes(:forum_section,:reviews, user: :user_extensions)
+    @select_type = params[:select_type] || "unconfirm"
+    @section_name = params[:section_name] || nil
+    @search_name = params[:user_name] || nil
+    if @select_type == "unconfirm"
+      forum_applies = all_forum_applies.where(is_confirm: 0)
+    else
+      forum_applies = all_forum_applies.where(is_confirm: [1,2])
+    end
+
+    if @section_name.present?
+      forum_applies = forum_applies.joins(:forum_section).where("forum_sections.title like ?", "%#{@section_name}%")
+    end
+
+    if @search_name.present?
+      forum_applies = forum_applies.joins(:user).where("LOWER(users.login) LIKE ? or LOWER(concat(users.lastname, users.firstname)) LIKE ?", "%#{@search_name}%", "%#{@search_name}%")
+    end
+    forum_applies = forum_applies.order("apply_forums.updated_at desc")
+    @forum_applies_count = forum_applies.size
+    @forum_applies = paginate forum_applies
+    # page = (params[:page] || 1).to_i
+    # per_page = 15
+
+   
+    # @forum_applies_pages = Paginator.new @forum_applies_count, per_page, page
+    # @forum_applies = forum_applies.limit(@forum_applies_pages.per_page).offset(@forum_applies_pages.offset).to_a
+
+  end
+
+  def confirm_apply
+    @forum_apply = ApplyForum.find(params[:id])
+    @is_confirm = params[:is_confirm].to_i
+
+    review_result = params[:review_result].to_i
+    review_params = {
+      review_status: review_result,
+      reason: params[:reason].present? ? params[:reason] : nil,
+      user_id: current_user.id,
+      reviewable_type: "ApplyForum",
+      reviewable_id: params[:id],
+      source: "apply_forum"
+    }
+    if Review.exists?(reviewable_type: "ApplyForum", reviewable_id: params[:id], source: "apply_forum")
+      this_review = Review.where(reviewable_type: "ApplyForum", reviewable_id: params[:id], source: "apply_forum").first
+      if this_review.update_attributes(review_params)
+        @status = 1
+        @message = "操作成功"
+      else
+        @status = -1
+        @message = "操作失败"
+      end
+    else
+      review = Review.new(review_params)
+      if review.save
+        @status = 1
+        @message = "操作成功"
+      else
+        @status = -1
+        @message = "操作失败"
+      end
+    end
+
+    if @status > 0
+      @forum_apply.update_attributes(is_confirm: (review_result+1),deal_time: Time.now)
+      exists_moder = ForumModerator.where(user_id: @forum_apply.user_id,forum_section_id: @forum_apply.forum_section_id)
+      if review_result == 1
+        exists_moder.delete_all if exists_moder.exists?
+      elsif review_result == 0
+        unless exists_moder.exists?
+          ForumModerator.create(user_id: @forum_apply.user_id, forum_section_id: @forum_apply.forum_section_id,is_children: @forum_apply.forum_section.try(:parent_id).present?)
+        end
+      end
+
+      Tiding.where(container_type: "ForumSection", container_id: @forum_apply.forum_section_id, status: 0).update_all(status: 1)
+      Tiding.create(:user_id => @forum_apply.user_id, :trigger_user_id => 1,
+                    container_id: @forum_apply.forum_section_id, container_type: 'ForumSection',
+                    :parent_container_id => @forum_apply.id, :parent_container_type => "ApplyForum",
+                    :viewed => 0,status: 1, :tiding_type => "System",extra: "4")
+    end
+
+  end
+
+end
--- a/app/controllers/admins/forum_moderators_controller.rb
+++ b/app/controllers/admins/forum_moderators_controller.rb
@ -0,0 +1,59 @@
+class Admins::ForumModeratorsController < Admins::BaseController
+  before_action :set_forum
+
+  def new
+
+  end
+
+  def create
+    user_ids = params[:member_ids]
+    is_children = @forum_section.parent_id.present?
+    if user_ids.present? && user_ids.size > 0
+      user_ids = user_ids.reject(&:blank?)
+      user_ids.each do |user_id|
+        unless ForumModerator.exists?(user_id: user_id, forum_section_id: @forum_section.id)
+          @forum_section.forum_moderators.create!(user_id: user_id, is_children: is_children)
+        end
+        unless is_children
+          children_forum_sections = @forum_section.children_forum
+          children_forum_sections.each do |children|
+            unless ForumModerator.exists?(user_id: user_id, forum_section_id: children.id)
+              children.forum_moderators.create!(user_id: user_id, is_children: true)
+            end
+          end
+        end
+      end
+
+      @forum_moderators = @forum_section.forum_moderators
+      @forum_status = 1
+    else
+      @forum_status = -1
+    end
+  end
+
+  def destroy
+    @forum_moderator = ForumModerator.find_by_id(params[:id])
+    @forum_moderator.destroy
+  end
+
+  def search_user
+    return_html = ""
+    user_name = params[:user_name].strip
+    if user_name.present?
+      users = User.where("( LOWER(login) LIKE ? or LOWER(concat(lastname, firstname)) LIKE ? or LOWER(mail) LIKE ? )",
+                         "%#{user_name}%","%#{user_name}%","%#{user_name}%")
+      users.each do |u|
+        check_html = "<div class='search-user-check'><input id='check_user_#{u.login}' class='magic-checkbox mr4' type='checkbox' name='member_ids[]' value=""#{u.id}"" checked='false'><label for='check_user_#{u.login}'>#{u.try(:show_real_name)}</label></div>"
+        return_html << check_html
+      end
+    end
+    render json: {html: return_html }
+  end
+
+  private
+
+  def set_forum
+    @forum_section = ForumSection.find_by_id(params[:forum_section_id])
+  end
+
+end
--- a/app/controllers/admins/forum_sections_controller.rb
+++ b/app/controllers/admins/forum_sections_controller.rb
@ -0,0 +1,153 @@
+#论坛的板块设置
+class Admins::ForumSectionsController < Admins::BaseController
+  before_action :set_forum, except: [:index, :new,:create]
+
+  def index
+    @menu_type = 8
+    @sub_type = 5
+
+    forum_sections = ForumSection.roots.includes(:forum_moderators).order("position desc")
+    @max_position = forum_sections&.maximum(:position).to_i
+    @min_position = forum_sections&.minimum(:position).to_i
+    @forum_sections_count = forum_sections.size
+    # page = (params[:page] || 1).to_i
+    # per_page = 15
+    # @forum_sections_pages = Paginator.new @forum_sections_count, per_page, page
+    # @forum_sections = forum_sections.limit(@forum_sections_pages.per_page).offset(@forum_sections_pages.offset).to_a
+    @forum_sections = paginate forum_sections
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def new
+    @parent_id = params[:parent_id]
+    @forum_section = ForumSection.new
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def create
+    attachment_id = params[:attachments]&.first
+    positions = ForumSection.pluck(:position).select { |a| a.is_a? Integer }
+    positions = positions.max.to_i
+    if params[:forum_section][:parent_id].present?
+      @parent_forum = ForumSection.find_by_id(params[:forum_section][:parent_id])
+    end
+    if params[:forum_section][:title].blank?
+      forum_status = 0
+      forum_msg = "标题不能为空"
+    elsif params[:forum_section][:title].strip.length > 20
+      forum_status = 0
+      forum_msg = "不能超过最大限制：20个字符"
+    elsif ForumSection.exists?(title: params[:forum_section][:title].strip)
+      forum_status = 0
+      forum_msg = "不能重名"
+    else
+      forum_section_params = {
+        user_id: current_user.id,
+        title: params[:forum_section][:title].strip,
+        position: positions + 1,
+        parent_id: params[:forum_section][:parent_id],
+        is_recommend: false,
+        description: params[:forum_section][:description].to_s.truncate(200)
+      }
+      @forum_section = ForumSection.new(forum_section_params)
+      if @forum_section.save
+        if attachment_id.present?
+          attachment = Attachment.find(attachment_id)
+          attachment.container = @forum_section
+          attachment.save
+          @forum_section.attachment_id = attachment_id
+          @forum_section.save
+        end
+        forum_status = 1
+        forum_msg = "创建成功"
+      else
+        forum_status = -1
+        forum_msg = "创建失败,请重试"
+      end
+    end
+    @forum_status = {status: forum_status, msg: forum_msg}
+  end
+
+  def edit
+    @children_forum = params[:children_forum]
+    @attachment = @forum_section.image_attachment
+  end
+
+  def update
+    attachment_id = params[:attachments]&.first
+    if params[:forum_section][:title].blank?
+      forum_status = 0
+      forum_msg = "名称不能为空"
+    elsif params[:forum_section][:title].strip.length > 20
+      forum_status = 0
+      forum_msg = "不能超过最大限制：20个字符"
+    elsif params[:forum_section][:title].strip != @forum_section.title && ForumSection.exists?(title: params[:forum_section][:title].strip)
+      forum_status = 0
+      forum_msg = "不能重名"
+    else
+      
+      if @forum_section.update_attributes(title: params[:forum_section][:title].strip, description: params[:forum_section][:description].to_s.truncate(200))
+
+        unless attachment_id.blank? ||  @forum_section.attachment_id.to_i == attachment_id.to_i
+          Attachment.where(id: @forum_section.attachment_id.to_i).destroy_all if @forum_section.attachment_id.present?
+          attachment = Attachment.find(attachment_id)
+          attachment.container = @forum_section
+          attachment.save
+          @forum_section.attachment_id = attachment_id
+          @forum_section.save
+        end
+        forum_status = 1
+        forum_msg = "更新成功"
+      else
+        forum_status = -1
+        forum_msg = "更新失败,请重试"
+      end
+    end
+    @edit_forum_status = {status: forum_status, msg: forum_msg}
+  end
+
+  def destroy
+    if @forum_section.destroy
+      delete_status = 1
+      delete_msg = "删除成功"
+    else
+      delete_status = -1
+      delete_msg = "删除失败,请稍后重试"
+    end
+    @delete_status = {status: delete_status, msg: delete_msg}
+  end
+
+  def order_forums
+    @children_forums = @forum_section.get_children_section("asc")
+  end
+
+  def recommend_forums
+    @forum_section.update_attribute(:is_recommend, params[:is_recommend])
+  end
+
+  def move
+    cate_opt = params[:opr]
+    cate_position = @forum_section.position.to_i
+    move_status = up_and_down(cate_opt,@forum_section,cate_position,"forum_section")
+    if move_status == 0
+      @c_msg = "移动成功"
+    else
+      @c_msg = "移动失败"
+    end
+    redirect_to admins_forum_sections_path
+  end
+
+  private
+
+  def set_forum
+    @forum_section = ForumSection.find_by_id(params[:id])
+  end
+
+
+
+end
--- a/app/controllers/admins/memo_reply_lists_controller.rb
+++ b/app/controllers/admins/memo_reply_lists_controller.rb
@ -0,0 +1,16 @@
+class Admins::MemoReplyListsController < Admins::BaseController
+
+  def index 
+    @memo_hidden_type = params[:hidden] || ""
+    memos = Memo.where("parent_id is not null").includes(:author, :parent)
+    if @memo_hidden_type.present?
+      memos = memos.where(hidden: @memo_hidden_type.to_s == "hidden")
+    end
+    memos = memos.order("created_at desc")
+    @memos = paginate memos
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+end
--- a/app/controllers/admins/memos_controller.rb
+++ b/app/controllers/admins/memos_controller.rb
@ -0,0 +1,79 @@
+class Admins::MemosController < Admins::BaseController
+  # include Admins::BaseHelper
+  # 帖子
+  def index
+    @memo_hidden_type = params[:hidden] || ""
+
+    memos = Memo.where(parent_id: nil).includes(:author)
+    if @memo_hidden_type.present?
+      memos = memos.where(hidden: @memo_hidden_type.to_s == "hidden")
+    end
+    memos = memos.order("created_at desc")
+    @memos = paginate memos
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def memo_homepage_show
+    memo = Memo.find params[:id]
+    memo.update_column(:homepage_show, params[:checked]) unless memo.hidden?
+    render :json => {status: 1, message: "设置成功!"}
+  end
+
+  def memo_hidden
+    memo = Memo.find params[:id]
+    if params[:checked].to_s == 'true'
+      publish_time = Time.now
+      action_type = "passed"
+      extra = "1"
+    else
+      publish_time = nil
+      action_type = "refuse"
+      extra = "2"
+    end
+    memo.update_attributes(hidden: !(params[:checked].to_s == 'true'), published_at: publish_time) # 勾选代表不隐藏，所以要取反
+    CheckedAction.create!(user_id: current_user.id,checkable_type: "Memo",checkable_id: params[:id], action_type: action_type, action_at: Time.now)
+
+
+    if !memo.hidden? && memo.parent_id.present? && !memo.tidings.exists?(user_id: memo.parent.author_id,trigger_user_id: memo.author_id, extra: "3")
+      Tiding.create(:user_id => memo.parent.author_id, :trigger_user_id => memo.author_id,
+                 container_id: memo.id, container_type: 'Memo',
+                 :parent_container_id => memo.root_id, :parent_container_type => "Memo",
+                 :viewed => 0, :tiding_type => "Comment", :extra => "3")
+
+    elsif !memo.hidden?  && memo.parent_id.blank?
+      Tiding.create(:user_id => memo.author_id, :trigger_user_id => current_user.id,
+                    container_id: memo.id, container_type: 'Memo',
+                    :viewed => 0, :tiding_type => "Comment",:extra => extra)
+
+    end
+    render :json => {status: 1, message: "设置成功!"}
+  end
+
+  def delete_memo
+    memo = Memo.find params[:id]
+    memo.destroy if memo.hidden?
+    redirect_to memo.parent_id.present? ? admins_memo_reply_lists_path : admins_memos_path
+  end
+
+  # def memo_reply_list
+  #   @menu_type = 8
+  #   @sub_type = 4
+  #   @memo_hidden_type = params[:hidden] || ""
+  #   Rails.logger.info("======================sub_type==================#@sub_type")
+
+  #   memos = Memo.where("parent_id is not null").includes(:author, :parent)
+  #   if @memo_hidden_type.present?
+  #     memos = memos.where(hidden: @memo_hidden_type.to_s == "hidden")
+  #   end
+  #   memos = memos.order("created_at desc")
+  #   @memos = paginate memos
+  #   respond_to do |format|
+  #     format.html
+  #     format.js
+  #   end
+  # end
+
+end
--- 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
@ -343,8 +343,7 @@ class ApplicationController < ActionController::Base
 			elsif params[:debug] == 'student'
 				User.current = User.find 8686
 			elsif params[:debug] == 'admin'
-				logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
-				user =  User.find 36480
+				user = User.find 1
 				User.current = user
 				cookies.signed[:user_id] = user.id
 			end
@ -385,7 +384,11 @@ class ApplicationController < ActionController::Base
 	end

 	def current_user
-		User.current
+		if Rails.env.development?
+			User.current = User.find 1
+		else
+			User.current
+		end
 	end

 	## 默认输出json
@ -680,14 +683,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
@ -749,7 +744,7 @@ class ApplicationController < ActionController::Base
    namespace = params[:owner]
    id = params[:repo] || params[:id]

-    @project, @owner = Project.find_with_namespace(namespace, id)
+    @project = Project.find_with_namespace(namespace, id)

    if @project and current_user.can_read_project?(@project)
 			logger.info "###########： has project and can read project"
@ -767,14 +762,9 @@ class ApplicationController < ActionController::Base
 	end

 	def load_repository
-		@repository ||= load_project&.repository
+		@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/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -92,6 +92,44 @@ class AttachmentsController < ApplicationController
    end
  end

+  #后台上传图片
+  def upload_images
+    upload_file = params["file"] || params["#{params[:file_param_name]}"]# 这里的file_param_name是为了方便其他插件名称
+    raise "未上传文件" unless upload_file
+
+    folder = edu_setting('attachment_folder')
+    raise "存储目录未定义" unless folder.present?
+    month_folder = current_month_folder
+    save_path = File.join(folder, month_folder)
+
+    ext = SecureRandom.urlsafe_base64
+
+    local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
+
+    content_type = upload_file.content_type.presence || 'application/octet-stream'
+
+    disk_filename = local_path[save_path.size + 1, local_path.size]
+
+    @attachment = Attachment.where(disk_filename: disk_filename,author_id: current_user.id).first
+    if @attachment.blank?
+      @attachment = Attachment.new
+      @attachment.filename = upload_file.original_filename
+      @attachment.disk_filename = disk_filename
+      @attachment.filesize = upload_file.tempfile.size
+      @attachment.content_type = content_type
+      @attachment.digest = digest
+      @attachment.author_id = current_user.id
+      @attachment.disk_directory = month_folder
+      @attachment.save!
+      @status = 1
+    else
+      @status = -1
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
  def destroy
    begin
      @file_path = absolute_path(local_path(@file))
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@ -0,0 +1,36 @@
+# encoding=utf-8
+class CategoriesController < ApplicationController
+  before_action :require_login, :except => [:all]
+  include ApplicationHelper
+
+  # 所有类型，通过参数过滤
+  def all
+    render_react
+  end
+
+  def guide
+    render_react
+  end
+
+  def techShare
+    render_react
+  end
+
+  def show
+    render_react
+  end
+
+  def shixun_discuss
+    render_react
+  end
+
+  # 我的发布
+  def my_published
+
+  end
+
+  private
+  def render_react
+    render "/common/index", :layout => false
+  end
+end
--- a/app/controllers/ci/base_controller.rb
+++ b/app/controllers/ci/base_controller.rb
@ -1,76 +0,0 @@
-class Ci::BaseController < ApplicationController
-  include Ci::DbConnectable
-
-  before_action :require_login
-  before_action :connect_to_ci_db
-
-  def load_repo
-    namespace = params[:owner]
-    id = params[:repo] || params[:id]
-
-    @ci_user, @repo = Ci::Repo.find_with_namespace(namespace, id)
-  end
-
-  def load_all_repo
-    namespace = current_user.login
-    @repos = Ci::Repo.find_all_with_namespace(namespace)
-  end
-
-  def load_repo_by_repo_slug(slug)
-    @repo_slug = Ci::Repo.load_repo_by_repo_slug(slug)
-  end
-
-  private
-    def authorize_access_project!
-      unless @project.manager?(current_user)
-        return render_forbidden
-      end
-    end
-
-    def authenticate_manager!
-      unless @project.manager?(current_user)
-        return render_forbidden
-      end
-    end
-
-    def authenticate_admin!
-      return render_forbidden unless current_user.admin?
-    end
-
-    def authorize_owner!
-      unless @project.owner?(current_user)
-        return render_forbidden
-      end
-    end
-
-    def find_cloud_account
-      @cloud_account ||= current_user.ci_cloud_account
-      @cloud_account.blank? ? nil : @cloud_account
-    end
-
-    def load_ci_user
-      @ci_user ||= Ci::User.find_by(user_login: params[:owner])
-      @ci_user.blank? ? raise("未找到相关的记录") : @ci_user
-    end
-
-  def connect_to_ci_db(options={})
-    current = current_user
-    owner = params[:owner]
-    if owner
-      current = User.find_by(login: owner)
-    end
-
-    if !(current && !current.is_a?(AnonymousUser) && !current.devops_uninit?)
-      return
-    end
-
-    if current.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-      connect_to_trustie_ci_database(options)
-    else
-      options = options.merge(db_name: current.login)
-      connect_to_ci_database(options)
-    end
-
-  end
-
-end
--- a/app/controllers/ci/builds_controller.rb
+++ b/app/controllers/ci/builds_controller.rb
@ -1,53 +0,0 @@
-class Ci::BuildsController < Ci::BaseController
-  include RepositoriesHelper
-
-  before_action :load_project
-  before_action :authorize_owner!, only: [:restart, :stop]
-  before_action :load_repo
-  before_action :find_cloud_account, except: [:index, :show]
-
-  def index
-    @user = current_user
-
-    scope = Ci::Builds::ListQuery.call(@repo, params)
-
-    @total_count = scope.map(&:build_id).size
-    @builds = paginate scope
-  end
-
-  def show
-    @build = @repo.builds.includes(stages: [:steps]).find_by(build_number: params[:build])
-  end
-
-  def restart
-    result = Ci::Drone::API.new(@ci_user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, number: params[:build]).restart
-
-    render json: result
-  end
-
-  def stop
-    result = Ci::Drone::API.new(@ci_user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, number: params[:build]).stop
-    render json: result
-  end
-
-  def logs
-    # TODO **待优化**
-    # 因直接操作ci库，如下查询待优化，可直接根据log id查询即可
-    build = @repo.builds.find_by(build_number: params[:build])
-    return render_not_found("Couldn't found build with 'number'= #{params[:build]}") if build.blank?
-
-    stage = build.stages.includes(steps: [:log]).find_by(stage_number: params[:stage])
-    return render_not_found("Couldn't found build with 'number'= #{params[:stage]}") if stage.blank?
-
-    step = stage.steps.find_by(step_number: params[:step])
-    return render_not_found("Couldn't found build with 'number'= #{params[:step]}") if step.blank?
-
-    log = step.log
-
-    result = log.blank? ? nil : (log.log_data[0..5].include?('null') ? nil : JSON.parse(log.log_data))
-
-    # result = Ci::Drone::API.new(@user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, build: params[:build], stage: params[:stage], step: params[:step]).logs
-
-    render json: result
-  end
-end
--- a/app/controllers/ci/cloud_accounts_controller.rb
+++ b/app/controllers/ci/cloud_accounts_controller.rb
@ -1,129 +0,0 @@
-class Ci::CloudAccountsController < Ci::BaseController
-  include Ci::CloudAccountManageable
-
-  skip_before_action :connect_to_ci_db, only: %i[create bind trustie_bind]
-  before_action :load_project, only: %i[create activate]
-  before_action :authorize_owner!, only: %i[create activate]
-  before_action :load_repo, only: %i[activate]
-  before_action :load_all_repo, only: %i[unbind]
-  before_action :find_cloud_account, only: %i[show oauth_grant]
-  before_action :validate_params!, only: %i[create bind]
-  before_action only: %i[create bind] do
-    connect_to_ci_database(master_db: true)
-  end
-
-  def create
-    flag, msg = check_bind_cloud_account!
-    return render_error(msg) if flag === true
-
-    ActiveRecord::Base.transaction do
-      @cloud_account = bind_account!
-      if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
-        raise ActiveRecord::Rollback
-      else
-        current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
-        render_ok(redirect_url: @cloud_account.authenticate_url)
-      end
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def activate
-    return render_error('请先认证') unless current_user.ci_certification?
-
-    begin
-      @cloud_account = Ci::CloudAccount.find params[:id]
-      ActiveRecord::Base.transaction do
-        if @repo
-          return render_error('该项目已经激活') if @repo.repo_active?
-          @repo.activate!(@project)
-        else
-          @repo = Ci::Repo.auto_create!(@ci_user, @project)
-          @user.update_column(:user_syncing, false)
-        end
-
-        result = bind_hook!(current_user, @cloud_account, @repo)
-        @project.update_columns(open_devops: true, gitea_webhook_id: result['id'])
-        @cloud_account.update_column(:ci_user_id, @ci_user.user_id)
-      end
-      render_ok
-    rescue Exception => ex
-      render_error(ex.message)
-    end
-  end
-
-  def show
-  end
-
-  def bind
-    flag, msg = check_bind_cloud_account!
-    return render_error(msg) if flag === true
-
-    ActiveRecord::Base.transaction do
-      @cloud_account = bind_account!
-      if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
-        raise ActiveRecord::Rollback
-      else
-        current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
-      end
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def trustie_bind
-    account = params[:account].to_s
-    return render_error("account不能为空.") if account.blank?
-
-    flag, msg = check_trustie_bind_cloud_account!
-    return render_error(msg) if flag === true
-
-    ActiveRecord::Base.transaction do
-      @cloud_account = trustie_bind_account!
-      if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
-        raise ActiveRecord::Rollback
-      else
-        current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
-      end
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def unbind
-    ActiveRecord::Base.transaction do
-      if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-        if @repos
-          @repos.each do |repo|
-            repo.deactivate!
-          end
-        end
-      end
-      unbind_account!
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def oauth_grant
-    password = params[:password].to_s
-    return render_error('你输入的密码不正确.') unless current_user.check_password?(password)
-
-    oauth = current_user.oauths.last
-    return render_error("服务器出小差了.") if oauth.blank?
-
-    result = gitea_oauth_grant!(password, oauth)
-    return render_error('授权失败.') unless result === true
-    current_user.set_drone_step!(User::DEVOPS_CERTIFICATION)
-  end
-
-  private
-    def validate_params!
-      Ci::CreateCloudAccountForm.new(devops_params).validate!
-    end
-end
--- a/app/controllers/ci/languages_controller.rb
+++ b/app/controllers/ci/languages_controller.rb
@ -1,20 +0,0 @@
-class Ci::LanguagesController < Ci::BaseController
-  # TODO 需要开启权限认证，只有该项目devops初始化成功后才能获取语言列表
-  before_action :find_langugae, only: :show
-
-  def index
-    @languages = Ci::Language.by_usage_amount_desc
-  end
-
-  def show
-  end
-
-  def common
-    @languages = Ci::Language.six_common
-  end
-
-  private
-    def find_langugae
-      @language = Ci::Language.find params[:id]
-    end
-end
--- a/app/controllers/ci/pipelines_controller.rb
+++ b/app/controllers/ci/pipelines_controller.rb
@ -1,294 +0,0 @@
-class Ci::PipelinesController < Ci::BaseController
-
-  before_action :require_login, only: %i[list create content]
-  skip_before_action :connect_to_ci_db, except: %i[list create destroy content]
-  before_action :load_project, only: %i[create content]
-  before_action :load_repo, only: %i[create content]
-
-  # ======流水线相关接口========== #
-  def list
-    @result = Array.new
-    list = Ci::Pipeline.where('identifier=? and owner=?', params[:identifier], params[:owner])
-    # 查询build状态
-    list.collect do |pipeline|
-      pipeline.last_build_time = nil
-      repo = load_repo_by_repo_slug("#{pipeline.owner}/#{pipeline.identifier}")
-      if repo
-        build = repo.builds.order("build_created desc").find_by(build_target: pipeline.branch)
-        if build
-          pipeline.pipeline_status = build.build_status
-          pipeline.last_build_time = Time.at(build.build_created)
-        end
-      end
-      @result.push(pipeline)
-    end
-    @total_count = @result.size
-    @pipelines = paginate @result
-  end
-
-  def create
-    ActiveRecord::Base.transaction do
-      size = Ci::Pipeline.where('branch=? and identifier=? and owner=?', params[:branch], params[:repo], params[:owner]).size
-      if size > 0
-        render_error("#{params[:branch]}分支已经存在流水线！")
-        return
-      end
-      pipeline = Ci::Pipeline.new(pipeline_name: params[:pipeline_name], file_name: params[:file_name],owner: params[:owner],
-                                  login: current_user.login, identifier: params[:repo], branch: params[:branch], event: params[:event])
-      pipeline.save!
-
-      # 默认创建四个初始阶段
-      init_stages = Ci::PipelineStage::INIT_STAGES
-      index = 1
-      init_stages.each do |type, name|
-        pipeline.pipeline_stages.build(
-          stage_name: name,
-          stage_type: type,
-          show_index: index
-        ).save!
-        index += 1
-      end
-      create_pipeline_file(pipeline)
-      create_ci_repo(pipeline)
-      render_ok({id: pipeline.id})
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  # 在代码库创建文件
-  def create_pipeline_file(pipeline)
-    sha = get_pipeline_file_sha(pipeline.file_name, pipeline.branch)
-    if sha
-      logger.info "#{pipeline.file_name}已存在"
-    else
-      interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params)
-      if interactor.success?
-        logger.info "#{pipeline.file_name}创建成功"
-      end
-    end
-  end
-
-  # 在drone数据库repo表新增一条repo记录
-  def create_ci_repo(pipeline)
-    if pipeline.branch != 'master'
-      create_params = {
-        repo_user_id: @ci_user.user_id,
-        repo_namespace: @project.owner.login,
-        repo_name: @project.identifier,
-        repo_slug: "#{@project.owner.login}/#{@project.identifier}-" + pipeline.id.to_s,
-        repo_clone_url: @project.repository.url,
-        repo_branch: pipeline.branch,
-        repo_config: pipeline.file_name
-      }
-      repo = Ci::Repo.create_repo(create_params)
-      repo
-    end
-    nil
-  end
-
-  def get_pipeline_file_sha(file_name, branch)
-    file_path_uri = URI.parse(file_name)
-    interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: branch || 'master')
-    if interactor.success?
-      file = interactor.result
-      file['sha']
-    end
-  end
-
-  def content_params
-    {
-      filepath: params[:file_name],
-      branch: params[:branch],
-      new_branch: params[:new_branch],
-      content: "#pipeline \n",
-      message: 'create pipeline',
-      committer: {
-        email: current_user.mail,
-        name: current_user.login
-      },
-      identifier: params[:repo]
-    }
-  end
-
-  def update
-    pipeline = Ci::Pipeline.find(params[:id])
-    if pipeline
-      pipeline.update!(pipeline_name: params[:pipeline_name],branch: params[:branch], event: params[:event])
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def destroy
-    pipeline = Ci::Pipeline.find(params[:id])
-    if pipeline
-      repo = load_repo_by_repo_slug("#{pipeline.login}/#{pipeline.identifier}-" + pipeline.id.to_s)
-      if repo
-        repo.destroy!
-      end
-      pipeline.destroy!
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def content
-    @yaml = "\n"
-    pipeline = Ci::Pipeline.find(params[:id])
-    stages = pipeline.pipeline_stages
-    if stages && !stages.empty?
-      init_step = stages.first.pipeline_stage_steps.first
-      @yaml += init_step.content + "\n" + "steps:\n"
-      stages = stages.slice(1, stages.size - 1)
-      unless stages.empty?
-        stages.each do |stage|
-          steps = stage.pipeline_stage_steps
-          next unless steps && !steps.empty?
-          steps.each do |step|
-            @yaml += step.content + "\n"
-          end
-        end
-      end
-    end
-    @sha = get_pipeline_file_sha(pipeline.file_name, pipeline.branch)
-    trigger = ''
-    trigger += "  branch:\r\n  - #{pipeline.branch}\r\n" unless pipeline.branch.blank?
-    unless pipeline.event.blank?
-      trigger += "  event:\r\n"
-      pipeline.event.split(',').each { |event| trigger += "  - #{event}\r\n"}
-    end
-    @yaml += "trigger:\r\n" + trigger unless trigger.blank?
-    @branch = pipeline.branch
-  end
-
-  # =========阶段相关接口========= #
-  def stages
-    pipeline_id = params[:id]
-    @pipeline_name = Ci::Pipeline.find(pipeline_id).pipeline_name
-    @pipeline_stages = Ci::PipelineStage.where('pipeline_id=?', pipeline_id).order('show_index asc')
-  end
-
-  def create_stage
-    ActiveRecord::Base.transaction do
-      # 修改stage排序
-      update_stage_index(params[:id], params[:show_index], 1)
-      pipeline_stage = Ci::PipelineStage.new(stage_name: params[:stage_name],
-                                             stage_type: params[:stage_type].blank? ? 'customize' : params[:stage_type],
-                                             pipeline_id: params[:id], show_index: params[:show_index])
-      pipeline_stage.save!
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def update_stage
-    pipeline_stage = Ci::PipelineStage.find(params[:stage_id])
-    if pipeline_stage
-      pipeline_stage.update!(stage_name: params[:stage_name])
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def delete_stage
-    ActiveRecord::Base.transaction do
-      update_stage_index(params[:id], params[:show_index].to_i, -1)
-      pipeline_stage = Ci::PipelineStage.find(params[:stage_id])
-      if pipeline_stage
-        pipeline_stage.destroy!
-      end
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def update_stage_index(pipeline_id, show_index, diff)
-    stages = Ci::Pipeline.find(pipeline_id).pipeline_stages
-    stages.each do |stage|
-      if stage.show_index >= show_index
-        stage.update!(show_index: stage.show_index + diff)
-      end
-    end
-  end
-
-  # ========步骤相关接口========= #
-  def steps
-    @stage_type = Ci::PipelineStage.find(params[:stage_id]).stage_type
-    @pipeline_stage_steps = Ci::PipelineStageStep.where('stage_id=?', params[:stage_id]).order('show_index asc')
-  end
-
-  def stage_step
-    ActiveRecord::Base.transaction do
-      steps = params[:steps]
-      unless steps.empty?
-        steps.each do |step|
-          unless step[:template_id]
-            render_error('请选择模板！')
-            return
-          end
-          if !step[:id]
-            step = Ci::PipelineStageStep.new(step_name: step[:step_name], stage_id: params[:stage_id],
-                                             template_id: step[:template_id], content: step[:content], show_index: step[:show_index])
-            step.save!
-          else
-            pipeline_stage_step = Ci::PipelineStageStep.find(step[:id])
-            pipeline_stage_step.update(step_name: step[:step_name], content: step[:content],
-                                       show_index: step[:show_index], template_id: step[:template_id])
-          end
-        end
-      end
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def create_stage_step
-    ActiveRecord::Base.transaction do
-      steps = params[:steps]
-      unless steps.empty?
-        steps.each do |step|
-          step = Ci::PipelineStageStep.new(step_name: step[:step_name], stage_id: params[:stage_id],
-                                           template_id: step[:template_id], content: step[:content], show_index: step[:show_index])
-          step.save!
-        end
-      end
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def update_stage_step
-    ActiveRecord::Base.transaction do
-      steps = params[:steps]
-      unless steps.empty?
-        steps.each do |step|
-          pipeline_stage_step = Ci::PipelineStageStep.find(step[:id])
-          if pipeline_stage_step
-            pipeline_stage_step.update(step_name: step[:step_name], content: step[:content], template_id: step[:template_id])
-          end
-        end
-      end
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def delete_stage_step
-    pipeline_stage_step = Ci::PipelineStageStep.find(params[:step_id])
-    if pipeline_stage_step
-      pipeline_stage_step.destroy!
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-end
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@ -1,70 +0,0 @@
-class Ci::ProjectsController < Ci::BaseController
-  include RepositoriesHelper
-  include Ci::CloudAccountManageable
-
-  before_action :load_project
-  before_action :load_repo, only: [:update_trustie_pipeline, :activate, :deactivate]
-  before_action :authorize_owner!, only: [:authorize]
-  before_action :find_cloud_account, only: [:authorize, :activate, :deactivate]
-
-  def authorize
-    @user = current_user
-  end
-
-  # get .trustie-pipeline.yml file
-  def get_trustie_pipeline
-    file_path_uri = URI.parse('.trustie-pipeline.yml')
-    interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: params[:ref] || "master")
-    if interactor.success?
-      file = interactor.result
-      return render json: {} if file[:status]
-
-      json = {name: file['name'], path: file['path'], sha: file['sha'], content: render_decode64_content(file['content'])}
-      render json: json
-    end
-  end
-
-  def update_trustie_pipeline
-    interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, params[:owner], params.merge(identifier: @project.identifier))
-    if interactor.success?
-      @file = interactor.result
-      render_result(1, "更新成功")
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  def activate
-    return render_error('你还未认证') unless current_user.ci_certification?
-
-    begin
-      ActiveRecord::Base.transaction do
-        if @repo
-          return render_error('该项目已经激活') if @repo.repo_active?
-          @repo.activate!(@project)
-          return render_ok
-        else
-          @repo = Ci::Repo.auto_create!(@ci_user, @project)
-          @ci_user.update_column(:user_syncing, false)
-        end
-
-        result = bind_hook!(current_user, @cloud_account, @repo)
-        @project.update_columns(open_devops: true, gitea_webhook_id: result['id'])
-        @project.increment!(:open_devops_count)
-        @cloud_account.update_column(:ci_user_id, @ci_user.user_id)
-      end
-      render_ok
-    rescue Exception => ex
-      render_error(ex.message)
-    end
-  end
-
-  def deactivate
-    return render_error('该项目已经取消激活') if !@repo.repo_active?
-
-    @project.update_column(:open_devops, false)
-    @repo.deactivate_repos!
-    render_ok
-  end
-
-end
--- a/app/controllers/ci/secrets_controller.rb
+++ b/app/controllers/ci/secrets_controller.rb
@ -1,53 +0,0 @@
-class Ci::SecretsController < Ci::BaseController
-
-  before_action :load_repo
-
-  # 参数列表
-  def index
-    result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], nil).secrets
-    @secrets = result
-  end
-
-  #新增、更新参数
-  def create
-    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
-      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
-      if result["id"]
-        render_ok
-      else
-        render_error(result["message"])
-      end
-    end
-  end
-
-  #删除参数
-  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
-      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/ci/templates_controller.rb
+++ b/app/controllers/ci/templates_controller.rb
@ -1,104 +0,0 @@
-class Ci::TemplatesController < Ci::BaseController
-
-  before_action :require_login, only: %i[list create]
-  skip_before_action :connect_to_ci_db
-
-  #======模板管理======#
-  def list
-    stage_type = params[:stage_type]
-    template_name = params[:name]
-    templates = template_name.blank? ? Ci::Template.all : Ci::Template.where("template_name like ?", "%#{template_name}%")
-    templates = templates.select{ |template| template.login == current_user.login} unless current_user.admin?
-    if !stage_type.blank?  && stage_type != 'all'
-      templates = templates.select{ |template| template.stage_type == stage_type}
-    end
-    @total_count = templates.map(&:id).count
-    @templates = paginate templates
-  end
-
-  def show
-    @template = Ci::Template.find(params[:id])
-  end
-
-  def create
-    stage_type = params[:stage_type]
-    category = params[:category]
-    if category.blank?
-      category = Ci::Template::STAGE_TYPES[:"#{stage_type}"]
-    end
-
-    if params[:id]
-      template = Ci::Template.find(params[:id])
-      if template
-        template.update!(template_name: params[:template_name],
-                         stage_type: stage_type,
-                         category: category,
-                         parent_category: Ci::Template::STAGE_TYPES[:"#{stage_type}"],
-                         content: params[:content],
-                         login: current_user.admin? ? 'admin' : current_user.login
-        )
-      end
-    else
-      template = Ci::Template.new(template_name: params[:template_name],
-                                  stage_type: stage_type,
-                                  category: category,
-                                  parent_category: Ci::Template::STAGE_TYPES[:"#{stage_type}"],
-                                  content: params[:content],
-                                  login: current_user.admin? ? 'admin' : current_user.login
-      )
-      template.save!
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def update
-    template = Ci::Template.find(params[:id])
-    template.update!(template_name: params[:template_name],
-                     stage_type: params[:stage_type],
-                     category: params[:category],
-                     parent_category: params[:parent_category],
-                     content: params[:content]
-    )
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def destroy
-    template = Ci::Template.find(params[:id])
-    if template
-      template.destroy!
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  #======流水线模板查询=====#
-  def templates_by_stage
-    stage_type = params[:stage_type]
-    if stage_type != Ci::PipelineStage::CUSTOMIZE_STAGE_TYPE
-      @templates = Ci::Template.where("stage_type = ?", stage_type)
-      @templates = @templates.select{ |template| template.login == current_user.login || template.login == 'admin'} unless current_user.admin?
-      if stage_type == Ci::PipelineStage::INIT_STAGE_TYPE && !@templates.nil?
-        @templates.each do |template|
-          content = template.content
-          unless content.blank?
-            pipeline = Ci::Pipeline.find(params[:id])
-            template.content = content.gsub(/{name}/, pipeline.pipeline_name) unless pipeline.nil?
-          end
-        end
-      end
-      # 根据模板类别分组
-      @category_templates = @templates.group_by{ |template| template.category }
-    else
-      # 自定义阶段，按阶段分类分类返回模板列表
-      @templates = Ci::Template.where("stage_type != ?", Ci::PipelineStage::INIT_STAGE_TYPE)
-      @templates = @templates.select{ |template| template.login == current_user.login || template.login == 'admin'} unless current_user.admin?
-      @category_templates = @templates.group_by{ |template| template.parent_category }
-    end
-  end
-
-end
--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@ -1,31 +0,0 @@
-class CompareController < ApplicationController
-  # skip_before_action :require_login
-  before_action :load_repository
-
-  def index
-  end
-
-  def show
-    compare
-  end
-
-  private
-  def compare
-    base, head = compare_params
-
-    # TODO: 处理fork的项目向源项目发送PR的base、head参数问题
-    @compare_result ||=
-      head.include?(":") ? gitea_compare(base, head) : gitea_compare(head, base)
-  end
-
-  def compare_params
-    base = Addressable::URI.unescape(params[:base])
-    head = params[:head].include?('json') ? params[:head]&.split('.json')[0] : params[:head]
-
-    [base, head]
-  end
-
-  def gitea_compare(base, head)
-    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head)
-  end
-end
--- a/app/controllers/concerns/ci/cloud_account_manageable.rb
+++ b/app/controllers/concerns/ci/cloud_account_manageable.rb
@ -1,209 +0,0 @@
-module Ci::CloudAccountManageable
-  extend ActiveSupport::Concern
-
-  included do
-  end
-
-  # 自有服务器绑定流程
-  def bind_account!
-    # 1. 保存华为云服务器帐号
-    create_params = devops_params.merge(ip_num: IPAddr.new(devops_params[:ip_num].strip).to_i, secret: Ci::CloudAccount.encrypted_secret(devops_params[:secret]), server_type: Ci::CloudAccount::SERVER_TYPE_SELF)
-
-    cloud_account = Ci::CloudAccount.new(create_params)
-    cloud_account.user = current_user
-    cloud_account.save!
-
-    # 2. 生成oauth2应用程序的client_id和client_secrete
-    gitea_oauth = Gitea::Oauth2::CreateService.call(current_user.gitea_token, {name: "pipeline-#{SecureRandom.hex(8)}", redirect_uris: ["#{cloud_account.drone_url}/login"]})
-    logger.info "######### gitea_oauth: #{gitea_oauth}"
-
-    raise 'Gitea接口异常' if gitea_oauth['client_id'].blank?
-
-    oauth = Oauth.new(client_id: gitea_oauth['client_id'],
-      client_secret: gitea_oauth['client_secret'],
-      redirect_uri: gitea_oauth['redirect_uris'],
-      gitea_oauth_id: gitea_oauth['id'],
-      user_id: current_user.id)
-    oauth.save!
-
-    # 创建数据ci端数据库
-    database_result = auto_create_database!(@connection, "#{current_user.login}_drone")
-    logger.info "[CI::DbConnectable] auto_create_database's result: #{database_result}"
-
-    # 初始化表结构
-    sub_connection = connect_to_ci_database
-    auto_create_table_structure!(sub_connection)
-
-    rpc_secret = SecureRandom.hex 16
-    logger.info "######### rpc_secret: #{rpc_secret}"
-
-    # 3. 创建drone server
-    drone_server_cmd = Ci::Drone::Server.new(current_user.login, oauth.client_id, oauth.client_secret, cloud_account.drone_host, rpc_secret).generate_cmd
-    logger.info "######### drone_server_cmd: #{drone_server_cmd}"
-
-    # 4. 创建drone client
-    drone_client_cmd = Ci::Drone::Client.new(oauth.client_id, cloud_account.drone_ip, rpc_secret).generate_cmd
-    logger.info "######### drone_client_cmd: #{drone_client_cmd}"
-
-    # 5. 登录远程服务器，启动drone服务
-    result = Ci::Drone::Start.new(cloud_account.account, cloud_account.visible_secret, cloud_account.drone_ip, drone_server_cmd, drone_client_cmd).run
-    logger.info "######### result: #{result}"
-
-
-    redirect_url = "#{cloud_account.drone_url}/login"
-    logger.info "######### redirect_url: #{redirect_url}"
-
-    return nil unless result.present?
-    result && !result.blank? ? cloud_account : nil
-  end
-
-  def trustie_drone_server_config
-    # 读取drone配置信息
-    config = Rails.application.config_for(:configuration).symbolize_keys!
-    trustie_drone_config = config[:trustie_drone].symbolize_keys!
-    return trustie_drone_config
-  end
-
-  # trustie提供服务器,绑定流程
-  def trustie_bind_account!
-    trustie_drone_config = trustie_drone_server_config
-    raise 'trustie_drone config missing' if trustie_drone_config.blank?
-
-    # 创建云账号
-    create_params = devops_params.merge(ip_num: IPAddr.new(trustie_drone_config[:ip_num].strip).to_i, secret: Ci::CloudAccount.encrypted_secret(trustie_drone_config[:secret]), server_type: Ci::CloudAccount::SERVER_TYPE_TRUSTIE)
-    cloud_account = Ci::CloudAccount.new(create_params)
-    cloud_account.user = current_user
-    cloud_account.save!
-
-    #生成oauth2应用程序的client_id和client_secrete
-    gitea_oauth = Gitea::Oauth2::CreateService.call(current_user.gitea_token, {name: "pipeline-#{SecureRandom.hex(8)}", redirect_uris: ["#{cloud_account.drone_url}/login"]})
-    logger.info "######### gitea_oauth: #{gitea_oauth}"
-
-    raise 'Gitea接口异常' if gitea_oauth['client_id'].blank?
-
-    oauth = Oauth.new(client_id: gitea_oauth['client_id'],
-                      client_secret: gitea_oauth['client_secret'],
-                      redirect_uri: gitea_oauth['redirect_uris'],
-                      gitea_oauth_id: gitea_oauth['id'],
-                      user_id: current_user.id)
-    result = oauth.save!
-
-    redirect_url = "#{cloud_account.drone_url}/login"
-    logger.info "######### redirect_url: #{redirect_url}"
-
-    return nil unless result.present?
-    result ? cloud_account : nil
-  end
-
-  def unbind_account!
-    cloud_account = current_user.ci_cloud_account
-    return render_error('你未绑定CI服务器') if current_user.devops_step == User::DEVOPS_UNINIT || cloud_account.blank?
-
-    if cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_SELF
-      @connection.execute("DROP DATABASE IF EXISTS #{current_user.login}_drone") # TOTO drop drone database
-    end
-
-    cloud_account.destroy! unless cloud_account.blank?
-    current_user.unbind_account!
-  end
-
-  def bind_hook!(user, cloud_account, repo)
-    hook_params = {
-      active: true,
-      config: {
-        content_type: "json",
-        url: cloud_account.drone_url + "/hook?secret=#{repo.repo_signer}"
-      },
-      type: "gitea"
-    }
-    result = Gitea::Hooks::CreateService.call(user.gitea_token, user.login, repo.repo_name, hook_params)
-
-    result[:status].present? ? nil : result
-  end
-
-  def check_bind_cloud_account!
-    return [true, "你已经绑定了云帐号."] unless current_user.ci_cloud_account.blank?
-
-    ip_num = IPAddr.new(devops_params[:ip_num]).to_i
-
-    #自有服务器进行判断
-    cloud_account = current_user.ci_cloud_account
-    if cloud_account && cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_SELF
-      Ci::CloudAccount.exists?(ip_num: ip_num) ? [true, "#{devops_params[:ip_num]}服务器已被使用."] : [false, nil]
-    end
-  end
-
-  def check_trustie_bind_cloud_account!
-    return [true, "你已经绑定了云帐号."] unless current_user.ci_cloud_account.blank?
-  end
-
-  def gitea_auto_create_auth_grant!(gitea_oauth_id)
-    connection = Gitea::Database.set_connection.connection
-    unix_time = Time.now.to_i
-
-    # 目前直接操作db，可以建立对应的model进行操作
-    sql = "REPLACE INTO oauth2_grant ( user_id, application_id, counter, created_unix, updated_unix ) VALUES ( #{current_user.gitea_uid}, #{gitea_oauth_id}, 0, #{unix_time}, #{unix_time} );"
-    connection.execute(sql)
-
-    #如果使用trustie提供的服务器，需要多增加一条授权信息
-    if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-      trustie_drone_config = trustie_drone_server_config
-      admin_application_id = trustie_drone_config[:admin_application_id]
-      sql = "REPLACE INTO oauth2_grant ( user_id, application_id, counter, created_unix, updated_unix ) VALUES ( #{current_user.gitea_uid}, #{admin_application_id}, 0, #{unix_time}, #{unix_time} );"
-      connection.execute(sql)
-    end
-  end
-
-  def gitea_oauth_grant!(password, oauth)
-    gitea_auto_create_auth_grant!(oauth&.gitea_oauth_id)
-
-    state = SecureRandom.hex(8)
-    # redirect_uri eg:
-    #  https://localhost:3000/login/oauth/authorize?client_id=94976481-ad0e-4ed4-9247-7eef106007a2&redirect_uri=http%3A%2F%2F121.69.81.11%3A80%2Flogin&response_type=code&state=9cab990b9cfb1805
-    redirect_uri = CGI.escape("#{@cloud_account.drone_url}/login")
-    clientId = client_id(oauth)
-    grant_url = "#{Gitea.gitea_config[:domain]}/login/oauth/authorize?client_id=#{clientId}&redirect_uri=#{redirect_uri}&response_type=code&state=#{state}"
-    logger.info "[gitea] grant_url: #{grant_url}"
-
-    conn = Faraday.new(url: grant_url) do |req|
-      req.request :url_encoded
-      req.adapter Faraday.default_adapter
-      req.basic_auth(current_user.login, password)
-    end
-
-    response = conn.get
-    logger.info "[gitea] response headers: #{response.headers}"
-
-    drone_oauth_user!(response.headers.to_h['location'], state)
-  end
-
-  def drone_oauth_user!(url, state)
-    logger.info "[drone] drone_oauth_user url: #{url}"
-    conn = Faraday.new(url: url) do |req|
-      req.request :url_encoded
-      req.adapter Faraday.default_adapter
-      req.headers["cookie"] = "_session_=#{SecureRandom.hex(28)}; _oauth_state_=#{state}"
-    end
-
-    response = conn.get
-    logger.info "[drone] response headers: #{response.headers}"
-
-    response.headers['location'].include?('error') ? false : true
-  end
-
-  private
-    def devops_params
-      params.permit(:account, :secret, :ip_num)
-    end
-
-  def client_id(oauth)
-    #如果是使用trustie服务器使用管理员用户的clientId
-    if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-      trustie_drone_config = trustie_drone_server_config
-      return trustie_drone_config[:client_id]
-    else
-      return oauth&.client_id
-    end
-  end
-
-end
--- a/app/controllers/concerns/ci/db_connectable.rb
+++ b/app/controllers/concerns/ci/db_connectable.rb
@ -1,59 +0,0 @@
-module Ci::DbConnectable
-  extend ActiveSupport::Concern
-
-  included do
-  end
-
-  # Dynamically sets the database connection.
-  def connect_to_ci_database(options={})
-    master_db = options[:master_db] || false
-    config = Rails.application.config_for(:configuration).symbolize_keys!
-    db_config = config[:ci_db_server].symbolize_keys!
-    raise 'ci database config missing' if db_config.blank?
-
-    req_params = {
-      host: db_config[:host],
-      username: db_config[:username],
-      password: db_config[:password],
-      port: db_config[:port]
-    }
-    db_name = options[:db_name].blank? ? current_user.login : options[:db_name]
-    req_params = req_params.merge(database: "#{db_name}_#{db_config[:database]}") unless master_db === true
-
-    db_params = Ci::Database.get_connection_params(req_params)
-    @connection = Ci::Database.set_connection(db_params).connection
-  end
-
-  def connect_to_trustie_ci_database(options={})
-    master_db = options[:master_db] || false
-    config = Rails.application.config_for(:configuration).symbolize_keys!
-    db_config = config[:ci_db_server_trustie].symbolize_keys!
-    raise 'ci database config missing' if db_config.blank?
-
-    req_params = {
-        host: db_config[:host],
-        username: db_config[:username],
-        password: db_config[:password],
-        port: db_config[:port]
-    }
-
-    req_params = req_params.merge(database: "#{db_config[:database]}") unless master_db === true
-    db_params = Ci::Database.get_connection_params(req_params)
-    @trustie_db_connection = Ci::Database.set_connection(db_params).connection
-  end
-
-  def auto_create_database!(connection, database)
-    Rails.logger.info "[CI::DbConnectable] auto_create_database's connection: #{connection}"
-    connection.execute("CREATE DATABASE IF NOT EXISTS #{database}")
-  end
-
-  def auto_create_table_structure!(connection)
-    Rails.logger.info "[CI::DbConnectable] auto_create_table_structure's connection: #{connection}"
-
-    sqls = Ci::Schema.statement.split(';').map(&:strip).reject { |e| e.to_s.empty? }
-    sqls.each do |sql|
-      con_result = connection.execute(sql)
-      Rails.logger.info "=============> ci create tabels result: #{con_result}"
-    end
-  end
-end
--- a/app/controllers/concerns/laboratory_helper.rb
+++ b/app/controllers/concerns/laboratory_helper.rb
@ -39,7 +39,7 @@ module LaboratoryHelper
      new_course: "https://www.trustie.net/courses/new",
      edit_account: "https://www.trustie.net/my/account",
      my_courses: "https://www.trustie.net/users/#{current_user.try(:login)}/user_courselist",
-      my_projects: "/users/#{current_user.try(:login)}/projects",
+      my_projects: "https://forgeplus.trustie.net/users/#{current_user.try(:login)}/projects",
      my_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations",
      default_url: "https://www.trustie.net/",
      tiding_url: "https://www.trustie.net/users/#{current_user.try(:login)}/user_messages",
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@ -127,8 +127,6 @@ module LoginHelper
    token = config[:sync_token]
    api_host = config[:sync_url]

-    return if api_host.blank?
-
    url = "#{api_host}/api/v1/users/sync_user_token"
    sync_json = {
      "token": token,
--- 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
@ -1,22 +1,20 @@
 module RegisterHelper
  extend ActiveSupport::Concern

-  def autologin_register(username, email, password, platform= 'forge')
+  def autologin_register(username, email, password, platform= '')
    result = {message: nil, user: nil}

    user = User.new(admin: false, login: username, mail: email, type: "User")
    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?
      gitea_user = interactor.result
-      result = Gitea::User::GenerateTokenService.call(username, password)
+      result = Gitea::User::GenerateTokenService.new(username, password).call
      user.gitea_token = result['sha1']
-      user.gitea_uid = gitea_user[:body]['id']
+      user.gitea_uid = gitea_user['id']
      if user.save!
        UserExtension.create!(user_id: user.id)
        result[:user] = {id: user.id, token: user.gitea_token}
--- a/app/controllers/concerns/repository/languages_percentagable.rb
+++ b/app/controllers/concerns/repository/languages_percentagable.rb
@ -1,19 +0,0 @@
-module Repository::LanguagesPercentagable
-  extend ActiveSupport::Concern
-
-  def languages_precentagable
-    result = Gitea::Repository::Languages::ListService.call(@owner.login,
-      @repository.identifier, current_user&.gitea_token)
-
-    result[:status] === :success ? hash_transform_precentagable(result[:body]) : nil
-  end
-
-  # hash eq:{"JavaScript": 301681522,"Ruby": 1444004,"Roff": 578781}
-  def hash_transform_precentagable(hash)
-    total_byte_size = hash.values.sum
-    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/customers_controller.rb
+++ b/app/controllers/customers_controller.rb
@ -0,0 +1,11 @@
+class CustomersController < ApplicationController
+  def show 
+    targets = UsersService.new.user_info params, current_user
+    render json: targets
+  end
+
+  def edit_brief 
+    targets = UsersService.new.edit_brief params, current_user
+    render json: targets
+  end
+end
--- a/app/controllers/forum_sections_controller.rb
+++ b/app/controllers/forum_sections_controller.rb
@ -0,0 +1,101 @@
+class ForumSectionsController < ApplicationController
+
+  def index 
+    targets = ForumSectionsService.new.index params
+    render json: targets
+  end
+
+  def select_sections
+    targets = ForumSectionsService.new.select_sections
+    render json: targets
+  end
+
+  def user_apply
+    targets = ForumSectionsService.new.user_apply params, current_user, current_user_ip
+    render json: targets
+  end
+
+  def edit_notice
+    targets = ForumSectionsService.new.edit_notice params
+    render json: targets
+  end
+
+  def forum_section_header
+    targets = ForumSectionsService.new.forum_section_header params, current_user
+    render json: targets
+  end
+
+  def create 
+    targets = ForumSectionsService.new.create params, current_user
+    render json: targets
+  end
+
+  def rename 
+    targets = ForumSectionsService.new.rename params, current_user
+    render json: targets
+  end
+
+  def destroy_forum 
+    targets = ForumSectionsService.new.destroy params, current_user
+    render json: targets
+  end
+
+  def order_forums
+    targets = ForumSectionsService.new.order_forums params, current_user
+    render json: targets
+  end
+
+  def search_users
+    targets = ForumSectionsService.new.search_users params, current_user
+    render json: targets
+  end
+
+  def add_users
+    targets = ForumSectionsService.new.add_users params, current_user
+    render json: targets
+  end
+
+  def managements
+    targets = ForumSectionsService.new.managements params, current_user
+    render json: targets
+  end
+
+  def applied_forums
+    targets = ForumSectionsService.new.applied_forums params, current_user
+    render json: targets
+  end
+
+  def deal_applies
+    targets = ForumSectionsService.new.deal_applies params, current_user
+    render json: targets
+  end
+
+  def destroy_moderator
+    targets = ForumSectionsService.new.destroy_moderator params, current_user
+    render json: targets
+  end
+
+  def unchecked_memos
+    targets = ForumSectionsService.new.unchecked_memos params, current_user
+    render json: targets
+  end
+
+  def unchecked_replies
+    targets = ForumSectionsService.new.unchecked_replies params, current_user
+    render json: targets
+  end
+
+  def checked_memos
+    targets = ForumSectionsService.new.checked_memos params, current_user
+    render json: targets
+  end
+
+  private 
+
+  def current_user_ip
+    env['REMOTE_ADDR']
+  end
+
+
+
+end
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@ -0,0 +1,434 @@
+# encoding=utf-8
+# For react
+class ForumsController < ApplicationController
+  before_action :require_login, :only => [:new, :edit]
+  include ApplicationHelper
+
+  def show
+    render_react
+  end
+
+  def new
+    render_react
+  end
+
+  def index
+    render_react
+  end
+
+
+  def edit
+    render_react
+  end
+
+  def shixun_discuss
+    render_react
+  end
+
+  def manage
+    render_react
+  end
+
+  def detail
+    render_react
+  end
+
+  def theme
+    render_react
+  end
+
+  private
+  def render_react
+    render file: 'public/react/build/index.html', :layout => false
+  end
+
+end
+
+
+# # encoding: utf-8
+# # added by fq
+# class ForumsController < ApplicationController
+#   layout "users_base"
+#   include ApplicationHelper
+#   # GET /forums
+#   # GET /forums.json
+#   before_action :find_forum_if_available
+#   before_action :authenticate_user_edit, :only => [:edit, :update]
+#   before_action :authenticate_user_destroy, :only => [:destroy]
+#   before_action :require_login, :only => [:new, :create,:destroy,:update,:edit]
+#   before_action :check_authentication
+#
+#   helper :sort
+#   include SortHelper
+#
+#   PageLimit = 20
+#   def create_feedback
+#     if User.current.logged?
+#       #@memo = Memo.new(params[:memo])
+#       #@memo.forum_id = "1"
+#       #@memo.author_id = User.current.id
+#       #@forum = @memo.forum
+#       cs = CommentService.new
+#       @memo,message = cs.create_feedback params,User.current
+#       respond_to do |format|
+#         if !@memo.new_record?
+#           if params[:direct]
+#             format.html { redirect_to forums_path() }
+#           else
+#             format.html { redirect_to forum_path(@memo.forum) }
+#           end
+#           # format.html { redirect_to forum_path(@memo.forum) }
+#         else
+#           sort_init 'updated_at', 'desc'
+#           sort_update 'created_at' => "#{Memo.table_name}.created_at",
+#                       'replies' => "#{Memo.table_name}.replies_count",
+#                       'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+#
+#           @topic_count = @forum.topics.count
+#           @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+#           @memos = @forum.topics.
+#               reorder("#{Memo.table_name}.sticky DESC").
+#               includes(:last_reply).
+#               limit(@topic_pages.per_page).
+#               offset(@topic_pages.offset).
+#               order(sort_clause).
+#               preload(:author, {:last_reply => :author}).
+#               all
+#
+#           flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
+#           # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
+#           format.html { render action: :show, layout: 'base_forums' }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
+#           format.json { render json: @memo.errors, status: :unprocessable_entity }
+#         end
+#       end
+#     else
+#       respond_to do |format|
+#         format.html { redirect_to signin_path }
+#       end
+#     end
+#   end
+#
+#   def mail_feedback
+#     @user = User.where(:id => params[:user_id]).first
+#     unless @user.nil?
+#       cs = CommentService.new
+#       @memo, message = cs.create_feedback params, @user
+#     end
+#     respond_to do |format|
+#       format.js
+#     end
+#   end
+#
+#   def forum_create_memo
+#     @memo = Memo.new
+#     @my_forums_count = Forum.where(:creator_id => User.current.id).count
+#     @my_memos_count = Memo.where(:author_id => User.current.id).count
+#     @forums = Forum.reorder("topic_count desc,updated_at desc")
+#     respond_to do |format|
+#       format.js
+#       format.html {render layout: 'base_new_forum'}
+#     end
+#   end
+#
+#   def create_memo
+#     @memo = Memo.new(params[:memo])
+#     @memo.forum_id = @forum.id
+#     @memo.author_id = User.current.id
+#
+#     @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
+#
+#     respond_to do |format|
+#       if @memo.save
+#         if params[:asset_id]
+#          ids = params[:asset_id].split(',')
+#          update_kindeditor_assets_owner ids ,@memo.id,OwnerTypeHelper::MEMO
+#         end
+#         #end
+#         format.html { redirect_to (forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id))), notice: "#{l :label_memo_create_succ}" }
+#         format.json { render json: @memo, status: :created, location: @memo }
+#       else
+#         sort_init 'updated_at', 'desc'
+#         sort_update 'created_at' => "#{Memo.table_name}.created_at",
+#                     'replies' => "#{Memo.table_name}.replies_count",
+#                     'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+#
+#         @topic_count = @forum.topics.count
+#         @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+#         @memos = @forum.topics.
+#                         reorder("#{Memo.table_name}.sticky DESC").
+#                         includes(:last_reply).
+#                         limit(@topic_pages.per_page).
+#                         offset(@topic_pages.offset).
+#                         order(sort_clause).
+#                         preload(:author, {:last_reply => :author}).
+#                         all
+#         @memos
+#         flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
+#         # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
+#         format.html { render action: :show, layout: 'base_forums' }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
+#         format.json { render json: @memo.errors, status: :unprocessable_entity }
+#       end
+#     end
+#   end
+#
+#   # id: 1 问题反馈   3 操作指南  5 技术分享
+#   def index
+#
+#     render "/common/index", :layout => false
+#   end
+#
+#   # GET /forums/1
+#   # GET /forums/1.json
+#   def show
+#     # sort_init 'updated_at', 'desc'
+#     # sort_update 'created_at' => "#{Memo.table_name}.created_at",
+#     #             'replies' => "#{Memo.table_name}.replies_count",
+#     #             'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+#     order = ""
+#     @order_str = ""
+#     if(params[:reorder_complex])
+#       order = "#{Memo.table_name}.sticky desc, last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}"
+#       @order_str = "reorder_complex="+params[:reorder_complex]
+#     elsif(params[:reorder_popu])
+#       order = "#{Memo.table_name}.sticky desc, replies_count #{params[:reorder_popu]}"
+#       @order_str = "reorder_popu="+params[:reorder_popu]
+#     elsif(params[:reorder_time])
+#      order = "#{Memo.table_name}.sticky desc, #{Memo.table_name}.updated_at #{params[:reorder_time]}"
+#      @order_str = "reorder_time="+params[:reorder_time]
+#     else
+#       order = "#{Memo.table_name}.sticky desc, #{Memo.table_name}.updated_at desc"
+#       @order_str = "reorder_time=desc"
+#     end
+#     @memo = Memo.new(:forum => @forum)
+#     @topic_count = @forum.topics.count
+#     @limit = 20
+#     @is_remote = true
+#     @topic_pages = Paginator.new @topic_count, @limit, params['page'] || 1
+#     @memos =  paginateHelper @forum.topics.includes(:last_reply).reorder(order).preload(:author, {:last_reply => :author}), @limit
+#     @my_topic_count =   Memo.where("forum_id = #{@memo.forum_id} and parent_id is null").count
+#     @my_replies_count =  Memo.where("forum_id = #{@memo.forum_id} and parent_id is not null").count
+#     @errors = params[:errors]
+#     # 推荐贴吧
+#     @forums = Forum.where("id !=?", @forum.id).reorder("topic_count desc,updated_at desc").first(3)
+#     respond_to do |format|
+#       format.js
+#       format.html {
+#         render :layout => 'base_new_forum'
+#       }# show.html.erb
+#       format.json { render json: @forum }
+#     end
+#   end
+#
+#   # GET /forums/new
+#   # GET /forums/new.json
+#   def new
+#     @forum = Forum.new
+#     respond_to do |format|
+#       format.html # new.html.erb
+#       format.js
+#       format.json { render json: @forum }
+#     end
+#   end
+#
+#   # GET /forums/1/edit
+#   def edit
+#     @forum = Forum.find(params[:id])
+#     respond_to do |format|
+#       format.html
+#       format.js
+#     end
+#   end
+#
+#   # POST /forums
+#   # POST /forums.json
+#   def create
+#     @forum = Forum.new(params[:forum])
+#     @forum.creator_id = User.current.id
+#     if @forum.save
+#       # Time 2015-03-24 17:07:05
+#       # Author lizanle
+#       # Description after save后需要进行资源记录的更新
+#       # owner_type = 2 对应的是 forum
+#       @save_flag = true
+#       if params[:asset_id]
+#         ids = params[:asset_id].split(',')
+#         update_kindeditor_assets_owner ids, @forum.id, OwnerTypeHelper::FORUM
+#       end
+#       #end
+#       respond_to do |format|
+#           format.js{ redirect_to forums_path, notice: l(:label_forum_create_succ)}
+#           format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
+#           format.json { render json: @forum, status: :created, location: @forum }
+#       end
+#     else
+#       @save_flag=false
+#       respond_to do |format|
+#         flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}"
+#         format.js
+#         format.html { render action: "new" }
+#         format.json { render json: @forum.errors, status: :unprocessable_entity }
+#       end
+#     end
+#   end
+#
+#   # PUT /forums/1
+#   # PUT /forums/1.json
+#   def update
+#     @forum = Forum.find(params[:id])
+#     respond_to do |format|
+#       if @forum.update_attributes(params[:forum])
+#         format.js
+#         format.html { redirect_to @forum, notice: l(:label_forum_update_succ) }
+#         format.json { head :no_content }
+#       else
+#         flash.now[:error] = "#{l :label_forum_update_fail}: #{@forum.errors.full_messages[0]}"
+#         format.js
+#         format.html { render action: "edit" }
+#         format.json { render json: @forum.errors, status: :unprocessable_entity }
+#       end
+#     end
+#   end
+#
+#   # DELETE /forums/1
+#   # DELETE /forums/1.json
+#   def destroy
+#     @forum = Forum.find(params[:id])
+#     @forum.destroy
+#
+#     respond_to do |format|
+#       format.html { redirect_to forums_url }
+#       format.json { head :no_content }
+#     end
+#   end
+#
+#   # 更新贴吧描述
+#   def update_memo_description
+#     @forum = Forum.find(params[:id])
+#     if @forum.blank?
+#       result = { :result => false }
+#     else
+#       forum_decription = params[:forum][:description]
+#       @forum.update_attributes(:description => forum_decription )
+#       result = { :result => true }
+#     end
+#     render :json => result
+#   end
+#
+#   def search_forum
+#     # @forums = paginateHelper Forum.where("name LIKE '%#{params[:name]}%'")
+#     q = "%#{params[:name].strip}%"
+#     (redirect_to forums_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
+#     @offset, @limit = api_offset_and_limit({:limit => 10})
+#     @forums_all = Forum.where("name LIKE ?", q)
+#     @forums_count = @forums_all.count
+#     @forums_pages = Paginator.new @forums_count, @limit, params['page']
+#
+#     @offset ||= @forums_pages.offset
+#     @forums = @forums_all.offset(@offset).limit(@limit).all
+#     respond_to do |format|
+#       format.html {
+#         render 'index'
+#       }
+#       format.json { render json: @forums }
+#     end
+#   end
+#
+#   def search_memo
+#     q = "%#{params[:name].strip}%"
+#
+#     limit = PageLimit
+#     @memo = Memo.new
+#     @offset, @limit = api_offset_and_limit({:limit => limit})
+#     @forum = Forum.find(params[:id])
+#     @memos_all = @forum.topics.where("subject LIKE ?", q)
+#     @topic_count = @memos_all.count
+#     @topic_pages = Paginator.new @topic_count, @limit, params['page']
+#
+#     @offset ||= @topic_pages.offset
+#     @memos = @memos_all.offset(@offset).limit(@limit).all
+#     respond_to do |format|
+#       format.html {
+#         render 'show', :layout => 'base_forums'
+#       }
+#       format.json { render json: @forum }
+#     end
+#   end
+#
+#   #检查forum的名字
+#   def check_forum_name
+#     begin
+#       forum_name = params[:forum_name]
+#       if params[:forum_id]
+#         result = Forum.where("name = '#{forum_name}' and id != #{params[:forum_id]}").first.blank? ? {:result => true} : {:result => false}
+#       else
+#         result = Forum.where(:name => forum_name).first.blank? ? {:result => true} : {:result => false}
+#       end
+#     rescue Exception => e
+#       puts e
+#     end
+#     render :json => result
+#    # if params[:forum_id]
+#    #   forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
+#    # else
+#    #   forum_name_exist = Forum.where("name = '#{params[:forum_name]}' ").count >= 1 ? true : false
+#    # end
+#    # render :text => forum_name_exist
+#   end
+#
+#
+#
+#
+#   #添加论坛tag
+#   def add_forum_tag
+#     @forum = Forum.find(params[:id])
+#     unless @forum.nil?
+#       @forum.tag_list.add(params[:tag_str].split(','))
+#       @forum.save
+#     end
+#     respond_to do |format|
+#       format.js {render :delete_forum_tag}
+#     end
+#   end
+#
+#   #删除forum的tag
+#   def delete_forum_tag
+#     @tag_id = (ActsAsTaggableOn::Tag.find_by_name(params[:tag_name])).id
+#     #forum的taggable_type = 5
+#     @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,params[:id],'Forum')
+#
+#     unless @taggings.nil?
+#       @taggings.delete
+#     end
+#
+#     # 是否还有其他记录 引用了 tag_id
+#     @tagging = ActsAsTaggableOn::Tagging.find_by_tag_id(@tag_id)
+#     # 如果taggings表中记录已经不存在 ，那么检查tags表 作删除动作
+#     if @tagging.nil?
+#       @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id)
+#       @tag.delete unless @tag.nil?
+#     end
+#     @forum = Forum.find(params[:id])
+#     respond_to do |format|
+#       format.js
+#     end
+#   end
+#
+#   private
+#
+#   def find_forum_if_available
+#     @forum = Forum.find(params[:id]) if params[:id]
+#   rescue ActiveRecord::RecordNotFound
+#     render_404
+#     nil
+#     end
+#
+#   def authenticate_user_edit
+#     find_forum_if_available
+#     render_403 unless @forum.editable_by? User.current
+#   end
+#
+#   def authenticate_user_destroy
+#     find_forum_if_available
+#     render_403 unless @forum.destroyable_by? User.current
+#   end
+# end
--- a/app/controllers/hooks_controller.rb
+++ b/app/controllers/hooks_controller.rb
@ -4,18 +4,18 @@ class HooksController < ApplicationController
  before_action :check_user
  before_action :set_repository

-  def index
-    hooks_response = Gitea::Hooks::ListService.new(@user.gitea_token, @user.login, @repository.try(:identifier)).call
-    if hooks_response.status == 200
+  def index 
+    hooks_response = Gitea::Hooks::ListService.new(@user, @repository.try(:identifier)).call
+    if hooks_response.status == 200 
      lists = JSON.parse(hooks_response.body)
      @hooks_size = lists.size
      @hooks = paginate(lists)
-    else
+    else 
      normal_status(-1, "出现错误")
    end
  end

-  def create
+  def create 
    #根据gitea的api
    # hook_params = {
    #   active: true,
@ -36,17 +36,17 @@ class HooksController < ApplicationController
    #   content_type: params[:content_type].to_i,
    #   secret: params[:secret],
    #   events: {
-    #     push_only: params[:push_only] || false, # 是否为推送事件
-    #     send_everything: params[:send_everything] || false, #是否为所有事件
+    #     push_only: params[:push_only] || false, # 是否为推送事件 
+    #     send_everything: params[:send_everything] || false, #是否为所有事件 
    #     choose_events: params[:choose_events] || false, #是否为自定义事件
    #     branch_filter: params[:branch_filter] || "*",
    #     events: {
    #       create: params[:create] || false,  #创建分支/标签
-    #       delete: params[:delete] || false, #删除分支/标签
-    #       fork: params[:fork] || false, #仓库被派生
+    #       delete: params[:delete] || false, #删除分支/标签 
+    #       fork: params[:fork] || false, #仓库被派生 
    #       issues: params[:issues] || false, #工单
-    #       issue_comment: params[:issue_comment] || false, #评论
-    #       push: params[:push] || false # 推送
+    #       issue_comment: params[:issue_comment] || false, #评论 
+    #       push: params[:push] || false # 推送 
    #       pull_request: params[:pull_request] || false #合并请求
    #       repository: params[:repository] || false #仓库
    #       release: params[:release] || false #版本发布
@ -58,28 +58,28 @@ class HooksController < ApplicationController
    Gitea::Hooks::CreateService.new(@user, @repository.try(:identifier), hook_params).call  #创建gitea的hook功能
    Gitea::Hooks::CreateService.new(user, p.try(:identifier), hook_params).call  #创建gitea的hook功能

-  end
+  end 

-  def update
+  def update 
    hook_params = params[:hook_params]
    response = Gitea::Hooks::UpdateService.new(@user, @repository.try(:identifier), hook_params, params[:id]).call
-    if response.status == 200
+    if response.status == 200 
      normal_status(1, "更新成功")
-    else
+    else 
      normal_status(-1, "更新失败")
    end
-  end
+  end 

-  def destroy
+  def destroy 
    response = Gitea::Hooks::DestroyService.new(@user, @repository.try(:identifier), params[:id]).call
    if response.status == 204
      normal_status(1, "删除成功")
-    else
+    else 
      normal_status(-1, "删除失败")
    end
-  end
+  end 

-  private
+  private 

  def set_repository
    @repository = @project.repository
@ -88,9 +88,9 @@ class HooksController < ApplicationController
    normal_status(-1, "用户不存在") unless @user.present?
  end

-  def check_user
-    unless @project.user_id == current_user.id
-      tip_exception(403, "您没有权限进入")
+  def check_user 
+    unless @project.user_id == current_user.id 
+      tip_exception(403, "您没有权限进入") 
    end
  end
 end
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -6,13 +6,12 @@ class IssuesController < ApplicationController
  before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue]

  before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue]
-  before_action :check_token_enough, only: [:create, :update]
+  before_action :get_branches, only: [:new, :edit]

  include ApplicationHelper
  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
@ -97,7 +96,8 @@ class IssuesController < ApplicationController
  end

  def new
-    @issue_chosen = get_associated_data(@project)
+    @all_branches = get_branches
+    @issue_chosen = issue_left_chosen(@project, nil)
  end

  def create
@ -105,6 +105,9 @@ class IssuesController < ApplicationController
      normal_status(-1, "标题不能为空")
    elsif params[:subject].to_s.size > 255
      normal_status(-1, "标题不能超过255个字符")
+    elsif (params[:issue_type].to_s == "2")
+      return normal_status(-1, "悬赏的奖金必须大于0") if params[:token].to_i == 0
+
    else
      issue_params = issue_send_params(params)

@ -133,30 +136,25 @@ class IssuesController < ApplicationController
                         tiding_type: 'issue', status: 0)
        end

-        #为悬赏任务时, 扣除当前用户的积分
-        if params[:issue_type].to_s == "2"
-          post_to_chain("minus", params[:token].to_i, current_user.try(:login))
-        end
-
        @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
-        render json: {status: 0, message: "创建成", id: @issue.id}
+        # normal_status(0, "创建成功",)
+        render :json => { status: 0, message: "创建成功", id:  @issue.id}
      else
        normal_status(-1, "创建失败")
      end
-
    end

  end

  def edit
+    # @all_branches = get_branches
    # @issue_chosen = issue_left_chosen(@project, @issue.id)
-    @cannot_edit_tags = @issue.issue_type=="2" && @issue.status_id == 5  #悬赏任务已解决且关闭的状态下，不能修改
    @issue_attachments = @issue.attachments
  end

  def update
-    last_token = @issue.token
-    last_status_id = @issue.status_id
+    issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
+    return normal_status(-1, "您没有权限修改token") if @issue.will_save_change_to_token? && @issue.user_id != current_user&.id
    if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
      @issue&.issue_tags_relates&.destroy_all
      params[:issue_tag_ids].each do |tag|
@ -164,22 +162,23 @@ class IssuesController < ApplicationController
      end
    end

-    issue_files = params[:attachment_ids]
-    change_files = false
-    issue_file_ids = []
+    if @issue.update_attributes(issue_params)
+      issue_files = params[:attachment_ids]
+      change_files = false
+      issue_file_ids = []

-    if issue_files.present?
-      change_files = true
-      issue_files.each do |id|
-        attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
-        unless attachment.blank?
-          attachment.container = @issue
-          attachment.author_id = current_user.id
-          attachment.description = ""
-          attachment.save
+      if issue_files.present?
+        change_files = true
+        issue_files.each do |id|
+          attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+          unless attachment.blank?
+            attachment.container = @issue
+            attachment.author_id = current_user.id
+            attachment.description = ""
+            attachment.save
+          end
        end
      end
-    end

      # if params[:issue_tag_ids].present?
      #   issue_current_tags = @issue&.issue_tags&.select(:id)&.pluck(:id)
@ -195,36 +194,17 @@ class IssuesController < ApplicationController
      #   end
      # end

-    if @issue.issue_type.to_s == "2" &&  params[:status_id].to_i == 5 && @issue.author_id != current_user.try(:id)
-      normal_status(-1, "不允许修改为关闭状态")
-    else
-      issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-
-      if @issue.update_attributes(issue_params)
-        if params[:status_id].to_i == 5  #任务由非关闭状态到关闭状态时
-          @issue.issue_times.update_all(end_time: Time.now)
-          @issue.update_closed_issues_count_in_project!
-          if @issue.issue_type.to_s == "2" && last_status_id != 5
-            if @issue.assigned_to_id.present? && last_status_id == 3 #只有当用户完成100%时，才给token
-              post_to_chain("add", @issue.token, @issue.get_assign_user.try(:login))
-            else
-              post_to_chain("add", @issue.token, @issue.user.try(:login))
-            end
-          end
-        end
-
-        if @issue.issue_type.to_s == "2" && @issue.status_id != 5 && @issue.saved_change_to_attribute("token")
-          #表示修改token值
-          change_token = last_token - @issue.token
-          change_type = change_token > 0 ? "add" : "minus"
-          post_to_chain(change_type, change_token.abs, current_user.try(:login))
-        end
-        @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
-        normal_status(0, "更新成功")
-      else
-        normal_status(-1, "更新失败")
+      if params[:status_id].to_i == 5
+        @issue.issue_times.update_all(end_time: Time.now)
+        # @issue.update_closed_issues_count_in_project!   #已经有after_update方法了，这里就不需要了
      end
+
+      @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
+      normal_status(0, "更新成功")
+    else
+      normal_status(-1, "更新失败")
    end
+
  end

  def show
@ -244,32 +224,17 @@ class IssuesController < ApplicationController
  end

  def destroy
-    begin
-      issue_type = @issue.issue_type
-      status_id = @issue.status_id
-      token = @issue.token
-      login =  @issue.user.try(:login)
-      if @issue.destroy
-        if issue_type == "2" && status_id != 5
-          post_to_chain("add", token, login)
-        end
-        normal_status(0, "删除成功")
-      else
-        normal_status(-1, "删除失败")
-      end
-    rescue => exception
-      Rails.logger.info("#########_______exception.message_________##########{exception.message}")
-      normal_status(-1, "删除失败")
+    if @issue.destroy
+      normal_status(0, "删除成功")
    else
+      normal_status(-1, "删除失败")
    end
-
  end

  def clean
-    #批量删除，暂时只能删除未悬赏的
    issue_ids = params[:ids]
    if issue_ids.present?
-      if Issue.where(id: issue_ids, issue_type: "1").destroy_all
+      if Issue.where(id: issue_ids).destroy_all
        normal_status(0, "删除成功")
      else
        normal_status(-1, "删除失败")
@ -341,9 +306,6 @@ class IssuesController < ApplicationController
      if type == 5
        @issue&.project_trends&.update_all(action_type: "close")
        @issue.issue_times.update_all(end_time: Time.now)
-        if @issue.issue_type.to_s == "2"
-          post_to_chain("add", @issue.token, @issue.get_assign_user.try(:login))
-        end
        if @issue.issue_classify.to_s == "pull_request"
          @issue&.pull_request&.update_attribute(:status, 2)
        end
@ -437,6 +399,17 @@ class IssuesController < ApplicationController
    tracker_array
  end

+  def get_branches
+    all_branches = []
+    get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @project&.repository.try(:identifier)).call
+    if get_all_branches && get_all_branches.size > 0
+      get_all_branches.each do |b|
+        all_branches.push(b["name"])
+      end
+    end
+    all_branches
+  end
+
  def issue_send_params(params)
    {
        subject: params[:subject],
@ -461,32 +434,4 @@ class IssuesController < ApplicationController
        project_id: @project.id
      }
  end
-
-  def post_to_chain(type, amount,login)
-    change_params = {
-      type: type,
-      chain_params: {
-        amount: amount,
-        reponame: @project.try(:identifier),
-        username: login
-      }
-    }
-    PostChainJob.perform_later(change_params)
-  end
-
-  def check_token_enough
-    if params[:issue_type].to_s == "2" && (@issue.blank? || (@issue.present? && @issue.author_id == current_user.try(:id)))
-      return normal_status(-1, "悬赏的奖金必须大于0") if params[:token].to_i == 0
-      query_params = {
-        type: "query",
-        chain_params: {
-          reponame: @project.try(:identifier),
-          username: current_user.try(:login)
-        }
-      }
-      response = Gitea::Chain::ChainGetService.new(query_params).call
-      return normal_status(-1, "获取token失败，请稍后重试") if response.status != 200
-      return normal_status(-1, "您的token值不足") if JSON.parse(response.body)["balance"].to_i < params[:token].to_i
-    end
-  end
 end
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@ -2,7 +2,7 @@ class MainController < ApplicationController
  protect_from_forgery except: :index
  skip_before_action :check_sign
  skip_before_action :user_setup
-  skip_before_action :setup_laboratory
+  # skip_before_action :setup_laboratory

  def first_stamp
    render :json => { status: 0, message: Time.now.to_i }
--- 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/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@ -0,0 +1,109 @@
+class MemosController < ApplicationController
+  before_action :require_login, only: [:create, :edit, :update, :watch_memo]
+
+  def index 
+    memos = MemosService.new.index params, current_user
+    render json: memos
+  end
+
+  def related_memos
+    targets = MemosService.new.related_memos params, current_user
+    render json: targets
+  end
+
+  def edit 
+    targets = MemosService.new.edit params, current_user
+    render json: targets
+  end
+
+  def update 
+    targets = MemosService.new.update params, current_user
+    render json: targets
+  end
+
+  def create 
+    params.permit!
+    targets = MemosService.new.create params, current_user
+    render json: targets
+  end
+
+  def show 
+    targets = MemosService.new.show params, current_user
+    render json: targets
+  end
+
+  def watch_memo
+    targets = MemosService.new.watch_memo params, current_user
+    render json: targets
+  end
+
+  def hidden 
+    Memo.find(params[:id]).update_attribute(:hidden, true)
+    {status: 0, message: "隐藏成功"}
+  end
+
+  def memo_hidden
+    targets = MemosService.new.memo_hidden params, current_user
+    render json: targets
+  end
+
+  def reply
+    targets = MemosService.new.reply params, current_user
+    render json: targets
+  end
+
+  def destroy
+    targets = MemosService.new.destroy params, current_user
+    render json: targets
+  end
+
+  def set_top_or_down
+    targets = MemosService.new.set_top_or_down params, current_user
+    render json: targets
+  end
+
+  def is_fine
+    targets = MemosService.new.is_fine params, current_user
+    render json: targets
+  end
+
+  def banned_user
+    targets = MemosService.new.banned_user params, current_user
+    render json: targets
+  end
+
+  def more_reply
+    targets = MemosService.new.more_reply params, current_user
+    render json: targets
+  end
+
+  def forum_memos
+    targets = MemosService.new.forum_memos params, current_user
+    render json: targets
+  end
+
+  def forum_memos_head
+    targets = MemosService.new.forum_memos_head params, current_user
+    render json: targets
+  end
+
+  def forum_memos_right
+    targets = MemosService.new.forum_memos_right params, current_user
+    render json: targets
+  end
+
+  def is_watch
+    targets =  MemosService.new.is_watch params, current_user
+    render json: targets
+  end
+
+  def confirm_delete
+    targets = MemosService.new.confirm_delete params, current_user
+    render json: targets
+  end
+
+  def plus
+    targets = MemosService.new.plus params, current_user
+    render json: targets
+  end
+end
--- a/app/controllers/my_memos_controller.rb
+++ b/app/controllers/my_memos_controller.rb
@ -0,0 +1,22 @@
+class MyMemosController < ApplicationController 
+
+  def index 
+    targets = MyMemosService.new.index params, current_user
+    render json: targets
+  end
+
+  def my_interested
+    targets = MyMemosService.new.my_interested params, current_user
+    render json: targets
+  end
+
+  def replies_memos
+    targets = MyMemosService.new.replies_memos params,current_user
+    render json: targets
+  end
+
+  def recommend_memos
+    targets = MyMemosService.new.recommend_memos current_user
+    render json: targets
+  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/plates_controller.rb
+++ b/app/controllers/plates_controller.rb
@ -0,0 +1,30 @@
+class PlatesController < ApplicationController
+  def index
+    render_react
+  end
+
+  def show
+    render_react
+  end
+
+  def all
+    render_react
+  end
+
+  def is_fine
+    render_react
+  end
+
+  def my_memos
+    render_react
+  end
+
+  def my_topics
+    render_react
+  end
+
+  private
+  def render_react
+    render "/common/index", :layout => false
+  end
+end
--- a/app/controllers/praise_tread_controller.rb
+++ b/app/controllers/praise_tread_controller.rb
@ -40,5 +40,8 @@ class PraiseTreadController < ApplicationController
  end

  private
+  def render_result
+
+  end

 end
--- a/app/controllers/project_categories_controller.rb
+++ b/app/controllers/project_categories_controller.rb
@ -6,8 +6,12 @@ class ProjectCategoriesController < ApplicationController
  end

  def group_list
-    @project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc)
-    # projects = Project.no_anomory_projects.visible
-    # @category_group_list = projects.joins(:project_category).group("project_categories.id", "project_categories.name").size
+    # if current_user&.logged?
+    #   projects = Project.list_user_projects(current_user.id)
+    # else
+    #   projects = Project.visible
+    # end
+    projects = Project.no_anomory_projects.visible
+    @category_group_list = projects.joins(:project_category).group("project_categories.id", "project_categories.name").size
  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,42 +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)
-
-    category_id = params[:category_id]
-    @total_count =
-      if category_id.blank?
-        ps = ProjectStatistic.first
-        ps.common_projects_count + ps.mirror_projects_count unless ps.blank?
-      else
-        cate = ProjectCategory.find_by(id: category_id)
-        cate&.projects_count || 0
-      end
+    @projects = kaminari_paginate(scope)
+    @total_count = @projects.total_count
  end

  def create
@ -60,48 +34,29 @@ 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 = Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call
  end

  def group_type_list
-    project_statics = ProjectStatistic.first
-
-    @project_statics_list = [
-      {
-        project_type: 'common',
-        name: '开源托管项目',
-        projects_count: project_statics&.common_projects_count || 0
-      },
-      {
-        project_type: 'mirror',
-        name: '开源镜像项目',
-        projects_count: project_statics&.mirror_projects_count || 0
-      }
-    ]
-
-    # projects = Project.no_anomory_projects.visible
-    # @project_group_list = projects.group(:project_type).size
+    # if current_user&.logged?
+    #   projects = Project.list_user_projects(current_user.id)
+    # else
+    #   projects = Project.visible
+    # end
+    projects = Project.no_anomory_projects.visible
+    @project_group_list = projects.group(:project_type).size
  end

  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)
-      gitea_params = {
-        private: private,
-        default_branch: @project.default_branch,
-        website: @project.website
-      }
+      private = params[:private]
      if [true, false].include? private
-        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+        new_project_params = project_params.merge(is_public: !private)
+        Gitea::Repository::UpdateService.new(@project.owner, @project.repository.identifier, {private: private}).call
        @project.repository.update_column(:hidden, private)
      end
+      @project.update_attributes!(new_project_params)
    end
  rescue Exception => e
    uid_logger_error(e.message)
@ -112,7 +67,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!
@ -145,11 +100,11 @@ class ProjectsController < ApplicationController
  end

  def simple
-    json_response(@project, current_user)
+    json_response(@project)
  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 +138,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/protected_branches_controller.rb
+++ b/app/controllers/protected_branches_controller.rb
@ -1,43 +0,0 @@
-class ProtectedBranchesController < ApplicationController
-  include OperateProjectAbilityAble
-
-  before_action :require_login
-  before_action :load_repository
-  before_action :authorizate_user_can_edit_project!
-
-  def index
-    scope = @repository.protected_branches
-    @total_count = scope.size
-    @protected_branches = paginate(scope)
-  end
-
-  def create
-    @protected_branch = ProtectedBranches::CreateService.call(@repository, @owner, params)
-
-    render_protected_branch_json
-  end
-
-  def update
-    @protected_branch = ProtectedBranches::UpdateService.call(@repository, @owner, params)
-  end
-
-  def destroy
-    ProtectedBranches::DestroyService.call(@repository, @owner, params[:branch_name])
-
-    render_ok
-  end
-
-  def show
-    @protected_branch = ProtectedBranches::GetService.call(@repository, @owner, params)
-  end
-
-  def edit
-    @branch, @protected_branch = ProtectedBranches::EditService.call(@repository, @owner, params[:branch_name])
-  end
-
-  private
-    def render_protected_branch_json
-      @protected_branch.persisted? ? @protected_branch : render_error('创建失败!')
-    end
-
-end
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@ -1,14 +1,14 @@
 class PullRequestsController < ApplicationController
-  before_action :require_login, except: [:index, :show, :files, :commits]
+  before_action :require_login, except: [:index, :show]
  before_action :load_repository
-  before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits]
-  before_action :load_pull_request, only: [:files, :commits]
+  before_action :set_user, only: [:new, :get_branches]
+  before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos]
+  # before_action :get_relatived, only: [:edit]
  include TagChosenHelper
  include ApplicationHelper


  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))
@ -24,11 +24,11 @@ class PullRequestsController < ApplicationController
  end

  def new
-    @all_branches = Branches::ListService.call(@owner, @project)
+    @all_branches = PullRequests::BranchesService.new(@user, @project).call
    @is_fork = @project.forked_from_project_id.present?
    @projects_names = [{
-      project_user_login: @owner.try(:login),
-      project_name: "#{@owner.try(:show_real_name)}/#{@repository.try(:identifier)}",
+      project_user_login: @user.try(:login),
+      project_name: "#{@user.try(:show_real_name)}/#{@repository.try(:identifier)}",
      project_id: @project.identifier,
      id: @project.id
    }]
@ -45,20 +45,64 @@ class PullRequestsController < ApplicationController
  end

  def get_branches
-    branch_result = Branches::ListService.call(@owner, @project)
+    branch_result = PullRequests::BranchesService.new(@user, @project).call
    render json: branch_result
    # return json: branch_result
  end

  def create
-    ActiveRecord::Base.transaction do
-      @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
-      if @gitea_pull_request[:status] == :success
-        @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"])
-        render_ok
-      else
-        render_error("create pull request error: #{@gitea_pull_request[:status]}")
-        raise ActiveRecord::Rollback
+    if params[:title].nil?
+      normal_status(-1, "名称不能为空")
+    elsif params[:issue_tag_ids].nil?
+      normal_status(-1, "标签不能为空")
+    else
+      ActiveRecord::Base.transaction do
+        begin
+          merge_params
+          pull_issue = Issue.new(@issue_params)
+          if pull_issue.save!
+            pr_params = {
+              user_id: current_user.try(:id),
+              project_id: @project.id,
+              issue_id: pull_issue.id,
+              fork_project_id: params[:fork_project_id],
+              is_original: params[:is_original]
+            }
+            local_requests = PullRequest.new(@local_params.merge(pr_params))
+            if local_requests.save
+              remote_pr_params = @local_params
+              remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login]
+              gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone))
+              if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"])
+                if params[:issue_tag_ids].present?
+                  params[:issue_tag_ids].each do |tag|
+                    IssueTagsRelate.create!(issue_id: pull_issue.id, issue_tag_id: tag)
+                  end
+                end
+
+                if params[:assigned_to_id].present?
+                  Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
+                                 container_id: local_requests.id, container_type: 'PullRequest',
+                                 parent_container_id: @project.id, parent_container_type: "Project",
+                                 tiding_type: 'pull_request', status: 0)
+                end
+                local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
+                if params[:title].to_s.include?("WIP:")
+                  pull_issue.custom_journal_detail("WIP", "", "这个合并请求被标记为尚未完成的工作。完成后请从标题中移除WIP:前缀。", current_user&.id)
+                end
+                # render :json => { status: 0, message: "PullRequest创建成功", id:  pull_issue.id}
+                normal_status(0, "PullRequest创建成功")
+              else
+                normal_status(-1, "PullRequest创建失败")
+              end
+            else
+              normal_status(-1, "PullRequest创建失败")
+            end
+          end
+        rescue => e
+          normal_status(-1, e.message)
+          raise ActiveRecord::Rollback
+        end
      end
    end
  end
@ -88,10 +132,8 @@ class PullRequestsController < ApplicationController

          if @issue.update_attributes(@issue_params)
            if @pull_request.update_attributes(@local_params.compact)
-              gitea_pull = Gitea::PullRequest::UpdateService.call(@owner.login, @repository.identifier,
-                  @pull_request.gpid, @requests_params, current_user.gitea_token)
-
-              if gitea_pull[:status] === :success
+              gitea_request = Gitea::PullRequest::UpdateService.new(@project.owner, @repository.try(:identifier), @requests_params, @pull_request.try(:gpid)).call
+              if gitea_request
                if params[:issue_tag_ids].present?
                  params[:issue_tag_ids].each do |tag|
                    IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
@ -120,8 +162,9 @@ class PullRequestsController < ApplicationController
  def refuse_merge
    ActiveRecord::Base.transaction do
      begin
-        colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user)
-        colsed === true ? normal_status(1, "已拒绝") : normal_status(-1, '合并失败')
+        @pull_request.update(status: 2)
+        @pull_request.issue.update(status_id: 5)
+        normal_status(1, "已拒绝")
      rescue => e
        normal_status(-1, e.message)
        raise ActiveRecord::Rollback
@ -140,17 +183,22 @@ 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, "请选择合并方式")
    else
      ActiveRecord::Base.transaction do
        begin
-          result = PullRequests::MergeService.call(@owner, @repository, @pull_request, current_user, params)
-
-          if result && @pull_request.merge!
-            @pull_request.project_trend_status!
+          requests_params = {
+            Do: params[:do],
+            MergeMessageField: params[:body],
+            MergeTitleField: params[:title]
+          }
+          merge_pr = Gitea::PullRequest::MergeService.call(current_user.gitea_token, @project.owner.login,
+            @repository.try(:identifier), @pull_request.try(:gpid), requests_params)
+          if @pull_request.update_attribute(:status, 1) && merge_pr[:status].to_i == 200
+            @pull_request&.project_trends&.update_all(action_type: "close")
            @issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
            normal_status(1, "合并成功")
          else
@ -174,11 +222,11 @@ class PullRequestsController < ApplicationController
    elsif target_head === target_base && !is_original
      normal_status(-2, "分支内容相同，无需创建合并请求")
    else
-      can_merge = @project&.pull_requests.where(head: target_head, base: target_base, status: 0, is_original: is_original, fork_project_id: params[:fork_project_id])
+      can_merge = @project&.pull_requests.where(user_id: current_user&.id, head: target_head, base: target_base, status: 0, is_original: is_original, fork_project_id: params[:fork_project_id])
      if can_merge.present?
        render json: {
          status: -2,
-          message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>",
+          message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@project.id}/merge/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>",
        }
      else
        normal_status(0, "可以合并")
@ -187,19 +235,9 @@ class PullRequestsController < ApplicationController
  end


-  def files
-    @files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gpid, current_user&.gitea_token)
-    # render json: @files_result
-  end
-
-  def commits
-    @commits_result = Gitea::PullRequest::CommitsService.call(@owner.login, @project.identifier, @pull_request.gpid, current_user&.gitea_token)
-    # render json: @commits_result
-  end
-
  private
-  def load_pull_request
-    @pull_request = PullRequest.find params[:id]
+  def set_user
+    @user = @project.owner
  end

  def find_pull_request
@ -229,8 +267,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
@ -1,39 +1,19 @@
 class RepositoriesController < ApplicationController
  include ApplicationHelper
  include OperateProjectAbilityAble
-  include Repository::LanguagesPercentagable

  before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror]
  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
-    @result = @project.forge? ? Gitea::Repository::GetService.new(@owner, @project.identifier).call : nil
+    @result = Gitea::Repository::GetService.new(@project.owner, @project.identifier).call
    @project_fork_id = @project.try(:forked_from_project_id)
    if @project_fork_id.present?
      @fork_project = Project.find_by(id: @project_fork_id)
@ -46,103 +26,62 @@ class RepositoriesController < ApplicationController

  def entries
    @project.increment!(:visits)
-
-    if @project.educoder?
-      @entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder.repo_name)
-    else
-      @entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
-      @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
-      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
-    end
+    @project_owner = @project.owner
+    @entries = Gitea::Repository::Entries::ListService.new(@project_owner, @project.identifier, ref: @ref).call
+    @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
+    @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
  end

  def top_counts
-    @result = @project.educoder? ? nil : Gitea::Repository::GetService.new(@project.owner, @project.identifier).call
+    @result = Gitea::Repository::GetService.new(@project.owner, @project.identifier).call
  end

  def sub_entries
    file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
-
-    if @project.educoder?
-      if params[:type] === 'file'
-        @sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri)
-        logger.info "######### sub_entries: #{@sub_entries}"
-        return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1
-
-        tmp_entries = [{
-            "content" =>  @sub_entries['data']['content'],
-            "type"    => "blob"
-          }]
-        @sub_entries = {
-          "trees"=>tmp_entries,
-          "commits" => [{}]
-        }
-      else
-        @sub_entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder&.repo_name, {path: file_path_uri})
-      end
-    else
-      interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: @ref)
-      if interactor.success?
-        result = interactor.result
-        @sub_entries = result.is_a?(Array) ? result.sort_by{ |hash| hash['type'] } : result
-      else
-        render_error(interactor.error)
-      end
-    end
-  end
-
-  def commits
-    @hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier,
-      sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
-  end
-
-  def commit
-    @sha         = params[:sha]
-    @commit      = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
-    @commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token, {diff: true})
-  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)
-  end
-
-  def edit
-    return render_forbidden if !@project.manager?(current_user) && !current_user.admin?
-  end
-
-  def create_file
-    interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params)
+    interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: @ref)
    if interactor.success?
-      @file = interactor.result
-      # create_new_pr(params)
-      #如果是更新流水线文件
-      if params[:pipeline_id]
-        update_pipeline(params[:pipeline_id])
-      end
+      result = interactor.result
+      return @sub_entries = [] if result.is_a?(Hash) && result[:status] == -1
+
+      @sub_entries = result.is_a?(Array) ? result : [result]
+      @sub_entries = @sub_entries.sort_by{ |hash| hash['type'] }
    else
      render_error(interactor.error)
    end
  end

-  def update_pipeline(pipeline_id)
-    pipeline = Ci::Pipeline.find(pipeline_id)
-    if pipeline
-      pipeline.update!(sync: 1)
+  def commits
+    @project_owner = @project.owner
+    @hash_commit = Gitea::Repository::Commits::ListService.new(@project_owner.login, @project.identifier,
+      sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
+  end
+
+  def commit
+    @commit = Gitea::Repository::Commits::GetService.new(@repository.user.login, @repository.identifier, params[:sha], current_user.gitea_token).call
+  end
+
+  def tags
+    @tags = Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier, {page: params[:page], limit: params[:limit]}).call
+  end
+
+  def edit
+  end
+
+  def create_file
+    interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @project.owner.login, content_params)
+    if interactor.success?
+      @file = interactor.result
+      create_new_pr(params)
+    else
+      render_error(interactor.error)
    end
  end

  def update_file
-    interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
+    interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @project.owner.login, params.merge(identifier: @project.identifier))
    if interactor.success?
      @file = interactor.result
-      # TODO: 是否创建pr
-      # create_new_pr(params)
+      create_new_pr(params)
      render_result(1, "更新成功")
    else
      render_error(interactor.error)
@ -150,7 +89,7 @@ class RepositoriesController < ApplicationController
  end

  def delete_file
-    interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
+    interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @project.owner.login, params.merge(identifier: @project.identifier))
    if interactor.success?
      @file = interactor.result
      render_result(1, "文件删除成功")
@ -171,17 +110,6 @@ class RepositoriesController < ApplicationController
    render_ok
  end

-  def readme
-    result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
-
-    @readme = result[:status] === :success ? result[:body] : nil
-    render json: @readme
-  end
-
-  def languages
-    render json: languages_precentagable
-  end
-
  private

  def find_project
@ -207,18 +135,18 @@ class RepositoriesController < ApplicationController
  end

  def get_statistics
-    @branches_count = @project.educoder? ? 0 : Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call&.size
-    @tags_count = @project.educoder? ? 0 : Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size
+    @branches_count = Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call&.size
+    @tags_count = Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size
  end

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

  def get_latest_commit
-    latest_commit = @project.educoder? ? nil : project_commits
-    @latest_commit = latest_commit.present? ? latest_commit[:body][0] : nil
-    @commits_count = latest_commit.present? ? latest_commit[:total_count] : 0
+    latest_commit = project_commits
+    @latest_commit = latest_commit[:body][0] if latest_commit.present?
+    @commits_count = latest_commit[:total_count] if latest_commit.present?
  end

  def content_params
@ -286,14 +214,14 @@ class RepositoriesController < ApplicationController
        issue_type: "1",
        tracker_id: 2,
        status_id: 1,
-        priority_id: params[:priority_id] || "2"
+        priority_id: 1
      }
      @pull_issue = Issue.new(issue_params)
      if @pull_issue.save!
        local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: @pull_issue.id))
        if local_requests.save
-          gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @owner.login, @project.try(:identifier), requests_params).call
-          if gitea_request[:status] == :success && local_requests.update_attributes(gpid: gitea_request["body"]["number"])
+          gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @project.owner, @project.try(:identifier), requests_params).call
+          if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"])
            local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
          end
        end
--- 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/statistic_controller.rb
+++ b/app/controllers/statistic_controller.rb
@ -1,25 +0,0 @@
-class StatisticController < ApplicationController 
-
-  # 平台概况
-  def platform_profile
-    @platform_user_query = Statistic::PlatformUserQuery.new(params).call
-    @platform_project_query = Statistic::PlatformProjectQuery.new(params).call
-    @platform_course_query = Statistic::PlatformCourseQuery.new(params).call
-  end
-
-  # 平台代码提交数据
-  def platform_code
-    @platform_pull_request_query = Statistic::PlatformPullRequestQuery.new(params).call
-    @platform_commit_query = Statistic::PlatformCommitQuery.new(params,current_user).call
-  end
-
-  # 项目案例活跃度排行榜
-  def active_project_rank
-    @active_project_rank_query = Statistic::ActiveProjectRankQuery.new(params, current_user).call
-  end
-
-  # 开发者活跃度排行榜
-  def active_developer_rank
-    @active_developer_rank_query = Statistic::ActiveDeveloperRankQuery.new(params, current_user).call
-  end
-end
--- a/app/controllers/sync_forge_controller.rb
+++ b/app/controllers/sync_forge_controller.rb
@ -12,11 +12,11 @@ class SyncForgeController < ApplicationController
    end
  end

-  # def create
+  # def create 
  #   ActiveRecord::Base.transaction do
  #     params.permit!
  #     sync_params = params[:sync_params]
-  #     project_user = User.where(login: sync_params[:owner_login])&.first
+  #     project_user = User.where(login: sync_params[:owner_login])&.first 
  #     #以前已同步的项目,那么肯定存在仓库
  #     SyncLog.sync_log("=================begin_to_sync_forge: project_identifier: #{sync_params[:identifier]}========")
  #     user_projects = Project.where(user_id: project_user.id)
@ -38,7 +38,7 @@ class SyncForgeController < ApplicationController
  #       check_sync_project(project, sync_params)
  #     else #新建项目
  #       SyncLog.sync_log("=================begin_to_create_new_project========")
-
+        
  #       project_params = {
  #         repository_name: sync_params[:identifier],
  #         user_id: project_user.id,
@ -53,7 +53,7 @@ class SyncForgeController < ApplicationController
  #           new_project_score = ProjectScore.create(score_params)
  #           SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========")
  #         end
-
+              
  #         SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present?
  #         check_new_project(project, sync_params)
  #       else
@ -115,7 +115,7 @@ class SyncForgeController < ApplicationController
  #    SyncLog.sync_log("=================sync_user_failed====#{e}")
  # end

-  # private
+  # private 

  # def check_sync_project(project,sync_params)
  #   begin
@ -125,8 +125,8 @@ class SyncForgeController < ApplicationController
  #     # end

  #     SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------")
-  #     change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present?  #更新project_score
-  #     change_project_issues(project, sync_params[:issues],project.id, gitea_main)
+  #     change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present?  #更新project_score 
+  #     change_project_issues(project, sync_params[:issues],project.id, gitea_main) 
  #     change_project_members(project, sync_params[:members],gitea_main)
  #     change_project_versions(project, sync_params[:project_versions],gitea_main)
  #     change_project_watchers(project, sync_params[:project_watchers],gitea_main)
@ -134,7 +134,7 @@ class SyncForgeController < ApplicationController
  #   rescue => e
  #     SyncLog.sync_log("=========check_sync_project_errors:#{e}===================")
  #   end
-
+    
  # end

  # def check_new_project(project,sync_params)
@ -167,7 +167,7 @@ class SyncForgeController < ApplicationController
  #       parent_id: project.id
  #     }
  #     SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
-
+      
  #     SyncLog.sync_log("***6. end_to_sync_parises---------------")
  #   end
  # end
@ -189,7 +189,7 @@ class SyncForgeController < ApplicationController
  #         end
  #       end
  #       pre_project_score.save! if change_num > 0   #如果 project_score有变化则更新
-  #     else
+  #     else 
  #       ProjectScore.create!(project_scores.merge(project_id: project.id))
  #     end
  #     SyncLog.sync_log("***1. end_to_sync_project_score---------------")
@ -206,7 +206,7 @@ class SyncForgeController < ApplicationController
  #     SyncLog.sync_log("***2--01. forge_issue_ids-#{forge_issue_ids.size.to_i}--------------")
  #     if forge_issue_ids.size.to_i <= old_issues_params[:count].to_i
  #       diff_issue_ids = old_issues_params[:ids] - forge_issue_ids
-
+        
  #       if diff_issue_ids.size == 0  #issue数量一样，判断评论是否有增减
  #         forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id)
  #         diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids
@ -241,10 +241,10 @@ class SyncForgeController < ApplicationController
  #         # }
  #         # SyncLog.sync_log("***2--03. sync_projects_params_groups-#{sync_projects_params}--------------")
  #         # SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
-
+         
  #       end
  #     end
-
+      
  #     # SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
  #     SyncLog.sync_log("***2. end_to_syncissues---------------")
  #   rescue Exception => e
@ -265,7 +265,7 @@ class SyncForgeController < ApplicationController
  #         parent_id: project.id
  #       }
  #       SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
-
+        
  #     end
  #   end
  #   SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
@ -285,7 +285,7 @@ class SyncForgeController < ApplicationController
  #       }
  #       SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
  #   end
-
+    
  #     SyncLog.sync_log("***4. end_to_sync_versions---------------")
  #   end
  # end
@ -304,12 +304,12 @@ class SyncForgeController < ApplicationController
  #       }
  #       SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
  #   end
-
+    
  #     SyncLog.sync_log("***3. end_to_sync_members---------------")
  #   end
  # end

-  # def check_token
+  # def check_token 
  #   sync_params = params[:sync_params]
  #   unless sync_params[:token] && sync_params[:token] == get_token
  #     render json: {message: "token_errors"}
@ -331,4 +331,4 @@ class SyncForgeController < ApplicationController
  #   return gitea_main
  # end

-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
@ -1,24 +1,11 @@
 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 :connect_to_ci_db, only: [:get_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]
  skip_before_action :check_sign, only: [:attachment_show]

-  def connect_to_ci_db(options={})
-    if !(current_user && !current_user.is_a?(AnonymousUser) && current_user.devops_certification?)
-      return
-    end
-    if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-      connect_to_trustie_ci_database(options)
-    else
-      connect_to_ci_database(options)
-    end
-  end
-
  def list
    scope = User.active.recent.like(params[:search]).includes(:user_extension)
    @total_count = scope.size
@ -31,7 +18,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 +42,6 @@ class UsersController < ApplicationController
    @watchers = paginate(watchers)
  end

-  def hovercard
-  end
-
  def update
    @user = User.find params[:id]
    @user.update!(user_params)
@ -236,26 +219,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/.dockerignore
+++ b/app/docs/slate/.dockerignore
@ -1,2 +0,0 @@
-build/
-.github/
--- a/app/docs/slate/.editorconfig
+++ b/app/docs/slate/.editorconfig
@ -1,18 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# Top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-
-[*.rb]
-charset = utf-8
-
-[*.md]
-trim_trailing_whitespace = false
--- a/app/docs/slate/.gitattributes
+++ b/app/docs/slate/.gitattributes
@ -1 +0,0 @@
-source/javascripts/lib/* linguist-vendored
--- a/app/docs/slate/.github/ISSUE_TEMPLATE/bug.md
+++ b/app/docs/slate/.github/ISSUE_TEMPLATE/bug.md
@ -1,22 +0,0 @@
---
-name: Report a Bug
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Bug Description**
-A clear and concise description of what the bug is and how to reproduce it.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Browser (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Last upstream Slate commit (run `git log --author="Robert Lord" | head -n 1`):**
-Put the commit hash here
--- a/app/docs/slate/.github/ISSUE_TEMPLATE/config.yml
+++ b/app/docs/slate/.github/ISSUE_TEMPLATE/config.yml
@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Questions, Ideas, Discussions
-    url: https://github.com/slatedocs/slate/discussions
-    about: Ask and answer questions, and propose new features.
--- a/app/docs/slate/.github/PULL_REQUEST_TEMPLATE.md
+++ b/app/docs/slate/.github/PULL_REQUEST_TEMPLATE.md
@ -1,5 +0,0 @@
-<!--
-⚠️ 🚨 ⚠️  STOP AND READ THIS ⚠️ 🚨 ⚠️
-
-👆👆 see that 'base fork' dropdown above? You should change it! The default value of "slatedocs/slate" submits your change to ALL USERS OF SLATE, not just your company. This is PROBABLY NOT WHAT YOU WANT.
-->
--- a/app/docs/slate/.github/workflows/build.yml
+++ b/app/docs/slate/.github/workflows/build.yml
@ -1,42 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ '*' ]
-  pull_request:
-    branches: [ '*' ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-
-    - uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          gems-${{ runner.os }}-${{ matrix.ruby-version }}-
-          gems-${{ runner.os }}-
-
-    # necessary to get ruby 2.3 to work nicely with bundler vendor/bundle cache
-    # can remove once ruby 2.3 is no longer supported
-    - run: gem update --system
-
-    - run: bundle config set deployment 'true'
-    - name: bundle install
-      run: |
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3
-
-    - run: bundle exec middleman build
--- a/app/docs/slate/.github/workflows/deploy.yml
+++ b/app/docs/slate/.github/workflows/deploy.yml
@ -1,41 +0,0 @@
-name: Deploy
-
-on:
-  push:
-    branches: [ 'main' ]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    env:
-      ruby-version: 2.5
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ env.ruby-version }}
-
-    - uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          gems-${{ runner.os }}-${{ matrix.ruby-version }}-
-          gems-${{ runner.os }}-
-
-    - run: bundle config set deployment 'true'
-    - name: bundle install
-      run: |
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3
-
-    - run: bundle exec middleman build
-
-    - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./build
-        keep_files: true
--- a/app/docs/slate/.github/workflows/dev_deploy.yml
+++ b/app/docs/slate/.github/workflows/dev_deploy.yml
@ -1,50 +0,0 @@
-name: Dev Deploy
-
-on:
-  push:
-    branches: [ 'dev' ]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    env:
-      ruby-version: 2.5
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ env.ruby-version }}
-
-    - uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          gems-${{ runner.os }}-${{ matrix.ruby-version }}-
-          gems-${{ runner.os }}-
-
-    - run: bundle config set deployment 'true'
-    - name: bundle install
-      run: |
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3
-
-    - run: bundle exec middleman build
-
-    - name: Push to Docker Hub
-      uses: docker/build-push-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_ACCESS_KEY }}
-        repository: slatedocs/slate
-        tag_with_ref: true
-
-    - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3.7.0-8
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        destination_dir: dev
-        publish_dir: ./build
-        keep_files: true
--- a/app/docs/slate/.github/workflows/publish.yml
+++ b/app/docs/slate/.github/workflows/publish.yml
@ -1,22 +0,0 @@
-name: Publish Docker image
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-
-      - name: Push to Docker Hub
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_KEY }}
-          repository: slatedocs/slate
-          tag_with_ref: true
-          tags: latest
--- a/app/docs/slate/.gitignore
+++ b/app/docs/slate/.gitignore
@ -1,27 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.DS_STORE
-build/
-.cache
-.vagrant
-.sass-cache
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-.idea/
-
-# Vagrant artifacts
-ubuntu-*-console.log
--- a/app/docs/slate/CHANGELOG.md
+++ b/app/docs/slate/CHANGELOG.md
@ -1,254 +0,0 @@
-# Changelog
-
-## Version 2.8.0
-
-*October 27, 2020*
-
-* Remove last trailing newline when using the copy code button
-* Rework docker image and make available at slatedocs/slate
-* Improve Dockerfile layout to improve caching (thanks @micvbang)
-* Bump rouge from 3.20 to 3.24
-* Bump nokogiri from 1.10.9 to 1.10.10
-* Bump middleman from 4.3.8 to 4.3.11
-* Bump lunr.js from 2.3.8 to 2.3.9
-
-## Version 2.7.1
-
-*August 13, 2020*
-
-* __[security]__ Bumped middleman from 4.3.7 to 4.3.8
-
-_Note_: Slate uses redcarpet, not kramdown, for rendering markdown to HTML, and so was unaffected by the security vulnerability in middleman.
-If you have changed slate to use kramdown, and with GFM, you may need to install the `kramdown-parser-gfm` gem.
-
-## Version 2.7.0
-
-*June 21, 2020*
-
-* __[security]__ Bumped rack in Gemfile.lock from 2.2.2 to 2.2.3
-* Bumped bundled jQuery from 3.2.1 to 3.5.1
-* Bumped bundled lunr from 0.5.7 to 2.3.8
-* Bumped imagesloaded from 3.1.8 to 4.1.4
-* Bumped rouge from 3.17.0 to 3.20.0
-* Bumped redcarpet from 3.4.0 to 3.5.0
-* Fix color of highlighted code being unreadable when printing page
-* Add clipboard icon for "Copy to Clipboard" functionality to code boxes (see note below)
-* Fix handling of ToC selectors that contain punctutation (thanks @gruis)
-* Fix language bar truncating languages that overflow screen width
-* Strip HTML tags from ToC title before displaying it in title bar in JS (backup to stripping done in Ruby code) (thanks @atic)
-
-To enable the new clipboard icon, you need to add `code_clipboard: true` to the frontmatter of source/index.html.md.
-See [this line](https://github.com/slatedocs/slate/blame/main/source/index.html.md#L19) for an example of usage.
-
-## Version 2.6.1
-
-*May 30, 2020*
-
-* __[security]__ update child dependency activesupport in Gemfile.lock to 5.4.2.3
-* Update Middleman in Gemfile.lock to 4.3.7
-* Replace Travis-CI with GitHub actions for continuous integration
-* Replace Spectrum with GitHub discussions
-
-## Version 2.6.0
-
-*May 18, 2020*
-
-__Note__: 2.5.0 was "pulled" due to a breaking bug discovered after release. It is recommended to skip it, and move straight to 2.6.0.
-
-* Fix large whitespace gap in middle column for sections with codeblocks
-* Fix highlighted code elements having a different background than rest of code block
-* Change JSON keys to have a different font color than their values
-* Disable asset hashing for woff and woff2 elements due to middleman bug breaking woff2 asset hashing in general
-* Move Dockerfile to Debian from Alpine
-* Converted repo to a [GitHub template](https://help.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-template-repository)
-* Update sassc to 2.3.0 in Gemfile.lock
-
-## Version 2.5.0
-
-*May 8, 2020*
-
-* __[security]__ update nokogiri to ~> 1.10.8
-* Update links in example docs to https://github.com/slatedocs/slate from https://github.com/lord/slate
-* Update LICENSE to include full Apache 2.0 text
-* Test slate against Ruby 2.5 and 2.6 on Travis-CI
-* Update Vagrantfile to use Ubuntu 18.04 (thanks @bradthurber)
-* Parse arguments and flags for deploy.sh on script start, instead of potentially after building source files
-* Install nodejs inside Vagrantfile (thanks @fernandoaguilar)
-* Add Dockerfile for running slate (thanks @redhatxl)
-* update middleman-syntax and rouge to ~>3.2
-* update middleman to 4.3.6
-
-## Version 2.4.0
-
-*October 19, 2019*
-
- Move repository from lord/slate to slatedocs/slate
- Fix documentation to point at new repo link, thanks to [Arun](https://github.com/slash-arun), [Gustavo Gawryszewski](https://github.com/gawry), and [Daniel Korbit](https://github.com/danielkorbit)
- Update `nokogiri` to 1.10.4
- Update `ffi` in `Gemfile.lock` to fix security warnings, thanks to [Grey Baker](https://github.com/greysteil) and [jakemack](https://github.com/jakemack)
- Update `rack` to 2.0.7 in `Gemfile.lock` to fix security warnings, thanks to [Grey Baker](https://github.com/greysteil) and [jakemack](https://github.com/jakemack)
- Update middleman to `4.3` and relax constraints on middleman related gems, thanks to [jakemack](https://github.com/jakemack)
- Add sass gem, thanks to [jakemack](https://github.com/jakemack)
- Activate `asset_cache` in middleman to improve cacheability of static files, thanks to [Sam Gilman](https://github.com/thenengah)
- Update to using bundler 2 for `Gemfile.lock`, thanks to [jakemack](https://github.com/jakemack)
-
-## Version 2.3.1
-
-*July 5, 2018*
-
- Update `sprockets` in `Gemfile.lock` to fix security warnings
-
-## Version 2.3
-
-*July 5, 2018*
-
- Allows strikethrough in markdown by default.
- Upgrades jQuery to 3.2.1, thanks to [Tomi Takussaari](https://github.com/TomiTakussaari)
- Fixes invalid HTML in `layout.erb`, thanks to [Eric Scouten](https://github.com/scouten) for pointing out
- Hopefully fixes Vagrant memory issues, thanks to [Petter Blomberg](https://github.com/p-blomberg) for the suggestion
- Cleans HTML in headers before setting `document.title`, thanks to [Dan Levy](https://github.com/justsml)
- Allows trailing whitespace in markdown files, thanks to [Samuel Cousin](https://github.com/kuzyn)
- Fixes pushState/replaceState problems with scrolling not changing the document hash, thanks to [Andrey Fedorov](https://github.com/anfedorov)
- Removes some outdated examples, thanks [@al-tr](https://github.com/al-tr), [Jerome Dahdah](https://github.com/jdahdah), and [Ricardo Castro](https://github.com/mccricardo)
- Fixes `nav-padding` bug, thanks [Jerome Dahdah](https://github.com/jdahdah)
- Code style fixes thanks to [Sebastian Zaremba](https://github.com/vassyz)
- Nokogiri version bump thanks to [Grey Baker](https://github.com/greysteil)
- Fix to default `index.md` text thanks to [Nick Busey](https://github.com/NickBusey)
-
-Thanks to everyone who contributed to this release!
-
-## Version 2.2
-
-*January 19, 2018*
-
- Fixes bugs with some non-roman languages not generating unique headers
- Adds editorconfig, thanks to [Jay Thomas](https://github.com/jaythomas)
- Adds optional `NestingUniqueHeadCounter`, thanks to [Vladimir Morozov](https://github.com/greenhost87)
- Small fixes to typos and language, thx [Emir Ribić](https://github.com/ribice), [Gregor Martynus](https://github.com/gr2m), and [Martius](https://github.com/martiuslim)!
- Adds links to Spectrum chat for questions in README and ISSUE_TEMPLATE
-
-## Version 2.1
-
-*October 30, 2017*
-
- Right-to-left text stylesheet option, thanks to [Mohammad Hossein Rabiee](https://github.com/mhrabiee)
- Fix for HTML5 history state bug, thanks to [Zach Toolson](https://github.com/ztoolson)
- Small styling changes, typo fixes, small bug fixes from [Marian Friedmann](https://github.com/rnarian), [Ben Wilhelm](https://github.com/benwilhelm), [Fouad Matin](https://github.com/fouad), [Nicolas Bonduel](https://github.com/NicolasBonduel), [Christian Oliff](https://github.com/coliff)
-
-Thanks to everyone who submitted PRs for this version!
-
-## Version 2.0
-
-*July 17, 2017*
-
- All-new statically generated table of contents
-  - Should be much faster loading and scrolling for large pages
-  - Smaller Javascript file sizes
-  - Avoids the problem with the last link in the ToC not ever highlighting if the section was shorter than the page
-  - Fixes control-click not opening in a new page
-  - Automatically updates the HTML title as you scroll
- Updated design
-  - New default colors!
-  - New spacings and sizes!
-  - System-default typefaces, just like GitHub
- Added search input delay on large corpuses to reduce lag
- We even bumped the major version cause hey, why not?
- Various small bug fixes
-
-Thanks to everyone who helped debug or wrote code for this version! It was a serious community effort, and I couldn't have done it alone.
-
-## Version 1.5
-
-*February 23, 2017*
-
- Add [multiple tabs per programming language](https://github.com/lord/slate/wiki/Multiple-language-tabs-per-programming-language) feature
- Upgrade Middleman to add Ruby 1.4.0 compatibility
- Switch default code highlighting color scheme to better highlight JSON
- Various small typo and bug fixes
-
-## Version 1.4
-
-*November 24, 2016*
-
- Upgrade Middleman and Rouge gems, should hopefully solve a number of bugs
- Update some links in README
- Fix broken Vagrant startup script
- Fix some problems with deploy.sh help message
- Fix bug with language tabs not hiding properly if no error
- Add `!default` to SASS variables
- Fix bug with logo margin
- Bump tested Ruby versions in .travis.yml
-
-## Version 1.3.3
-
-*June 11, 2016*
-
-Documentation and example changes.
-
-## Version 1.3.2
-
-*February 3, 2016*
-
-A small bugfix for slightly incorrect background colors on code samples in some cases.
-
-## Version 1.3.1
-
-*January 31, 2016*
-
-A small bugfix for incorrect whitespace in code blocks.
-
-## Version 1.3
-
-*January 27, 2016*
-
-We've upgraded Middleman and a number of other dependencies, which should fix quite a few bugs.
-
-Instead of `rake build` and `rake deploy`, you should now run `bundle exec middleman build --clean` to build your server, and `./deploy.sh` to deploy it to Github Pages.
-
-## Version 1.2
-
-*June 20, 2015*
-
-**Fixes:**
-
- Remove crash on invalid languages
- Update Tocify to scroll to the highlighted header in the Table of Contents
- Fix variable leak and update search algorithms
- Update Python examples to be valid Python
- Update gems
- More misc. bugfixes of Javascript errors
- Add Dockerfile
- Remove unused gems
- Optimize images, fonts, and generated asset files
- Add chinese font support
- Remove RedCarpet header ID patch
- Update language tabs to not disturb existing query strings
-
-## Version 1.1
-
-*July 27, 2014*
-
-**Fixes:**
-
- Finally, a fix for the redcarpet upgrade bug
-
-## Version 1.0
-
-*July 2, 2014*
-
-[View Issues](https://github.com/tripit/slate/issues?milestone=1&state=closed)
-
-**Features:**
-
- Responsive designs for phones and tablets
- Started tagging versions
-
-**Fixes:**
-
- Fixed 'unrecognized expression' error
- Fixed #undefined hash bug
- Fixed bug where the current language tab would be unselected
- Fixed bug where tocify wouldn't highlight the current section while searching
- Fixed bug where ids of header tags would have special characters that caused problems
- Updated layout so that pages with disabled search wouldn't load search.js
- Cleaned up Javascript
--- a/app/docs/slate/CODE_OF_CONDUCT.md
+++ b/app/docs/slate/CODE_OF_CONDUCT.md
@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@lord.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
--- a/app/docs/slate/Gemfile
+++ b/app/docs/slate/Gemfile
@ -1,12 +0,0 @@
-ruby '>=2.3.1'
-source 'https://gems.ruby-china.com'
-
-# Middleman
-gem 'middleman', '~>4.3'
-gem 'middleman-syntax', '~> 3.2'
-gem 'middleman-autoprefixer', '~> 2.7'
-gem 'middleman-sprockets', '~> 4.1'
-gem 'rouge', '~> 3.21'
-gem 'redcarpet', '~> 3.5.0'
-gem 'nokogiri', '~> 1.10.8'
-gem 'sass'
--- a/app/docs/slate/Gemfile.lock
+++ b/app/docs/slate/Gemfile.lock
@ -1,136 +0,0 @@
-GEM
-  remote: https://gems.ruby-china.com/
-  specs:
-    activesupport (5.2.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    autoprefixer-rails (9.5.1.1)
-      execjs
-    backports (3.18.2)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.7)
-    contracts (0.13.0)
-    dotenv (2.7.6)
-    erubis (2.7.0)
-    execjs (2.7.0)
-    fast_blank (1.0.0)
-    fastimage (2.2.0)
-    ffi (1.13.1)
-    haml (5.1.2)
-      temple (>= 0.8.0)
-      tilt
-    hamster (3.0.0)
-      concurrent-ruby (~> 1.0)
-    hashie (3.6.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    kramdown (2.3.0)
-      rexml
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    memoist (0.16.2)
-    middleman (4.3.11)
-      coffee-script (~> 2.2)
-      haml (>= 4.0.5)
-      kramdown (>= 2.3.0)
-      middleman-cli (= 4.3.11)
-      middleman-core (= 4.3.11)
-    middleman-autoprefixer (2.10.1)
-      autoprefixer-rails (~> 9.1)
-      middleman-core (>= 3.3.3)
-    middleman-cli (4.3.11)
-      thor (>= 0.17.0, < 2.0)
-    middleman-core (4.3.11)
-      activesupport (>= 4.2, < 6.0)
-      addressable (~> 2.3)
-      backports (~> 3.6)
-      bundler
-      contracts (~> 0.13.0)
-      dotenv
-      erubis
-      execjs (~> 2.0)
-      fast_blank
-      fastimage (~> 2.0)
-      hamster (~> 3.0)
-      hashie (~> 3.4)
-      i18n (~> 0.9.0)
-      listen (~> 3.0.0)
-      memoist (~> 0.14)
-      padrino-helpers (~> 0.13.0)
-      parallel
-      rack (>= 1.4.5, < 3)
-      sassc (~> 2.0)
-      servolux
-      tilt (~> 2.0.9)
-      uglifier (~> 3.0)
-    middleman-sprockets (4.1.1)
-      middleman-core (~> 4.0)
-      sprockets (>= 3.0)
-    middleman-syntax (3.2.0)
-      middleman-core (>= 3.2)
-      rouge (~> 3.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    padrino-helpers (0.13.3.4)
-      i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.13.3.4)
-      tilt (>= 1.4.1, < 3)
-    padrino-support (0.13.3.4)
-      activesupport (>= 3.1)
-    parallel (1.19.2)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    redcarpet (3.5.0)
-    rexml (3.2.4)
-    rouge (3.24.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    servolux (0.13.0)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    temple (0.8.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    uglifier (3.2.0)
-      execjs (>= 0.3.0, < 3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  middleman (~> 4.3)
-  middleman-autoprefixer (~> 2.7)
-  middleman-sprockets (~> 4.1)
-  middleman-syntax (~> 3.2)
-  nokogiri (~> 1.10.8)
-  redcarpet (~> 3.5.0)
-  rouge (~> 3.21)
-  sass
-
-RUBY VERSION
-   ruby 2.3.3p222
-
-BUNDLED WITH
-   2.1.4
--- a/app/docs/slate/LICENSE
+++ b/app/docs/slate/LICENSE
@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--- a/app/docs/slate/README.md
+++ b/app/docs/slate/README.md
@ -1,81 +0,0 @@
-<p align="center">
-  <img src="https://raw.githubusercontent.com/slatedocs/img/main/logo-slate.png" alt="Slate: API Documentation Generator" width="226">
-  <br>
-  <a href="https://github.com/slatedocs/slate/actions?query=workflow%3ABuild+branch%3Amain"><img src="https://github.com/slatedocs/slate/workflows/Build/badge.svg?branch=main" alt="Build Status"></a>
-</p>
-
-<p align="center">Slate helps you create beautiful, intelligent, responsive API documentation.</p>
-
-<p align="center"><img src="https://raw.githubusercontent.com/slatedocs/img/main/screenshot-slate.png" width=700 alt="Screenshot of Example Documentation created with Slate"></p>
-
-<p align="center"><em>The example above was created with Slate. Check it out at <a href="https://slatedocs.github.io/slate">slatedocs.github.io/slate</a>.</em></p>
-
-Features
------------
-
-* **Clean, intuitive design** — With Slate, the description of your API is on the left side of your documentation, and all the code examples are on the right side. Inspired by [Stripe's](https://stripe.com/docs/api) and [PayPal's](https://developer.paypal.com/webapps/developer/docs/api/) API docs. Slate is responsive, so it looks great on tablets, phones, and even in print.
-
-* **Everything on a single page** — Gone are the days when your users had to search through a million pages to find what they wanted. Slate puts the entire documentation on a single page. We haven't sacrificed linkability, though. As you scroll, your browser's hash will update to the nearest header, so linking to a particular point in the documentation is still natural and easy.
-
-* **Slate is just Markdown** — When you write docs with Slate, you're just writing Markdown, which makes it simple to edit and understand. Everything is written in Markdown — even the code samples are just Markdown code blocks.
-
-* **Write code samples in multiple languages** — If your API has bindings in multiple programming languages, you can easily put in tabs to switch between them. In your document, you'll distinguish different languages by specifying the language name at the top of each code block, just like with GitHub Flavored Markdown.
-
-* **Out-of-the-box syntax highlighting** for [over 100 languages](https://github.com/jneen/rouge/wiki/List-of-supported-languages-and-lexers), no configuration required.
-
-* **Automatic, smoothly scrolling table of contents** on the far left of the page. As you scroll, it displays your current position in the document. It's fast, too. We're using Slate at TripIt to build documentation for our new API, where our table of contents has over 180 entries. We've made sure that the performance remains excellent, even for larger documents.
-
-* **Let your users update your documentation for you** — By default, your Slate-generated documentation is hosted in a public GitHub repository. Not only does this mean you get free hosting for your docs with GitHub Pages, but it also makes it simple for other developers to make pull requests to your docs if they find typos or other problems. Of course, if you don't want to use GitHub, you're also welcome to host your docs elsewhere.
-
-* **RTL Support** Full right-to-left layout for RTL languages such as Arabic, Persian (Farsi), Hebrew etc.
-
-Getting started with Slate is super easy! Simply press the green "use this template" button above and follow the instructions below. Or, if you'd like to check out what Slate is capable of, take a look at the [sample docs](https://slatedocs.github.io/slate/).
-
-Getting Started with Slate
------------------------------
-
-To get started with Slate, please check out the [Getting Started](https://github.com/slatedocs/slate/wiki#getting-started)
-section in our [wiki](https://github.com/slatedocs/slate/wiki).
-
-We support running Slate in three different ways:
-* [Natively](https://github.com/slatedocs/slate/wiki/Using-Slate-Natively)
-* [Using Vagrant](https://github.com/slatedocs/slate/wiki/Using-Slate-in-Vagrant)
-* [Using Docker](https://github.com/slatedocs/slate/wiki/Using-Slate-in-Docker)
-
-Companies Using Slate
---------------------------------
-
-* [NASA](https://api.nasa.gov)
-* [Sony](http://developers.cimediacloud.com)
-* [Best Buy](https://bestbuyapis.github.io/api-documentation/)
-* [Travis-CI](https://docs.travis-ci.com/api/)
-* [Greenhouse](https://developers.greenhouse.io/harvest.html)
-* [WooCommerce](http://woocommerce.github.io/woocommerce-rest-api-docs/)
-* [Dwolla](https://docs.dwolla.com/)
-* [Clearbit](https://clearbit.com/docs)
-* [Coinbase](https://developers.coinbase.com/api)
-* [Parrot Drones](http://developer.parrot.com/docs/bebop/)
-* [Scale](https://docs.scaleapi.com/)
-
-You can view more in [the list on the wiki](https://github.com/slatedocs/slate/wiki/Slate-in-the-Wild).
-
-Questions? Need Help? Found a bug?
--------------------
-
-If you've got questions about setup, deploying, special feature implementation in your fork, or just want to chat with the developer, please feel free to [start a thread in our Discussions tab](https://github.com/slatedocs/slate/discussions)!
-
-Found a bug with upstream Slate? Go ahead and [submit an issue](https://github.com/slatedocs/slate/issues). And, of course, feel free to submit pull requests with bug fixes or changes to the `dev` branch.
-
-Contributors
--------------------
-
-Slate was built by [Robert Lord](https://lord.io) while at [TripIt](https://www.tripit.com/). The project is now maintained by [Matthew Peveler](https://github.com/MasterOdin) and [Mike Ralphson](https://github.com/MikeRalphson).
-
-Thanks to the following people who have submitted major pull requests:
-
- [@chrissrogers](https://github.com/chrissrogers)
- [@bootstraponline](https://github.com/bootstraponline)
- [@realityking](https://github.com/realityking)
- [@cvkef](https://github.com/cvkef)
-
-Also, thanks to [Sauce Labs](http://saucelabs.com) for sponsoring the development of the responsive styles.
--- a/app/docs/slate/Vagrantfile
+++ b/app/docs/slate/Vagrantfile
@ -1,46 +0,0 @@
-Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/bionic64"
-  config.vm.network :forwarded_port, guest: 4567, host: 4567
-  config.vm.provider "virtualbox" do |vb|
-    vb.memory = "2048"
-  end
-
-  config.vm.provision "bootstrap",
-    type: "shell",
-    inline: <<-SHELL
-      # add nodejs v12 repository
-      curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
-
-      sudo apt-get update
-      sudo apt-get install -yq ruby ruby-dev
-      sudo apt-get install -yq pkg-config build-essential nodejs git libxml2-dev libxslt-dev
-      sudo apt-get autoremove -yq
-      gem install --no-ri --no-rdoc bundler
-    SHELL
-
-  # add the local user git config to the vm
-  config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig"
-
-  config.vm.provision "install",
-    type: "shell",
-    privileged: false,
-    inline: <<-SHELL
-      echo "=============================================="
-      echo "Installing app dependencies"
-      cd /vagrant
-      bundle config build.nokogiri --use-system-libraries
-      bundle install
-    SHELL
-
-  config.vm.provision "run",
-    type: "shell",
-    privileged: false,
-    run: "always",
-    inline: <<-SHELL
-      echo "=============================================="
-      echo "Starting up middleman at http://localhost:4567"
-      echo "If it does not come up, check the ~/middleman.log file for any error messages"
-      cd /vagrant
-      bundle exec middleman server --watcher-force-polling --watcher-latency=1 &> ~/middleman.log &
-    SHELL
-end
--- a/app/docs/slate/config.rb
+++ b/app/docs/slate/config.rb
@ -1,65 +0,0 @@
-set :build_dir, '../../../public/docs/'
-
-# Unique header generation
-require './lib/unique_head.rb'
-
-# Markdown
-set :markdown_engine, :redcarpet
-set :markdown,
-    fenced_code_blocks: true,
-    smartypants: true,
-    disable_indented_code_blocks: true,
-    prettify: true,
-    strikethrough: true,
-    tables: true,
-    with_toc_data: true,
-    no_intra_emphasis: true,
-    renderer: UniqueHeadCounter
-
-# Assets
-set :css_dir, 'stylesheets'
-set :js_dir, 'javascripts'
-set :images_dir, 'images'
-set :fonts_dir, 'fonts'
-
-# Activate the syntax highlighter
-activate :syntax
-ready do
-  require './lib/monokai_sublime_slate.rb'
-  require './lib/multilang.rb'
-end
-
-activate :sprockets
-
-activate :autoprefixer do |config|
-  config.browsers = ['last 2 version', 'Firefox ESR']
-  config.cascade  = false
-  config.inline   = true
-end
-
-# Github pages require relative links
-activate :relative_assets
-set :relative_links, true
-
-# Build Configuration
-configure :build do
-  # We do want to hash woff and woff2 as there's a bug where woff2 will use
-  # woff asset hash which breaks things. Trying to use a combination of ignore and
-  # rewrite_ignore does not work as it conflicts weirdly with relative_assets. Disabling
-  # the .woff2 extension only does not work as .woff will still activate it so have to
-  # have both. See https://github.com/slatedocs/slate/issues/1171 for more details.
-  activate :asset_hash, :exts => app.config[:asset_extensions] - %w[.woff .woff2]
-  # If you're having trouble with Middleman hanging, commenting
-  # out the following two lines has been known to help
-  activate :minify_css
-  activate :minify_javascript
-  # activate :gzip
-end
-
-# Deploy Configuration
-# If you want Middleman to listen on a different port, you can set that below
-set :port, 4567
-
-helpers do
-  require './lib/toc_data.rb'
-end
--- a/app/docs/slate/deploy.sh
+++ b/app/docs/slate/deploy.sh
@ -1,226 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit #abort if any command fails
-me=$(basename "$0")
-
-help_message="\
-Usage: $me [-c FILE] [<options>]
-Deploy generated files to a git branch.
-
-Options:
-
-  -h, --help               Show this help information.
-  -v, --verbose            Increase verbosity. Useful for debugging.
-  -e, --allow-empty        Allow deployment of an empty directory.
-  -m, --message MESSAGE    Specify the message used when committing on the
-                           deploy branch.
-  -n, --no-hash            Don't append the source commit's hash to the deploy
-                           commit's message.
-      --source-only        Only build but not push
-      --push-only          Only push but not build
-"
-
-
-run_build() {
-  bundle exec middleman build --clean
-}
-
-parse_args() {
-  # Set args from a local environment file.
-  if [ -e ".env" ]; then
-    source .env
-  fi
-
-  # Parse arg flags
-  # If something is exposed as an environment variable, set/overwrite it
-  # here. Otherwise, set/overwrite the internal variable instead.
-  while : ; do
-    if [[ $1 = "-h" || $1 = "--help" ]]; then
-      echo "$help_message"
-      exit 0
-    elif [[ $1 = "-v" || $1 = "--verbose" ]]; then
-      verbose=true
-      shift
-    elif [[ $1 = "-e" || $1 = "--allow-empty" ]]; then
-      allow_empty=true
-      shift
-    elif [[ ( $1 = "-m" || $1 = "--message" ) && -n $2 ]]; then
-      commit_message=$2
-      shift 2
-    elif [[ $1 = "-n" || $1 = "--no-hash" ]]; then
-      GIT_DEPLOY_APPEND_HASH=false
-      shift
-    elif [[ $1 = "--source-only" ]]; then
-      source_only=true
-      shift
-    elif [[ $1 = "--push-only" ]]; then
-      push_only=true
-      shift
-    else
-      break
-    fi
-  done
-
-  if [ ${source_only} ] && [ ${push_only} ]; then
-    >&2 echo "You can only specify one of --source-only or --push-only"
-    exit 1
-  fi
-
-  # Set internal option vars from the environment and arg flags. All internal
-  # vars should be declared here, with sane defaults if applicable.
-
-  # Source directory & target branch.
-  deploy_directory=build
-  deploy_branch=gh-pages
-
-  #if no user identity is already set in the current git environment, use this:
-  default_username=${GIT_DEPLOY_USERNAME:-deploy.sh}
-  default_email=${GIT_DEPLOY_EMAIL:-}
-
-  #repository to deploy to. must be readable and writable.
-  repo=origin
-
-  #append commit hash to the end of message by default
-  append_hash=${GIT_DEPLOY_APPEND_HASH:-true}
-}
-
-main() {
-  enable_expanded_output
-
-  if ! git diff --exit-code --quiet --cached; then
-    echo Aborting due to uncommitted changes in the index >&2
-    return 1
-  fi
-
-  commit_title=`git log -n 1 --format="%s" HEAD`
-  commit_hash=` git log -n 1 --format="%H" HEAD`
-
-  #default commit message uses last title if a custom one is not supplied
-  if [[ -z $commit_message ]]; then
-    commit_message="publish: $commit_title"
-  fi
-
-  #append hash to commit message unless no hash flag was found
-  if [ $append_hash = true ]; then
-    commit_message="$commit_message"$'\n\n'"generated from commit $commit_hash"
-  fi
-
-  previous_branch=`git rev-parse --abbrev-ref HEAD`
-
-  if [ ! -d "$deploy_directory" ]; then
-    echo "Deploy directory '$deploy_directory' does not exist. Aborting." >&2
-    return 1
-  fi
-
-  # must use short form of flag in ls for compatibility with macOS and BSD
-  if [[ -z `ls -A "$deploy_directory" 2> /dev/null` && -z $allow_empty ]]; then
-    echo "Deploy directory '$deploy_directory' is empty. Aborting. If you're sure you want to deploy an empty tree, use the --allow-empty / -e flag." >&2
-    return 1
-  fi
-
-  if git ls-remote --exit-code $repo "refs/heads/$deploy_branch" ; then
-    # deploy_branch exists in $repo; make sure we have the latest version
-
-    disable_expanded_output
-    git fetch --force $repo $deploy_branch:$deploy_branch
-    enable_expanded_output
-  fi
-
-  # check if deploy_branch exists locally
-  if git show-ref --verify --quiet "refs/heads/$deploy_branch"
-  then incremental_deploy
-  else initial_deploy
-  fi
-
-  restore_head
-}
-
-initial_deploy() {
-  git --work-tree "$deploy_directory" checkout --orphan $deploy_branch
-  git --work-tree "$deploy_directory" add --all
-  commit+push
-}
-
-incremental_deploy() {
-  #make deploy_branch the current branch
-  git symbolic-ref HEAD refs/heads/$deploy_branch
-  #put the previously committed contents of deploy_branch into the index
-  git --work-tree "$deploy_directory" reset --mixed --quiet
-  git --work-tree "$deploy_directory" add --all
-
-  set +o errexit
-  diff=$(git --work-tree "$deploy_directory" diff --exit-code --quiet HEAD --)$?
-  set -o errexit
-  case $diff in
-    0) echo No changes to files in $deploy_directory. Skipping commit.;;
-    1) commit+push;;
-    *)
-      echo git diff exited with code $diff. Aborting. Staying on branch $deploy_branch so you can debug. To switch back to main, use: git symbolic-ref HEAD refs/heads/main && git reset --mixed >&2
-      return $diff
-      ;;
-  esac
-}
-
-commit+push() {
-  set_user_id
-  git --work-tree "$deploy_directory" commit -m "$commit_message"
-
-  disable_expanded_output
-  #--quiet is important here to avoid outputting the repo URL, which may contain a secret token
-  git push --quiet $repo $deploy_branch
-  enable_expanded_output
-}
-
-#echo expanded commands as they are executed (for debugging)
-enable_expanded_output() {
-  if [ $verbose ]; then
-    set -o xtrace
-    set +o verbose
-  fi
-}
-
-#this is used to avoid outputting the repo URL, which may contain a secret token
-disable_expanded_output() {
-  if [ $verbose ]; then
-    set +o xtrace
-    set -o verbose
-  fi
-}
-
-set_user_id() {
-  if [[ -z `git config user.name` ]]; then
-    git config user.name "$default_username"
-  fi
-  if [[ -z `git config user.email` ]]; then
-    git config user.email "$default_email"
-  fi
-}
-
-restore_head() {
-  if [[ $previous_branch = "HEAD" ]]; then
-    #we weren't on any branch before, so just set HEAD back to the commit it was on
-    git update-ref --no-deref HEAD $commit_hash $deploy_branch
-  else
-    git symbolic-ref HEAD refs/heads/$previous_branch
-  fi
-
-  git reset --mixed
-}
-
-filter() {
-  sed -e "s|$repo|\$repo|g"
-}
-
-sanitize() {
-  "$@" 2> >(filter 1>&2) | filter
-}
-
-parse_args "$@"
-
-if [[ ${source_only} ]]; then
-  run_build
-elif [[ ${push_only} ]]; then
-  main "$@"
-else
-  run_build
-  main "$@"
-fi
--- a/app/docs/slate/font-selection.json
+++ b/app/docs/slate/font-selection.json
@ -1,148 +0,0 @@
-{
-	"IcoMoonType": "selection",
-	"icons": [
-		{
-			"icon": {
-				"paths": [
-					"M438.857 73.143q119.429 0 220.286 58.857t159.714 159.714 58.857 220.286-58.857 220.286-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857zM512 785.714v-108.571q0-8-5.143-13.429t-12.571-5.429h-109.714q-7.429 0-13.143 5.714t-5.714 13.143v108.571q0 7.429 5.714 13.143t13.143 5.714h109.714q7.429 0 12.571-5.429t5.143-13.429zM510.857 589.143l10.286-354.857q0-6.857-5.714-10.286-5.714-4.571-13.714-4.571h-125.714q-8 0-13.714 4.571-5.714 3.429-5.714 10.286l9.714 354.857q0 5.714 5.714 10t13.714 4.286h105.714q8 0 13.429-4.286t6-10z"
-				],
-				"attrs": [],
-				"isMulticolor": false,
-				"tags": [
-					"exclamation-circle"
-				],
-				"defaultCode": 61546,
-				"grid": 14
-			},
-			"attrs": [],
-			"properties": {
-				"id": 100,
-				"order": 4,
-				"prevSize": 28,
-				"code": 58880,
-				"name": "exclamation-sign",
-				"ligatures": ""
-			},
-			"setIdx": 0,
-			"iconIdx": 0
-		},
-		{
-			"icon": {
-				"paths": [
-					"M585.143 786.286v-91.429q0-8-5.143-13.143t-13.143-5.143h-54.857v-292.571q0-8-5.143-13.143t-13.143-5.143h-182.857q-8 0-13.143 5.143t-5.143 13.143v91.429q0 8 5.143 13.143t13.143 5.143h54.857v182.857h-54.857q-8 0-13.143 5.143t-5.143 13.143v91.429q0 8 5.143 13.143t13.143 5.143h256q8 0 13.143-5.143t5.143-13.143zM512 274.286v-91.429q0-8-5.143-13.143t-13.143-5.143h-109.714q-8 0-13.143 5.143t-5.143 13.143v91.429q0 8 5.143 13.143t13.143 5.143h109.714q8 0 13.143-5.143t5.143-13.143zM877.714 512q0 119.429-58.857 220.286t-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857 220.286 58.857 159.714 159.714 58.857 220.286z"
-				],
-				"attrs": [],
-				"isMulticolor": false,
-				"tags": [
-					"info-circle"
-				],
-				"defaultCode": 61530,
-				"grid": 14
-			},
-			"attrs": [],
-			"properties": {
-				"id": 85,
-				"order": 3,
-				"name": "info-sign",
-				"prevSize": 28,
-				"code": 58882
-			},
-			"setIdx": 0,
-			"iconIdx": 2
-		},
-		{
-			"icon": {
-				"paths": [
-					"M733.714 419.429q0-16-10.286-26.286l-52-51.429q-10.857-10.857-25.714-10.857t-25.714 10.857l-233.143 232.571-129.143-129.143q-10.857-10.857-25.714-10.857t-25.714 10.857l-52 51.429q-10.286 10.286-10.286 26.286 0 15.429 10.286 25.714l206.857 206.857q10.857 10.857 25.714 10.857 15.429 0 26.286-10.857l310.286-310.286q10.286-10.286 10.286-25.714zM877.714 512q0 119.429-58.857 220.286t-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857 220.286 58.857 159.714 159.714 58.857 220.286z"
-				],
-				"attrs": [],
-				"isMulticolor": false,
-				"tags": [
-					"check-circle"
-				],
-				"defaultCode": 61528,
-				"grid": 14
-			},
-			"attrs": [],
-			"properties": {
-				"id": 83,
-				"order": 9,
-				"prevSize": 28,
-				"code": 58886,
-				"name": "ok-sign"
-			},
-			"setIdx": 0,
-			"iconIdx": 6
-		},
-		{
-			"icon": {
-				"paths": [
-					"M658.286 475.429q0-105.714-75.143-180.857t-180.857-75.143-180.857 75.143-75.143 180.857 75.143 180.857 180.857 75.143 180.857-75.143 75.143-180.857zM950.857 950.857q0 29.714-21.714 51.429t-51.429 21.714q-30.857 0-51.429-21.714l-196-195.429q-102.286 70.857-228 70.857-81.714 0-156.286-31.714t-128.571-85.714-85.714-128.571-31.714-156.286 31.714-156.286 85.714-128.571 128.571-85.714 156.286-31.714 156.286 31.714 128.571 85.714 85.714 128.571 31.714 156.286q0 125.714-70.857 228l196 196q21.143 21.143 21.143 51.429z"
-				],
-				"width": 951,
-				"attrs": [],
-				"isMulticolor": false,
-				"tags": [
-					"search"
-				],
-				"defaultCode": 61442,
-				"grid": 14
-			},
-			"attrs": [],
-			"properties": {
-				"id": 2,
-				"order": 1,
-				"prevSize": 28,
-				"code": 58887,
-				"name": "icon-search"
-			},
-			"setIdx": 0,
-			"iconIdx": 7
-		}
-	],
-	"height": 1024,
-	"metadata": {
-		"name": "slate",
-		"license": "SIL OFL 1.1"
-	},
-	"preferences": {
-		"showGlyphs": true,
-		"showQuickUse": true,
-		"showQuickUse2": true,
-		"showSVGs": true,
-		"fontPref": {
-			"prefix": "icon-",
-			"metadata": {
-				"fontFamily": "slate",
-				"majorVersion": 1,
-				"minorVersion": 0,
-				"description": "Based on FontAwesome",
-				"license": "SIL OFL 1.1"
-			},
-			"metrics": {
-				"emSize": 1024,
-				"baseline": 6.25,
-				"whitespace": 50
-			},
-			"resetPoint": 58880,
-			"showSelector": false,
-			"selector": "class",
-			"classSelector": ".icon",
-			"showMetrics": false,
-			"showMetadata": true,
-			"showVersion": true,
-			"ie7": false
-		},
-		"imagePref": {
-			"prefix": "icon-",
-			"png": true,
-			"useClassSelector": true,
-			"color": 4473924,
-			"bgColor": 16777215
-		},
-		"historySize": 100,
-		"showCodes": true,
-		"gridSize": 16,
-		"showLiga": false
-	}
-}
--- a/app/docs/slate/lib/monokai_sublime_slate.rb
+++ b/app/docs/slate/lib/monokai_sublime_slate.rb
@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*- #
-# frozen_string_literal: true
-
-# this is based on https://github.com/rouge-ruby/rouge/blob/master/lib/rouge/themes/monokai_sublime.rb
-# but without the added background, and changed styling for JSON keys to be soft_yellow instead of white
-
-module Rouge
-    module Themes
-      class MonokaiSublimeSlate < CSSTheme
-        name 'monokai.sublime.slate'
-
-        palette :black          => '#000000'
-        palette :bright_green   => '#a6e22e'
-        palette :bright_pink    => '#f92672'
-        palette :carmine        => '#960050'
-        palette :dark           => '#49483e'
-        palette :dark_grey      => '#888888'
-        palette :dark_red       => '#aa0000'
-        palette :dimgrey        => '#75715e'
-        palette :emperor        => '#555555'
-        palette :grey           => '#999999'
-        palette :light_grey     => '#aaaaaa'
-        palette :light_violet   => '#ae81ff'
-        palette :soft_cyan      => '#66d9ef'
-        palette :soft_yellow    => '#e6db74'
-        palette :very_dark      => '#1e0010'
-        palette :whitish        => '#f8f8f2'
-        palette :orange         => '#f6aa11'
-        palette :white          => '#ffffff'
-
-        style Generic::Heading,                 :fg => :grey
-        style Literal::String::Regex,           :fg => :orange
-        style Generic::Output,                  :fg => :dark_grey
-        style Generic::Prompt,                  :fg => :emperor
-        style Generic::Strong,                  :bold => false
-        style Generic::Subheading,              :fg => :light_grey
-        style Name::Builtin,                    :fg => :orange
-        style Comment::Multiline,
-              Comment::Preproc,
-              Comment::Single,
-              Comment::Special,
-              Comment,                          :fg => :dimgrey
-        style Error,
-              Generic::Error,
-              Generic::Traceback,               :fg => :carmine
-        style Generic::Deleted,
-              Generic::Inserted,
-              Generic::Emph,                    :fg => :dark
-        style Keyword::Constant,
-              Keyword::Declaration,
-              Keyword::Reserved,
-              Name::Constant,
-              Keyword::Type,                    :fg => :soft_cyan
-        style Literal::Number::Float,
-              Literal::Number::Hex,
-              Literal::Number::Integer::Long,
-              Literal::Number::Integer,
-              Literal::Number::Oct,
-              Literal::Number,
-              Literal::String::Char,
-              Literal::String::Escape,
-              Literal::String::Symbol,          :fg => :light_violet
-        style Literal::String::Doc,
-              Literal::String::Double,
-              Literal::String::Backtick,
-              Literal::String::Heredoc,
-              Literal::String::Interpol,
-              Literal::String::Other,
-              Literal::String::Single,
-              Literal::String,                  :fg => :soft_yellow
-        style Name::Attribute,
-              Name::Class,
-              Name::Decorator,
-              Name::Exception,
-              Name::Function,                   :fg => :bright_green
-        style Name::Variable::Class,
-              Name::Namespace,
-              Name::Entity,
-              Name::Builtin::Pseudo,
-              Name::Variable::Global,
-              Name::Variable::Instance,
-              Name::Variable,
-              Text::Whitespace,
-              Text,
-              Name,                             :fg => :white
-        style Name::Label,                      :fg => :bright_pink
-        style Operator::Word,
-              Name::Tag,
-              Keyword,
-              Keyword::Namespace,
-              Keyword::Pseudo,
-              Operator,                         :fg => :bright_pink
-      end
-    end
-  end
--- a/app/docs/slate/lib/multilang.rb
+++ b/app/docs/slate/lib/multilang.rb
@ -1,16 +0,0 @@
-module Multilang
-  def block_code(code, full_lang_name)
-    if full_lang_name
-      parts = full_lang_name.split('--')
-      rouge_lang_name = (parts) ? parts[0] : "" # just parts[0] here causes null ref exception when no language specified
-      super(code, rouge_lang_name).sub("highlight #{rouge_lang_name}") do |match|
-        match + " tab-" + full_lang_name
-      end
-    else
-      super(code, full_lang_name)
-    end
-  end
-end
-
-require 'middleman-core/renderers/redcarpet'
-Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, Multilang
--- a/app/docs/slate/lib/nesting_unique_head.rb
+++ b/app/docs/slate/lib/nesting_unique_head.rb
@ -1,22 +0,0 @@
-# Nested unique header generation
-require 'middleman-core/renderers/redcarpet'
-
-class NestingUniqueHeadCounter < Middleman::Renderers::MiddlemanRedcarpetHTML
-  def initialize
-    super
-    @@headers_history = {} if !defined?(@@headers_history)
-  end
-
-  def header(text, header_level)
-    friendly_text = text.gsub(/<[^>]*>/,"").parameterize
-    @@headers_history[header_level] = text.parameterize
-
-    if header_level > 1
-      for i in (header_level - 1).downto(1)
-        friendly_text.prepend("#{@@headers_history[i]}-") if @@headers_history.key?(i)
-      end
-    end
-
-    return "<h#{header_level} id='#{friendly_text}'>#{text}</h#{header_level}>"
-  end
-end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jasder	1be0a918a6	FIX CORS problem for develop	2021-01-29 11:13:03 +08:00
Jasder	82bd15d4ec	fix cherry pick merge `458fca9992`	2021-01-29 11:11:37 +08:00
sylor_huang@126.com	441589b7f2	Reset settings show.json about navbar url	2020-10-16 16:43:57 +08:00
sylor_huang@126.com	3c5e6effc9	Add Setting button	2020-10-16 16:26:15 +08:00
sylor_huang@126.com	15565e513e	change	2020-10-16 15:11:10 +08:00
sylor_huang@126.com	38abe195c5	Reset Memo Replies Count1	2020-10-16 15:07:05 +08:00
sylor_huang@126.com	1809e580b7	Reset Memo Replies Count	2020-10-16 15:04:53 +08:00
sylor_huang@126.com	c3c9f24e22	Remove Admins Extra sidebar, migrate memos replies_count	2020-10-16 15:00:16 +08:00
sylor_huang@126.com	dffb859c38	change	2020-10-16 14:38:40 +08:00
sylor_huang@126.com	31a9b14639	change	2020-10-16 14:30:02 +08:00
sylor_huang@126.com	f196977cd6	change	2020-10-16 14:23:31 +08:00
sylor_huang@126.com	6b7b6b9a66	change forum_sections index	2020-10-16 14:20:32 +08:00
sylor_huang@126.com	a956d3d7ed	change1	2020-10-15 19:10:18 +08:00
sylor_huang@126.com	f4ed8086d4	change	2020-10-15 19:04:23 +08:00
sylor_huang@126.com	075100e468	change	2020-10-15 19:01:18 +08:00
sylor_huang@126.com	458e7147c5	Add Sync Forum	2020-10-15 18:45:50 +08:00
sylor_huang@126.com	e404843eb7	change children_forum_id	2020-10-15 15:48:42 +08:00
sylor_huang@126.com	9143a96894	change current_image_url	2020-10-15 15:21:21 +08:00
sylor_huang@126.com	5ee88ee7d8	change current_image_url	2020-10-15 15:19:30 +08:00
sylor_huang@126.com	921655567a	change my_interested bugs	2020-10-15 14:47:48 +08:00
sylor_huang@126.com	598571e8f4	Change User find_by errors	2020-10-15 13:59:03 +08:00
sylor_huang@126.com	5ae9c9bebc	change user picture	2020-10-15 11:53:22 +08:00
sylor_huang@126.com	79b61913c5	Change assets precompile	2020-10-15 11:45:30 +08:00
sylor_huang@126.com	61e7091ece	Change Forum Url	2020-10-15 11:27:54 +08:00
sylor_huang@126.com	e9c118fb77	Change ForumUser Page	2020-10-15 10:02:10 +08:00
sylor_huang@126.com	84ff2e4bf5	Change ForumUser	2020-10-14 19:18:44 +08:00
sylor_huang@126.com	3062528fb0	change	2020-10-14 17:12:21 +08:00
sylor_huang@126.com	3fd76d2f9e	Merge branch 'dev_forum' of http://git.trustie.net/jasder/forgeplus into dev_forum	2020-10-14 16:25:00 +08:00
sylor_huang@126.com	d5e57da6d4	Change Bug	2020-10-14 16:24:47 +08:00
Jasder	ae8b6b82f1	FIX forums page 500 bug	2020-10-14 16:09:23 +08:00
Jasder	4cd459ce58	Merge branch 'dev_forum' of http://git.trustie.net/jasder/forgeplus into dev_forum	2020-10-14 15:54:46 +08:00
sylor_huang@126.com	1f42076d20	Change Forum Backend Routes	2020-10-14 15:50:09 +08:00
sylor_huang@126.com	20dd1aeedf	Add ForumSection admin manages	2020-10-14 15:31:43 +08:00
sylor_huang@126.com	8ad3160ab7	Change Bug	2020-10-14 09:55:49 +08:00
sylor_huang@126.com	93e887e0e5	Merge branch 'dev_trustie' into dev_forum	2020-10-14 09:41:30 +08:00
sylor_huang@126.com	f3b88d77b0	Change	2020-10-14 09:40:25 +08:00
sylor_huang@126.com	5639a69f78	Change Forum	2020-10-13 19:25:17 +08:00
sylor_huang@126.com	141bf1a488	Add Memo API	2020-10-13 14:35:18 +08:00
Jasder	2383a0d21e	Merge branch 'dev_forum' of http://git.trustie.net/jasder/forgeplus into dev_forum	2020-10-12 18:57:30 +08:00
sylor_huang@126.com	fbec7a6e35	change	2020-10-12 18:09:13 +08:00
sylor_huang@126.com	ce2deaf543	change add user memos relationships	2020-10-12 17:57:48 +08:00
sylor_huang@126.com	dba0303428	change current_user method	2020-10-12 17:54:59 +08:00
sylor_huang@126.com	d656e3c3b7	Change Application Controller	2020-10-12 17:46:17 +08:00
sylor_huang@126.com	4fa4e7493c	Add Memo related models-2	2020-10-12 17:38:32 +08:00
sylor_huang@126.com	4d3a6c4811	Add Memo related models-1	2020-10-12 14:25:02 +08:00
sylor_huang@126.com	7c290482aa	Add Memo related models	2020-10-12 14:19:33 +08:00