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/18] =?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 b75fcd64..928b5475 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/18] fix

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

diff --git a/README.md b/README.md
index 928b5475..de1f91ba 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/18] FIX update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aad8698..4345e60b 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 9195d43a3454cd0029f0620ce45dffcc671a0e95 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Tue, 30 Mar 2021 15:15:17 +0800
Subject: [PATCH 04/18] 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 de1f91ba..a0572159 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 12faea24..fe4cd80f 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 d7a459bad2e3ffa2c8c4243bb355543a5e6bb43f Mon Sep 17 00:00:00 2001
From: "vilet.yy" <yystopf@163.com>
Date: Tue, 30 Mar 2021 16:33:21 +0800
Subject: [PATCH 05/18] add: dir md

---
 dir.md | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 dir.md

diff --git a/dir.md b/dir.md
new file mode 100644
index 00000000..a4443ded
--- /dev/null
+++ b/dir.md
@@ -0,0 +1,135 @@
+forgeplus
+├── app(应用目录)
+│   ├── assets(应用静态资源目录)
+│   ├── channels(actioncable的频道目录)
+│   │   └── application_cable(父类)
+│   ├── constraint
+│   ├── controllers(应用控制器目录)
+│   │   ├── admins(后台管理控制器)
+│   │   ├── callbacks
+│   │   ├── ci(工作流相关控制器)
+│   │   ├── concerns(可反复使用的抽象方法)
+│   │   │   ├── admins(对应后台管理模块)
+│   │   │   ├── base(父类)
+│   │   │   ├── ci(对应工作流模块)
+│   │   │   └── repository(对应仓库模块)
+│   │   ├── oauth(oauth验证控制器)
+│   │   ├── organizations(组织模块控制器)
+│   │   ├── projects(项目模块控制器)
+│   │   └── users(用户模块控制器)
+│   ├── decorators
+│   ├── docs(api文档插件)
+│   ├── forms(表单验证)
+│   │   ├── ci(工作流模块)
+│   │   ├── contents(仓库文件模块)
+│   │   ├── gitea(gitea模块)
+│   │   │   └── user(gitea用户模块)
+│   │   ├── project_packages(竞标模块)
+│   │   ├── projects(项目模块)
+│   │   ├── protected_branches(保护分支模块)
+│   │   ├── repositories(仓库模块)
+│   │   ├── users(用户模块)
+│   │   └── validate(公共模块)
+│   ├── helpers(一些控制器帮助方法)
+│   ├── imports(导入文件处理)
+│   ├── interactors(流程处理器,和service类似，比如注册，创建项目)
+│   ├── jobs(异步任务)
+│   ├── libs(应用扩展目录)
+│   │   ├── ci(工作流模块)
+│   │   │   └── drone
+│   │   ├── gitea
+│   │   ├── limit_forbid_control
+│   │   ├── omniauth
+│   │   │   └── strategies
+│   │   ├── trustie
+│   │   ├── util
+│   │   ├── wechat
+│   │   └── wechat_oauth
+│   ├── mailers(用来存放实现发送邮件功能的文件)
+│   ├── models(模型目录)
+│   ├── queries(模型查询的封装)
+│   │   ├── admins(后台管理模块)
+│   │   ├── ci(工作流模块)
+│   │   ├── projects(项目模块)
+│   │   ├── statistic(统计模块)
+│   │   └── users(用户模块)
+│   ├── services(业务逻辑的封装)
+│   │   ├── admins(后台管理模块)
+│   │   ├── branches(仓库分支模块)
+│   │   ├── concerns(可反复使用的抽象方法)
+│   │   ├── educoder(educoder仓库模块)
+│   │   │   └── repository(仓库)
+│   │   │       ├── commits(提交)
+│   │   │       └── entries(文件)
+│   │   ├── gitea(gitea接口封装)
+│   │   │   ├── activity(项目统计模块)
+│   │   │   ├── chain
+│   │   │   ├── hooks(webhook模块)
+│   │   │   ├── labels
+│   │   │   ├── oauth2
+│   │   │   ├── organization(组织模块)
+│   │   │   │   ├── organization_user(组织成员)
+│   │   │   │   ├── repository(组织仓库)
+│   │   │   │   ├── team(组织团队)
+│   │   │   │   ├── team_project(组织团队项目)
+│   │   │   │   └── team_user(组织团队成员)
+│   │   │   ├── pull_request(合并请求模块)
+│   │   │   ├── repository(仓库模块)
+│   │   │   │   ├── branches(分支)
+│   │   │   │   ├── commits(提交)
+│   │   │   │   ├── contributors(贡献数)
+│   │   │   │   ├── entries(文件)
+│   │   │   │   ├── files(所有文件)
+│   │   │   │   ├── languages(语言)
+│   │   │   │   ├── members(仓库成员)
+│   │   │   │   ├── protected_branches(分支保护)
+│   │   │   │   ├── readme
+│   │   │   │   └── tags(标签)
+│   │   │   ├── user(用户)
+│   │   │   └── versions(发行版)
+│   │   ├── issues(易修)
+│   │   ├── libraries
+│   │   ├── oauth
+│   │   ├── organizations(组织)
+│   │   │   └── teams(组织团队)
+│   │   ├── private_messages
+│   │   ├── project_packages(项目竞标)
+│   │   ├── projects(项目)
+│   │   ├── protected_branches(分支保护)
+│   │   ├── pull_requests(合并请求)
+│   │   ├── repositories（仓库)
+│   │   └── users（用户)
+│   ├── tasks(可执行任务目录)
+│   └── views(控制器对应视图文件目录)
+├── bin(存放运行程序的 rails 脚本，以及其他用来部署或运行程序的脚本)
+├── cable(actioncable配置目录)
+├── config(配置的文件目录)
+│   ├── admins(后台管理配置)
+│   ├── environments(rails程序的不同运行环境的配置)
+│   ├── harmonious_dictionary
+│   ├── initializers(加载完gem后会自动加载此目录)
+│   └── locales(i18n语言设置目录)
+├── db(存放当前数据库的模式，以及数据库迁移文件)
+│   └── migrate(用来存放数据库的迁移文件)
+├── lib(程序的扩展模块)
+│   ├── assets(通常是放置我们使用的插件中用到的assets)
+│   ├── educoder
+│   └── tasks(可执行任务目录)
+├── log(日志目录)
+├── public(唯一对外开放的文件夹，其他人可以直接访问这个目录中的东西)
+│   ├── assets(编译好的静态资源目录)
+│   ├── docs(api文档生成目录)
+│   ├── echart(图表目录)
+│   ├── editormd(富文本编辑器静态资源目录)
+│   ├── fonts(字体目录)
+│   ├── images(图片目录)
+│   ├── javascripts(脚本目录)
+│   ├── options(仓库许可证、gitignore、readme文件目录)
+│   ├── react
+│   │   └── build(前端编译好的文件目录)
+│   └── stylesheets(层叠样式表目录)
+├── spec(spec测试目录)
+├── test(用于存放单元测试、功能测试及整合测试文件等测试文件)
+├── tmp(临时文件，例如缓存，PID，会话文件)
+├── vendor(存放第三方代码。经常用来放第三方 gem)
+├──   └── assets(通常是放置一些我们从别的地方借用的assets)
\ No newline at end of file

