From 6063c7c414e658d2d0e9246bdefef15ff6168f16 Mon Sep 17 00:00:00 2001
From: jasder <2053003901@qq.com>
Date: Thu, 11 Mar 2021 14:58:44 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix=20=E6=9B=B4=E6=96=B0api=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b75fcd647..928b5475d 100644
--- a/README.md
+++ b/README.md
@@ -93,26 +93,26 @@ http://localhost:3000/
 
 - 代码库
 
-![](docs/figs/code.png)
+![](docs/figs/code.png?raw=true)
 
 
 - 任务管理
-![](docs/figs/issue_manage.png)
+![](docs/figs/issue_manage.png?raw=true)
 
 - 任务查看
 
-![](docs/figs/issue_view.png)
+![](docs/figs/issue_view.png?raw=true)
 
 - 任务指派
 
-![](docs/figs/issue_assign2.png)
+![](docs/figs/issue_assign2.png?raw=true)
 
 - 里程碑
 
-![](docs/figs/milestone.png)
+![](docs/figs/milestone.png?raw=true)
 
 ### API
-- [API](api_document.md)
+- [API](https://forgeplus.trustie.net/docs/api)
 - [API](showdoc.com.cn)
   账号：forgeplus@admin.com 密码：forge123
 

From bd46d2dcc7f058fd2fdf3caddea767d8b085d3d0 Mon Sep 17 00:00:00 2001
From: jasder <2053003901@qq.com>
Date: Thu, 11 Mar 2021 14:59:21 +0800
Subject: [PATCH 02/11] fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 928b5475d..de1f91bac 100644
--- a/README.md
+++ b/README.md
@@ -112,7 +112,7 @@ http://localhost:3000/
 ![](docs/figs/milestone.png?raw=true)
 
 ### API
-- [API](https://forgeplus.trustie.net/docs/api)
+- [API文档](https://forgeplus.trustie.net/docs/api)
 - [API](showdoc.com.cn)
   账号：forgeplus@admin.com 密码：forge123
 

From 0d8ddc34cc48a16428e3a68693114ebf5e8c7f0c Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Mon, 22 Mar 2021 09:50:24 +0800
Subject: [PATCH 03/11] FIX update Changelog

---
 CHANGELOG.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aad86982..4345e60b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Changelog
 
-## [v3.0.0](https://github.com/go-gitea/gitea/releases/tag/v1.13.1) - 2020-12-29
+## [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)

From aa23762b2fa362581f074c8b5703cce4b48cee2b Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Mon, 22 Mar 2021 17:58:15 +0800
Subject: [PATCH 04/11] FIX update setting api for nav bar url

---
 app/controllers/settings_controller.rb    |  7 ++++++-
 app/models/site.rb                        | 23 +++++++++++++++++++++++
 app/views/settings/show.json.jbuilder     |  7 +++++++
 config/routes.rb                          |  3 +--
 db/migrate/20210322084619_create_sites.rb | 12 ++++++++++++
 5 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 app/models/site.rb
 create mode 100644 db/migrate/20210322084619_create_sites.rb

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index bb031c7b6..7e5e94d5e 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -1,6 +1,11 @@
 class SettingsController < ApplicationController
   def show
-    @old_projects_url = nil 
+    @old_projects_url = nil
     @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
+
+    @add =  Site.add
+    @personal = User.current.logged? ? Site.personal : []
+
+    # @sites = Site.group(:site_type).select(:name, :url, :key)
   end
 end
diff --git a/app/models/site.rb b/app/models/site.rb
new file mode 100644
index 000000000..0ed8d8020
--- /dev/null
+++ b/app/models/site.rb
@@ -0,0 +1,23 @@
+# == Schema Information
+#
+# Table name: sites
+#
+#  id         :integer          not null, primary key
+#  name       :string(255)
+#  url        :string(255)
+#  key        :string(255)
+#  site_type  :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class Site < ApplicationRecord
+  # add: 添加类链接
+  # personal: 个人名下类链接,
+  # common: 普通链接
+  enum site_type: { add: 0, personal: 1, common: 2 }
+
+  def self.set_default
+    
+  end
+end
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index 7de12345d..4202283bd 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -47,5 +47,12 @@ json.setting do
   json.new_course default_course_links
   json.old_projects_url @old_projects_url
 
+  json.add do
+    json.array! @add, :name, :url, :key
+  end
+  
+  json.personal do
+    json.array! @personal, :name, :url, :key
+  end
 
 end
diff --git a/config/routes.rb b/config/routes.rb
index 9e9e3d7a8..daef12bb4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,7 +23,6 @@ Rails.application.routes.draw do
 
   resources :edu_settings
 
-  resources :edu_settings
   scope '/api' do
     namespace :ci  do
       resources :languages, only: [:index, :show] do
@@ -379,7 +378,7 @@ Rails.application.routes.draw do
         end
       end
 
-      resource :repositories, path: '/', only: [:show, :create, :edit] do 
+      resource :repositories, path: '/', only: [:show, :create, :edit] do
         member do
           get :files
           get :detail
diff --git a/db/migrate/20210322084619_create_sites.rb b/db/migrate/20210322084619_create_sites.rb
new file mode 100644
index 000000000..e05784ec9
--- /dev/null
+++ b/db/migrate/20210322084619_create_sites.rb
@@ -0,0 +1,12 @@
+class CreateSites < ActiveRecord::Migration[5.2]
+  def change
+    create_table :sites do |t|
+      t.string :name, comment: "中文名称"
+      t.string :url, comment: "具体链接"
+      t.string :key, comment: "标识"
+      t.integer :site_type, comment: "分类，按照分类编排链接"
+
+      t.timestamps
+    end
+  end
+end

From 18ae3853d76fbb36641f84350b570ed7a5e4961a Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Tue, 23 Mar 2021 11:42:22 +0800
Subject: [PATCH 05/11] FIX update setting api

---
 app/controllers/settings_controller.rb | 15 +++++++++++++--
 app/views/settings/show.json.jbuilder  |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 7e5e94d5e..4f4122c00 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -4,8 +4,19 @@ class SettingsController < ApplicationController
     @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
 
     @add =  Site.add
-    @personal = User.current.logged? ? Site.personal : []
-
+    @personal =
+      if User.current.logged?
+        arr =[]
+        Site.personal.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
+          hash = {}
+          site.each {|k, v|
+            hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
+          }
+          arr << hash
+        end
+      else
+        []
+      end
     # @sites = Site.group(:site_type).select(:name, :url, :key)
   end
 end
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index 4202283bd..fb03c6377 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -50,9 +50,9 @@ json.setting do
   json.add do
     json.array! @add, :name, :url, :key
   end
-  
+
   json.personal do
-    json.array! @personal, :name, :url, :key
+    json.array! @personal
   end
 
 end

From 815b3644281081db3238cf201a32938586a6cce3 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Tue, 23 Mar 2021 15:42:56 +0800
Subject: [PATCH 06/11] ADD common url with setting api

---
 app/controllers/settings_controller.rb | 12 ++++++++++--
 app/views/settings/show.json.jbuilder  |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 4f4122c00..a4eb551d9 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -3,7 +3,7 @@ class SettingsController < ApplicationController
     @old_projects_url = nil
     @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
 
-    @add =  Site.add
+    @add =  Site.add.select(:id, :name, :url, :key)
     @personal =
       if User.current.logged?
         arr =[]
@@ -17,6 +17,14 @@ class SettingsController < ApplicationController
       else
         []
       end
-    # @sites = Site.group(:site_type).select(:name, :url, :key)
+
+    @common = []
+    Site.common.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
+      hash = {}
+      site.each {|k, v|
+        hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
+      }
+      @common << hash
+    end
   end
 end
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index fb03c6377..697e1dd5d 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -47,6 +47,7 @@ json.setting do
   json.new_course default_course_links
   json.old_projects_url @old_projects_url
 
+
   json.add do
     json.array! @add, :name, :url, :key
   end
@@ -55,4 +56,7 @@ json.setting do
     json.array! @personal
   end
 
+  json.common do
+    json.array! @common
+  end
 end

From 8b656fd4093386f12ba42938314c624d5c993762 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Tue, 23 Mar 2021 15:47:01 +0800
Subject: [PATCH 07/11] FIX bug

---
 app/controllers/settings_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index a4eb551d9..34f951cea 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -22,6 +22,7 @@ class SettingsController < ApplicationController
     Site.common.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
       hash = {}
       site.each {|k, v|
+        next if v.to_s.include?("current_user") && !User.current_user.logged?
         hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
       }
       @common << hash

From 0f67944911dc0076d7884cbf7f8f4337e161ebe0 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Tue, 23 Mar 2021 15:58:12 +0800
Subject: [PATCH 08/11] FIX code bug

---
 app/controllers/settings_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 34f951cea..65a5786d1 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -20,9 +20,9 @@ class SettingsController < ApplicationController
 
     @common = []
     Site.common.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
+      next if site["url"].to_s.include?("current_user") && !User.current.logged?
       hash = {}
       site.each {|k, v|
-        next if v.to_s.include?("current_user") && !User.current_user.logged?
         hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
       }
       @common << hash

From 9195d43a3454cd0029f0620ce45dffcc671a0e95 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Tue, 30 Mar 2021 15:15:17 +0800
Subject: [PATCH 09/11] Update readme and deply doc

---
 README.md | 53 +++++++++++++++++++++++++++++++++++++++--------------
 deploy.md | 13 +++++++++----
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index de1f91bac..a05721591 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,32 @@ Trustie （确实）是一个以大众化协同开发、开放式资源共享、
 ## 部署
 
 
-### 1. 安装依赖包
+### Depends Versions
 
-```bash
-bundle install
+* Ruby 2.4.5
+
+* Rails ~> 5.2
+
+* MySql ~> 5.6
+
+* Redis 5+
+
+* NodeJS > 13.0.0
+
+### Steps
+
+#### 1. 克隆稳定版本
+```
+git clone -b standalone https://git.trustie.net/jasder/forgeplus.git
 ```
 
-### 2. 配置初始化文件
+#### 2. 安装依赖包
+
+```bash
+cd forgeplus && bundle install
+```
+
+#### 3. 配置初始化文件
 进入项目根目录执行一下命令：
 
 ```bash
@@ -27,10 +46,10 @@ touch config/redis.yml
 touch config/elasticsearch.yml
 ```
 
-### 3. 配置gitea服务(可选)
+#### 3. 配置gitea服务(可选)
 **如需要部署自己的gitea平台，请参考gitea官方平台：https://docs.gitea.io/zh-cn/install-from-binary/**
 
-**因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/jasder/gitea-binary
+**因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/jasder/gitea-binary**
 
 #### 配置gitea服务步骤
 1. 部署gitea服务，并注册root账户
@@ -44,45 +63,51 @@ gitea:
   base_url: '/api/v1'
 ```
 
-### 4. 安装redis环境
+#### 4. 安装redis环境
 **请自行搜索各平台如何安装部署redis环境**
 
 
-### 5. 创建数据库
+#### 5. 创建数据库
 
 ```bash
 rails db:create
 ```
 
-### 6. 导入数据表结构
+#### 6. 导入数据表结构
 
 ```bash
 bundle exec rake sync_table_structure:import_csv
 ```
 
-### 7. 执行migrate迁移文件
+#### 7. 执行migrate迁移文件
 **开发环境为development， 生成环境为production**
 ```bash
 rails db:migrate RAILS_ENV=development
 ```
 
-### 8. 启动redis(此处已mac系统为例)
+#### 8. clone前端代码
+**将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
+```bash
+git clone -b standalone https://git.trustie.net/jasder/build.git
+```
+
+#### 9. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```
 
-### 9. 启动sidekiq
+#### 10. 启动sidekiq
 **开发环境为development， 生成环境为production**
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-### 10. 启动rails服务
+#### 11. 启动rails服务
 ```bash
 rails s
 ```
 
-### 11. 浏览器访问
+#### 12. 浏览器访问
 在浏览器中输入如下地址访问：
 ```bash
 http://localhost:3000/
diff --git a/deploy.md b/deploy.md
index 12faea24e..fe4cd80f7 100644
--- a/deploy.md
+++ b/deploy.md
@@ -16,13 +16,18 @@
 
 ## Steps
 
-### 1. 安装依赖包
+### 1. 克隆稳定版本仓库
+```
+git clone -b standalone https://git.trustie.net/jasder/forgeplus.git
+```
+
+### 2. 安装依赖包
 
 ```bash
 bundle install
 ```
 
-### 2. 配置初始化文件
+### 3. 配置初始化文件
 进入项目根目录执行一下命令：
 
 ```bash
@@ -74,7 +79,7 @@ rails db:migrate RAILS_ENV=development
 ### 8. clone前端代码
 **将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
 ```bash
-git clone -b dev_trustie https://git.trustie.net/jasder/build.git
+git clone -b standalone https://git.trustie.net/jasder/build.git
 ```
 
 ### 9. 启动redis(此处已mac系统为例)
@@ -88,7 +93,7 @@ redis-server&
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-### 1`. 启动rails服务
+### 11. 启动rails服务
 ```bash
 rails s
 ```

From 386952962061bdbb41ed7711a08a8070f37c9b3e Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Wed, 31 Mar 2021 09:49:05 +0800
Subject: [PATCH 10/11] Update setting api

---
 app/controllers/settings_controller.rb    |  62 +++++++---
 app/models/project.rb                     | 143 +++++++++++-----------
 app/models/site.rb                        |  53 +++++++-
 app/views/settings/show.json.jbuilder     |   4 +-
 db/migrate/20210322084619_create_sites.rb |   2 +
 5 files changed, 171 insertions(+), 93 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 65a5786d1..f0a436d94 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -1,31 +1,57 @@
 class SettingsController < ApplicationController
   def show
     @old_projects_url = nil
-    @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
+    get_add_menu
+    get_common_menu
+    get_personal_menu
+  end
 
-    @add =  Site.add.select(:id, :name, :url, :key)
-    @personal =
+  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}":  set_site_url(k, v))
+        }
+        @add << hash
+      end
+    end
+
+    def get_common_menu
+      @common = []
+      Site.common.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
+        next if site["url"].to_s.include?("current_user") && !User.current.logged?
+        hash = {}
+        site.each {|k, v|
+          hash.merge!("#{k}":  set_site_url(k, v))
+        }
+        @common << hash
+      end
+    end
+
+    def get_personal_menu
+      @personal = []
       if User.current.logged?
-        arr =[]
         Site.personal.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
           hash = {}
           site.each {|k, v|
-            hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
+            hash.merge!("#{k}": set_site_url(k, v))
           }
-          arr << hash
+          @personal << hash
         end
-      else
-        []
       end
-
-    @common = []
-    Site.common.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
-      next if site["url"].to_s.include?("current_user") && !User.current.logged?
-      hash = {}
-      site.each {|k, v|
-        hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
-      }
-      @common << hash
     end
-  end
+
+    def set_site_url(key, value)
+      value =
+        if value.to_s.include?("current_user")
+          split_arr = value.split('current_user')
+          split_arr.length > 1 ? split_arr.join(current_user&.login) : (split_arr << current_user&.login).join('')
+        else
+          value
+        end
+
+      key.to_s === "url" && !value.to_s.start_with?("http") ? [request.protocol, request.host_with_port, value].join('') : value
+   end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index cde2f1011..828a259dc 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,74 +1,75 @@
-# == Schema Information
-#
-# Table name: projects
-#
-#  id                     :integer          not null, primary key
-#  name                   :string(255)      default(""), not null
-#  description            :text(4294967295)
-#  homepage               :string(255)      default("")
-#  is_public              :boolean          default("1"), not null
-#  parent_id              :integer
-#  created_on             :datetime
-#  updated_on             :datetime
-#  identifier             :string(255)
-#  status                 :integer          default("1"), not null
-#  lft                    :integer
-#  rgt                    :integer
-#  inherit_members        :boolean          default("0"), not null
-#  project_type           :integer          default("0")
-#  hidden_repo            :boolean          default("0"), not null
-#  attachmenttype         :integer          default("1")
-#  user_id                :integer
-#  dts_test               :integer          default("0")
-#  enterprise_name        :string(255)
-#  organization_id        :integer
-#  project_new_type       :integer
-#  gpid                   :integer
-#  forked_from_project_id :integer
-#  forked_count           :integer          default("0")
-#  publish_resource       :integer          default("0")
-#  visits                 :integer          default("0")
-#  hot                    :integer          default("0")
-#  invite_code            :string(255)
-#  qrcode                 :string(255)
-#  qrcode_expiretime      :integer          default("0")
-#  script                 :text(65535)
-#  training_status        :integer          default("0")
-#  rep_identifier         :string(255)
-#  project_category_id    :integer
-#  project_language_id    :integer
-#  license_id             :integer
-#  ignore_id              :integer
-#  praises_count          :integer          default("0")
-#  watchers_count         :integer          default("0")
-#  issues_count           :integer          default("0")
-#  pull_requests_count    :integer          default("0")
-#  language               :string(255)
-#  versions_count         :integer          default("0")
-#  issue_tags_count       :integer          default("0")
-#  closed_issues_count    :integer          default("0")
-#  open_devops            :boolean          default("0")
-#  gitea_webhook_id       :integer
-#  open_devops_count      :integer          default("0")
-#  recommend              :boolean          default("0")
-#  platform               :integer          default("0")
-#  default_branch         :string(255)      default("master")
-#  website                :string(255)
-#
-# Indexes
-#
-#  index_projects_on_forked_from_project_id  (forked_from_project_id)
-#  index_projects_on_identifier              (identifier)
-#  index_projects_on_is_public               (is_public)
-#  index_projects_on_lft                     (lft)
-#  index_projects_on_name                    (name)
-#  index_projects_on_platform                (platform)
-#  index_projects_on_project_type            (project_type)
-#  index_projects_on_recommend               (recommend)
-#  index_projects_on_rgt                     (rgt)
-#  index_projects_on_status                  (status)
-#  index_projects_on_updated_on              (updated_on)
-#
+# == Schema Information
+#
+# Table name: projects
+#
+#  id                     :integer          not null, primary key
+#  name                   :string(255)      default(""), not null
+#  description            :text(4294967295)
+#  homepage               :string(255)      default("")
+#  is_public              :boolean          default("1"), not null
+#  parent_id              :integer
+#  created_on             :datetime
+#  updated_on             :datetime
+#  identifier             :string(255)
+#  status                 :integer          default("1"), not null
+#  lft                    :integer
+#  rgt                    :integer
+#  inherit_members        :boolean          default("0"), not null
+#  project_type           :integer          default("0")
+#  hidden_repo            :boolean          default("0"), not null
+#  attachmenttype         :integer          default("1")
+#  user_id                :integer
+#  dts_test               :integer          default("0")
+#  enterprise_name        :string(255)
+#  organization_id        :integer
+#  project_new_type       :integer
+#  gpid                   :integer
+#  forked_from_project_id :integer
+#  forked_count           :integer          default("0")
+#  publish_resource       :integer          default("0")
+#  visits                 :integer          default("0")
+#  hot                    :integer          default("0")
+#  invite_code            :string(255)
+#  qrcode                 :string(255)
+#  qrcode_expiretime      :integer          default("0")
+#  script                 :text(65535)
+#  training_status        :integer          default("0")
+#  rep_identifier         :string(255)
+#  project_category_id    :integer
+#  project_language_id    :integer
+#  license_id             :integer
+#  ignore_id              :integer
+#  praises_count          :integer          default("0")
+#  watchers_count         :integer          default("0")
+#  issues_count           :integer          default("0")
+#  pull_requests_count    :integer          default("0")
+#  language               :string(255)
+#  versions_count         :integer          default("0")
+#  issue_tags_count       :integer          default("0")
+#  closed_issues_count    :integer          default("0")
+#  open_devops            :boolean          default("0")
+#  gitea_webhook_id       :integer
+#  open_devops_count      :integer          default("0")
+#  recommend              :boolean          default("0")
+#  platform               :integer          default("0")
+#  default_branch         :string(255)      default("master")
+#  website                :string(255)
+#
+# Indexes
+#
+#  index_projects_on_forked_from_project_id  (forked_from_project_id)
+#  index_projects_on_identifier              (identifier)
+#  index_projects_on_is_public               (is_public)
+#  index_projects_on_lft                     (lft)
+#  index_projects_on_name                    (name)
+#  index_projects_on_platform                (platform)
+#  index_projects_on_project_type            (project_type)
+#  index_projects_on_recommend               (recommend)
+#  index_projects_on_rgt                     (rgt)
+#  index_projects_on_status                  (status)
+#  index_projects_on_updated_on              (updated_on)
+#
+
 
 
 
diff --git a/app/models/site.rb b/app/models/site.rb
index 0ed8d8020..58daddf14 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -17,7 +17,56 @@ class Site < ApplicationRecord
   # common: 普通链接
   enum site_type: { add: 0, personal: 1, common: 2 }
 
-  def self.set_default
-    
+  def self.set_default_menu
+    set_add_menu!
+    set_personal_menu!
+    set_common_menu!
   end
+
+  private
+    def self.set_add_menu!
+      adds= [
+        {name: '新建镜像项目', key: 'add_mirror_project', url: '/projects/mirror/new'},
+        {name: '新建托管项目', key: 'add_common', url: '/projects/deposit/new'},
+        {name: '新建组织', key: 'add_r', url: '/organize/new'}]
+
+      adds.each { |ele|
+        Site.find_or_create_by(key: ele[:key]) do |site|
+          site.name = ele[:name]
+          site.url = ele[:url]
+          site.site_type = Site.site_types[:add]
+        end
+      }
+    end
+
+    def self.set_personal_menu!
+      personals = [
+        {name: '个人中心', key: 'my_page', url: '/users/current_user'},
+        {name: '我的组织', key: 'my_organizes', url: '/users/current_user/organizes'}
+      ]
+
+      personals.each { |ele|
+        Site.find_or_create_by(key: ele[:key]) do |site|
+          site.name = ele[:name]
+          site.url = ele[:url]
+          site.site_type = Site.site_types[:personal]
+        end
+      }
+    end
+
+    def self.set_common_menu!
+      commons = [
+        {name: '通知', key: 'notice', url: '/users/current_user/user_messages'},
+        {name: '找回密码', key: 'lost_password', url: '/account/lost_password'},
+        {name: '注册', key: 'register', url: '/login?login=false'}
+      ]
+
+      commons.each { |ele|
+        Site.find_or_create_by(key: ele[:key]) do |site|
+          site.name = ele[:name]
+          site.url = ele[:url]
+          site.site_type = Site.site_types[:common]
+        end
+      }
+    end
 end
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index 697e1dd5d..39b152fa7 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -45,11 +45,11 @@ json.setting do
 
   json.main_site current_laboratory.main_site?
   json.new_course default_course_links
-  json.old_projects_url @old_projects_url
 
 
   json.add do
-    json.array! @add, :name, :url, :key
+    # json.array! @add, :name, :url, :key
+    json.array! @add
   end
 
   json.personal do
diff --git a/db/migrate/20210322084619_create_sites.rb b/db/migrate/20210322084619_create_sites.rb
index e05784ec9..9d5c58ba2 100644
--- a/db/migrate/20210322084619_create_sites.rb
+++ b/db/migrate/20210322084619_create_sites.rb
@@ -8,5 +8,7 @@ class CreateSites < ActiveRecord::Migration[5.2]
 
       t.timestamps
     end
+
+    Site.set_default_menu
   end
 end

From 62b99c517ea0583a9c41c519ba95885b1a2f5573 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Wed, 31 Mar 2021 10:08:20 +0800
Subject: [PATCH 11/11] Update deploy doc

---
 README.md                   | 32 +++++++++++++++++++++++---------
 config/database.yml.example |  3 +--
 deploy.md                   | 34 ++++++++++++++++++++++++----------
 3 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index a05721591..d04ae98f7 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,21 @@ touch config/redis.yml
 touch config/elasticsearch.yml
 ```
 
-#### 3. 配置gitea服务(可选)
+#### 4. 配置数据库
+数据库配置信息请查看/config/database.yml文件，
+项目默认采用mysql数据库, 如需更改，请自行修改配置信息，
+默认配置如下：
+
+```bash
+default: &default
+  adapter: mysql2
+  host: 127.0.0.1
+  encoding: utf8
+  username: root
+  password: 123456
+```
+
+#### 5. 配置gitea服务(可选)
 **如需要部署自己的gitea平台，请参考gitea官方平台：https://docs.gitea.io/zh-cn/install-from-binary/**
 
 **因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/jasder/gitea-binary**
@@ -63,46 +77,46 @@ gitea:
   base_url: '/api/v1'
 ```
 
-#### 4. 安装redis环境
+#### 6. 安装redis环境
 **请自行搜索各平台如何安装部署redis环境**
 
 
-#### 5. 创建数据库
+#### 7. 创建数据库
 
 ```bash
 rails db:create
 ```
 
-#### 6. 导入数据表结构
+#### 8. 导入数据表结构
 
 ```bash
 bundle exec rake sync_table_structure:import_csv
 ```
 
-#### 7. 执行migrate迁移文件
+#### 9. 执行migrate迁移文件
 **开发环境为development， 生成环境为production**
 ```bash
 rails db:migrate RAILS_ENV=development
 ```
 
-#### 8. clone前端代码
+#### 10. clone前端代码
 **将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
 ```bash
 git clone -b standalone https://git.trustie.net/jasder/build.git
 ```
 
-#### 9. 启动redis(此处已mac系统为例)
+#### 11. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```
 
-#### 10. 启动sidekiq
+#### 12. 启动sidekiq
 **开发环境为development， 生成环境为production**
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-#### 11. 启动rails服务
+#### 13. 启动rails服务
 ```bash
 rails s
 ```
diff --git a/config/database.yml.example b/config/database.yml.example
index 26e752e45..dae8f8816 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -11,6 +11,7 @@
 #
 default: &default
   adapter: mysql2
+  host: 127.0.0.1
   encoding: utf8
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   username: root
@@ -51,5 +52,3 @@ test:
 production:
   <<: *default
   database: forge_production
-  username: educoderplus
-  password: <%= ENV['EDUCODERPLUS_DATABASE_PASSWORD'] %>
diff --git a/deploy.md b/deploy.md
index fe4cd80f7..527625054 100644
--- a/deploy.md
+++ b/deploy.md
@@ -37,7 +37,21 @@ touch config/redis.yml
 touch config/elasticsearch.yml
 ```
 
-### 3. 配置gitea服务(可选)
+### 4. 配置数据库
+数据库配置信息请查看/config/database.yml文件，
+项目默认采用mysql数据库, 如需更改，请自行修改配置信息，
+默认配置如下：
+
+```bash
+default: &default
+  adapter: mysql2
+  host: 127.0.0.1
+  encoding: utf8
+  username: root
+  password: 123456
+```
+
+### 4. 配置gitea服务(可选)
 **如需要部署自己的gitea平台，请参考gitea官方平台：https://docs.gitea.io/zh-cn/install-from-binary/**
 
 **因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/jasder/gitea-binary**
@@ -54,51 +68,51 @@ gitea:
   base_url: '/api/v1'
 ```
 
-### 4. 安装redis环境
+### 5. 安装redis环境
 **请自行搜索各平台如何安装部署redis环境**
 
 
-### 5. 创建数据库
+### 6. 创建数据库
 
 ```bash
 rails db:create
 ```
 
-### 6. 导入数据表结构
+### 7. 导入数据表结构
 
 ```bash
 bundle exec rake sync_table_structure:import_csv
 ```
 
-### 7. 执行migrate迁移文件
+### 8. 执行migrate迁移文件
 **开发环境为development， 生成环境为production**
 ```bash
 rails db:migrate RAILS_ENV=development
 ```
 
-### 8. clone前端代码
+### 9. clone前端代码
 **将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
 ```bash
 git clone -b standalone https://git.trustie.net/jasder/build.git
 ```
 
-### 9. 启动redis(此处已mac系统为例)
+### 10. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```
 
-### 10. 启动sidekiq
+### 11. 启动sidekiq
 **开发环境为development， 生成环境为production**
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-### 11. 启动rails服务
+### 12. 启动rails服务
 ```bash
 rails s
 ```
 
-### 12. 浏览器访问
+### 13. 浏览器访问
 在浏览器中输入如下地址访问：
 ```bash
 http://localhost:3000/