From d0a65775aaf2b8828bf00840bec8ccda6753bdd3 Mon Sep 17 00:00:00 2001
From: "vilet.yy" <yystopf@163.com>
Date: Tue, 30 Mar 2021 16:34:12 +0800
Subject: [PATCH 06/18] fix: not show commiter avatar

---
 app/helpers/repositories_helper.rb                  | 2 +-
 app/views/repositories/_author.json.jbuilder        | 1 +
 app/views/repositories/_commit.json.jbuilder        | 4 ++--
 app/views/repositories/_commit_author.json.jbuilder | 5 ++++-
 app/views/repositories/commits.json.jbuilder        | 9 ++++++++-
 app/views/repositories/detail.json.jbuilder         | 4 +++-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 2889b6fc..a6426083 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -28,7 +28,7 @@ module RepositoriesHelper
 
   def render_commit_author(author_json)
     return nil if author_json.blank?
-    find_user_by_login author_json['login']
+    find_user_by_login author_json['name']
   end
 
   def readme_render_decode64_content(str, path)
diff --git a/app/views/repositories/_author.json.jbuilder b/app/views/repositories/_author.json.jbuilder
index 1dbcc4eb..e37a50e4 100644
--- a/app/views/repositories/_author.json.jbuilder
+++ b/app/views/repositories/_author.json.jbuilder
@@ -1,5 +1,6 @@
 json.author do
   if @project.forge?
+    json.id user.id
     json.login user.login
     json.type user&.type
     json.name user.real_name
diff --git a/app/views/repositories/_commit.json.jbuilder b/app/views/repositories/_commit.json.jbuilder
index 079473b3..95cb0341 100644
--- a/app/views/repositories/_commit.json.jbuilder
+++ b/app/views/repositories/_commit.json.jbuilder
@@ -26,9 +26,9 @@ if @project.forge?
   end
 
   json.author do
-    json.partial! 'commit_author', user: render_commit_author(commit['author'])
+    json.partial! 'commit_author', user: render_commit_author(commit['commit']['author']), name: commit['commit']['author']['name']
   end
   json.committer do
-    json.partial! 'commit_author', user: render_commit_author(commit['committer'])
+    json.partial! 'commit_author', user: render_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name']
   end
 end
diff --git a/app/views/repositories/_commit_author.json.jbuilder b/app/views/repositories/_commit_author.json.jbuilder
index 77d9b655..d57e7c53 100644
--- a/app/views/repositories/_commit_author.json.jbuilder
+++ b/app/views/repositories/_commit_author.json.jbuilder
@@ -4,5 +4,8 @@ if user
   json.name user.real_name
   json.image_url url_to_avatar(user)
 else
-  json.nil!
+  json.id nil
+  json.login name 
+  json.name name 
+  json.image_url File.join("avatars/User","b")
 end
diff --git a/app/views/repositories/commits.json.jbuilder b/app/views/repositories/commits.json.jbuilder
index 7cbf34c4..82cd1713 100644
--- a/app/views/repositories/commits.json.jbuilder
+++ b/app/views/repositories/commits.json.jbuilder
@@ -5,6 +5,7 @@ else
   json.total_count @hash_commit[:total_count]
   json.commits do
     json.array! @hash_commit[:body] do |commit|
+      json.commit1 commit
       commiter = commit['committer']
       if commiter.present? 
         commit_user_id = commiter['id']
@@ -17,7 +18,13 @@ else
       if forge_user 
         json.partial! 'author', user: forge_user 
       else 
-        json.author nil
+        json.author do
+          json.id nil 
+          json.login commit['commit']['author']['name']
+          json.type nil
+          json.name commit['commit']['author']['name']
+          json.image_url File.join("avatars/User","b")
+        end
       end
     end
   end
diff --git a/app/views/repositories/detail.json.jbuilder b/app/views/repositories/detail.json.jbuilder
index 58bc9abc..28a64e50 100644
--- a/app/views/repositories/detail.json.jbuilder
+++ b/app/views/repositories/detail.json.jbuilder
@@ -61,7 +61,7 @@ json.release_versions do
     json.tag_name release["tag_name"]
     json.created_at format_time(release["created_at"].to_time)
   end
-  json.total_count @result[:release].size
+  json.total_count @repository&.version_releases.size
 end
 json.branches do
   json.list @result[:branch].each do |branch|
@@ -93,3 +93,5 @@ json.contributors do
   json.total_count total_count
 end
 json.languages @result[:language]
+
+json.partial! 'author', locals: { user: @project.owner }

From ffa2782637a619ff23a3a217bf9c4d49cb80febe Mon Sep 17 00:00:00 2001
From: "vilet.yy" <yystopf@163.com>
Date: Tue, 30 Mar 2021 16:34:31 +0800
Subject: [PATCH 07/18] fix: detail release version limit

---
 app/services/gitea/versions/list_service.rb | 7 ++++---
 app/services/repositories/detail_service.rb | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/services/gitea/versions/list_service.rb b/app/services/gitea/versions/list_service.rb
index 40db0d14..5d160fc3 100644
--- a/app/services/gitea/versions/list_service.rb
+++ b/app/services/gitea/versions/list_service.rb
@@ -1,12 +1,13 @@
 # Get a list of all commits from a repository
 class Gitea::Versions::ListService < Gitea::ClientService
-  attr_reader :token, :user_name, :repo
+  attr_reader :token, :user_name, :repo, :args
 
   # sha: SHA or branch to start listing commits from (usually 'master')
-  def initialize(token, user_name, repo)
+  def initialize(token, user_name, repo, args={})
     @token = token
     @user_name = user_name
     @repo = repo
+    @args = args
   end
 
   def call
@@ -16,7 +17,7 @@ class Gitea::Versions::ListService < Gitea::ClientService
 
   private
   def params
-    Hash.new.merge(token: token)
+    args.merge(token: token)
   end
 
   def url
diff --git a/app/services/repositories/detail_service.rb b/app/services/repositories/detail_service.rb
index 39fa5741..d8853cf4 100644
--- a/app/services/repositories/detail_service.rb
+++ b/app/services/repositories/detail_service.rb
@@ -37,7 +37,7 @@ class Repositories::DetailService < ApplicationService
   end
 
   def release_suitable
-    releases = Gitea::Versions::ListService.call(@owner.gitea_token, @owner.try(:login), @repo.try(:identifier))
+    releases = Gitea::Versions::ListService.call(@owner.gitea_token, @owner.try(:login), @repo.try(:identifier), {page: 1, limit: 1})
     releases.is_a?(Hash) && releases[:status] == -1 ? [] : releases
   end
 

From 8952f6a9447468041c6bf35c802fd8c50655ebc0 Mon Sep 17 00:00:00 2001
From: "vilet.yy" <yystopf@163.com>
Date: Tue, 30 Mar 2021 17:13:58 +0800
Subject: [PATCH 08/18] fix: menu manager allow visit

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

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 93b6dc3b..34b60cd0 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -17,7 +17,7 @@ class ProjectsController < ApplicationController
     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("activity"))
-    menu.append(menu_hash_by_name("setting")) if current_user.admin? ||  @project.owner?(current_user)
+    menu.append(menu_hash_by_name("setting")) if current_user.admin? || @project.manager?(current_user)
 
     render json: menu
   end

From 9394d15752afa6be8e05145d654c7ba3c3c4cccc Mon Sep 17 00:00:00 2001
From: "vilet.yy" <yystopf@163.com>
Date: Tue, 30 Mar 2021 17:27:50 +0800
Subject: [PATCH 09/18] fix: menu manager allow visit

---
 app/controllers/projects/project_units_controller.rb | 2 +-
 app/controllers/projects_controller.rb               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects/project_units_controller.rb b/app/controllers/projects/project_units_controller.rb
index 90bc64a7..e21fa388 100644
--- a/app/controllers/projects/project_units_controller.rb
+++ b/app/controllers/projects/project_units_controller.rb
@@ -4,7 +4,7 @@ class Projects::ProjectUnitsController < Projects::BaseController
   end
 
   def create 
-    if current_user.admin? ||  @project.owner?(current_user)
+    if current_user.admin? || @project.manager?(current_user)
       ActiveRecord::Base.transaction do 
         ProjectUnit.update_by_unit_types!(@project, unit_types)
         render_ok
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 34b60cd0..f6ab3836 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -111,7 +111,7 @@ class ProjectsController < ApplicationController
   end
 
   def destroy
-    if  current_user.admin? ||  @project.owner?(current_user)
+    if current_user.admin? || @project.manager?(current_user)
       ActiveRecord::Base.transaction do
         Gitea::Repository::DeleteService.new(@project.owner, @project.identifier).call
         @project.destroy!

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/18] 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 65a5786d..f0a436d9 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 cde2f101..828a259d 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 0ed8d802..58daddf1 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 697e1dd5..39b152fa 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 e05784ec..9d5c58ba 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/18] 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 a0572159..d04ae98f 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 26e752e4..dae8f881 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 fe4cd80f..52762505 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/

From 9393ceb8b78aa581425d501a23494e068e78398f Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Wed, 31 Mar 2021 10:30:39 +0800
Subject: [PATCH 12/18] Update readme and deploy

---
 README.md | 2 +-
 deploy.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d04ae98f..358e03f8 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ default: &default
 #### 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**
+**因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/Trustie/gitea-binary**
 
 #### 配置gitea服务步骤
 1. 部署gitea服务，并注册root账户
diff --git a/deploy.md b/deploy.md
index 52762505..24b2613d 100644
--- a/deploy.md
+++ b/deploy.md
@@ -54,7 +54,7 @@ default: &default
 ### 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**
+**因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/Trustie/gitea-binary**
 
 #### 配置gitea服务步骤
 1. 部署gitea服务，并注册root账户

From 7d0b05f975d161db5576525e1c9f366dafa23d6d Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Wed, 31 Mar 2021 12:43:06 +0800
Subject: [PATCH 13/18] update readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 358e03f8..d3abcd10 100644
--- a/README.md
+++ b/README.md
@@ -82,9 +82,9 @@ gitea:
 
 
 #### 7. 创建数据库
-
+**开发环境为development， 生成环境为production**
 ```bash
-rails db:create
+rails db:create  RAILS_ENV=development
 ```
 
 #### 8. 导入数据表结构

From d2293a27780ae9643649eb02d83b52ff2e17ab13 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Wed, 31 Mar 2021 12:44:40 +0800
Subject: [PATCH 14/18] FIX setting api bug

---
 app/controllers/settings_controller.rb | 34 ++++++++++++--------------
 app/views/settings/show.json.jbuilder  |  5 +---
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index f0a436d9..638dc472 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -4,6 +4,8 @@ class SettingsController < ApplicationController
     get_add_menu
     get_common_menu
     get_personal_menu
+
+    puts @com
   end
 
   private
@@ -12,21 +14,17 @@ class SettingsController < ApplicationController
       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))
+          hash.merge!("#{k}":  get_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|
+      @common = {}
+      Site.common.select(: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
+        @common.merge!("#{site["key"]}": reset_site_url(site['url']))
       end
     end
 
@@ -36,22 +34,22 @@ class SettingsController < ApplicationController
         Site.personal.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))
+            hash.merge!("#{k}": get_site_url(k, v))
           }
           @personal << hash
         end
       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
+    def get_site_url(key, value)
+      url = reset_site_url(value)
+      key.to_s === "url" && !value.to_s.start_with?("http") ? [request.protocol, request.host_with_port, value].join('') : url
+   end
 
-      key.to_s === "url" && !value.to_s.start_with?("http") ? [request.protocol, request.host_with_port, value].join('') : value
+   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
 end
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index 39b152fa..330966aa 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -48,7 +48,6 @@ json.setting do
 
 
   json.add do
-    # json.array! @add, :name, :url, :key
     json.array! @add
   end
 
@@ -56,7 +55,5 @@ json.setting do
     json.array! @personal
   end
 
-  json.common do
-    json.array! @common
-  end
+  json.common @common
 end

From 5f5b3805146850e67be3354d6b3b7b1422a93b92 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Wed, 31 Mar 2021 13:35:40 +0800
Subject: [PATCH 15/18] FIX conflict

---
 app/controllers/settings_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 638dc472..03f3c69d 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -22,9 +22,9 @@ class SettingsController < ApplicationController
 
     def get_common_menu
       @common = {}
-      Site.common.select(:url, :key).to_a.map(&:serializable_hash).each do |site|
+      Site.common.select(:url, :key).each do |site|
         next if site["url"].to_s.include?("current_user") && !User.current.logged?
-        @common.merge!("#{site["key"]}": reset_site_url(site['url']))
+        @common.merge!("#{site["key"]}": append_http(reset_site_url(site["url"])))
       end
     end
 
@@ -52,4 +52,8 @@ class SettingsController < ApplicationController
      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

From b89501822fe000f7a16d611ef83be00d628257c2 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Wed, 31 Mar 2021 14:53:50 +0800
Subject: [PATCH 16/18] FIX code bug

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

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 03f3c69d..3ef73904 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -5,7 +5,6 @@ class SettingsController < ApplicationController
     get_common_menu
     get_personal_menu
 
-    puts @com
   end
 
   private

From e638dccfa56e81abc97a213c08e387c091e79108 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Wed, 31 Mar 2021 16:08:00 +0800
Subject: [PATCH 17/18] update readme

---
 README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d3abcd10..2a607e2a 100644
--- a/README.md
+++ b/README.md
@@ -121,12 +121,20 @@ bundle exec sidekiq -C config/sidekiq.yml -e production -d
 rails s
 ```
 
-#### 12. 浏览器访问
+#### 14. 浏览器访问
 在浏览器中输入如下地址访问：
 ```bash
 http://localhost:3000/
 ```
 
+#### 15. 浏览器访问
+在浏览器中输入如下地址访问：
+```bash
+http://localhost:3000/
+```
+
+#### 15. 其他说明
+通过页面注册都第一个用户为平台管理员用户
 
 ## 页面展示
 

From 0b6ebb7b3682bf0c55b0175f78beb812195c8922 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Thu, 1 Apr 2021 15:04:17 +0800
Subject: [PATCH 18/18] FIX get site url bug with setting api

---
 app/controllers/settings_controller.rb | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 3ef73904..b6662f66 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -41,18 +41,17 @@ class SettingsController < ApplicationController
     end
 
     def get_site_url(key, value)
-      url = reset_site_url(value)
-      key.to_s === "url" && !value.to_s.start_with?("http") ? [request.protocol, request.host_with_port, value].join('') : url
-   end
+      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")
+    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
+      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
+    def append_http(url)
+      url.to_s.start_with?("http") ? url : [request.protocol, request.host_with_port, url].join('')
+    end
 end