发布v3.1.1版本

* FIX 修复pulls、issues 搜索数量统计问题
* FIX 解决在线创建文件错误提示信息不准确的问题
* FIX table name bug
* FIX 解决applied_projects相关表操作的问题
* FIX 解决排序参数的判断预防SQL注入
* FIX 项目导航栏数量改为开启中的数量
* FIX 解决项目邀请码的索引查询问题
* FIX FIX get readme file bug
* FIX sql attack
* FIX projects load by invite code slowly

.gitignore

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

CHANGELOG.md

@@ -0,0 +1,98 @@
+# Changelog
+## [v3.1.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-06-09
+
+* ENHANCEMENTS
+  * ADD 用户活动统计图表功能
+  * ADD 用户精选项目功能
+  * ADD 用户贡献度统计图表功能
+  * ADD 用户开发能力数据统计工
+  * ADD 用户角色定位展示功能
+  * ADD 用户专业定位标签展示功能
+  * ADD 修改用户基本资料功能
+  * ADD 更改密码功能
+  * ADD 用户个人主页基本现在展示可配置功能
+
+* BUGFIXES
+  * Fix 解决一些bug
+  * Fix 优化美化页面
+
+
+* BUGFIXES
+  * Fix 在线修改文件，页面文件显不及时的问题(46049)
+  * Fix Fork项目，接口多次调用问题(45052)
+  * FIX 页面置顶功能区域排版问题(45825)
+  * Fix 其他样式显示问题
+
+* ENHANCEMENTS
+  * ADD 合并请求页面显示有冲突文件状态(46016)
+  * ADD 创建组织各属性添加规则匹配功能(45707)
+  * ADD 微信分享功能(45707)
+
+## [v3.0.3](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-05-08
+
+* BUGFIXES
+  * Fix 解决易修标题过长导致的排版问题(45469)
+  * Fix 解决合并请求详情页面排版错误的问题(45457)
+  * FIX 解决转移仓库界面专有名词描述错误的问题(45455)
+  * Fix 解决markdown格式文件自动生成数字排序的问题(45454)
+  * Fix 解决镜像项目源地址不显示的问题(45403)
+  * Fix 解决镜像项目导航显示错误问题(45398)
+  * Fix 解决其他相关bug
+
+* ENHANCEMENTS
+  * UPDATE 用户注册时，账号和密码正则匹配调整(45336) (45318) (45290)
+  * ADD 创建组织各属性添加规则匹配功能(45313) (45289)
+  * ADD 创建团建各属性添加规则匹配功能(45334) (45325) (45287)
+  * ADD 仓库转移功能(45017) (45015)
+ 
+## [v3.0.2](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-04-23
+
+* BUGFIXES
+  * Fix 解决部分用户头像不显示问题
+  * Fix 解决代码库模块中最左侧目录中的文件定位加载不准确的问题
+  * FIX 解决团队管理页面中项目链接错误问题
+  * Fix 解决markdown格式文件显示问题
+  * Fix 解决组织名下创建项目报错的问题
+  * Fix 解决组织名下的项目，创建issue报错的问题
+  * Fix 解决组织名下创建团队提示信息信息显示错误问题
+  * Fix 解决点击组织图片时，链接加载错误问题
+  * Fix 修复查询版本库信息安全漏洞
+  * Fix 解决修复团队成员操作访问组织仓库报403错误的问题
+  * Fix 解决owners团队成员对仓库添加成功失败的问题
+
+* ENHANCEMENTS
+  * ADD 自动生产用户头像功能
+  * ADD 创建组织支持中文名称
+  * ADD 创建团建支持中文名称
+  * ADD 组织名称统一显示中文名
+  * ADD 团队名称统一显示中文名
+  * ADD 用户头像悬浮时展示相关信息
+  * ADD 项目详情页添加实践课程链接入口
+  * ADD README文件页面添加添加目录导航功能
+  * UPDATE 升级改版底部footer信息
+  * UPDATE 升级用户操作版本库权限
+
+## [v3.0.1](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-03-19
+
+* BUGFIXES
+  * 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的性能问题

Gemfile

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

Gemfile.lock

@@ -162,6 +162,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.0)
     kaminari-core (1.2.0)
+    letter_avatar (0.3.8)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -175,7 +176,9 @@ GEM
       mimemagic (~> 0.3.2)
     maruku (0.7.3)
     method_source (0.9.2)
-    mimemagic (0.3.4)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
@@ -456,6 +459,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   kaminari (~> 1.1, >= 1.1.1)
+  letter_avatar
   listen (>= 3.0.5, < 3.2)
   mysql2 (>= 0.4.4, < 0.6.0)
   oauth2

LICENSE

@@ -1,21 +1,124 @@
-MIT License
+木兰宽松许可证， 第2版
 
-Copyright (c) [year] [fullname]
+2020年1月 http://license.coscl.org.cn/MulanPSL2
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+0.   定义
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
+
+“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
+
+“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
+
+“法人实体” 是指提交贡献的机构及其“关联实体”。
+
+“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
+
+1.   授予版权许可
+
+每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
+
+2.   授予专利许可
+
+每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
+
+3.   无商标许可
+
+“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
+
+4.   分发限制
+
+您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
+
+5.   免责声明与责任限制
+
+“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
+
+6.   语言
+
+“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
+
+条款结束
+
+如何将木兰宽松许可证，第2版，应用到您的软件
+
+如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
+
+1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
+
+2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
+
+3， 请将如下声明文本放入每个源文件的头部注释中。
+
+Copyright (c) [Year] [name of copyright holder]
+[Software Name] is licensed under Mulan PSL v2.
+You can use this software according to the terms and conditions of the Mulan PSL v2.
+You may obtain a copy of Mulan PSL v2 at:
+         http://license.coscl.org.cn/MulanPSL2
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v2 for more details.
+Mulan Permissive Software License，Version 2
+Mulan Permissive Software License，Version 2 (Mulan PSL v2)
+
+January 2020 http://license.coscl.org.cn/MulanPSL2
+
+Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions:
+
+0. Definition
+
+Software means the program and related documents which are licensed under this License and comprise all Contribution(s).
+
+Contribution means the copyrightable work licensed by a particular Contributor under this License.
+
+Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
+
+Legal Entity means the entity making a Contribution and all its Affiliates.
+
+Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
+
+1. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
+
+2. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
+
+3. No Trademark License
+
+No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.
+
+4. Distribution Restriction
+
+You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
+
+5. Disclaimer of Warranty and Limitation of Liability
+
+THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+6. Language
+
+THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
+
+END OF THE TERMS AND CONDITIONS
+
+How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software
+
+To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:
+
+Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
+Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package;
+Attach the statement to the appropriate annotated syntax at the beginning of each source file.
+Copyright (c) [Year] [name of copyright holder]
+[Software Name] is licensed under Mulan PSL v2.
+You can use this software according to the terms and conditions of the Mulan PSL v2.
+You may obtain a copy of Mulan PSL v2 at:
+         http://license.coscl.org.cn/MulanPSL2
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v2 for more details.

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+
+
+* imagemagick
+
+### Steps
+
+#### 1. 克隆稳定版本
+```
+git clone -b standalone https://git.trustie.net/jasder/forgeplus.git
 ```
 
-### 2. 配置初始化文件
+#### 2. 安装依赖包
+
+```bash
+cd forgeplus && bundle install
+```
+
+#### 3. 配置初始化文件
 进入项目根目录执行一下命令：
 
 ```bash
@@ -27,12 +46,26 @@ 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
+**因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/Trustie/gitea-binary**
 
-#### 配置gitea服务步骤
+**配置gitea服务步骤**
 1. 部署gitea服务，并注册root账户
 2. 修改forge平台的 config/configuration.yml中的gitea服务指向地址，如：
 
@@ -44,75 +77,93 @@ gitea:
   base_url: '/api/v1'
 ```
 
-### 4. 安装redis环境
+#### 6. 安装redis环境
 **请自行搜索各平台如何安装部署redis环境**
 
-
-### 5. 创建数据库
-
+#### 7. 安装imagemagick插件
+- Mac OS X
 ```bash
-rails db:create
+ brew install imagemagick ghostscript
 ```
 
-### 6. 导入数据表结构
+- Linux
+```bash
+sudo apt-get install -y imagemagick
+```
+
+#### 8. 创建数据库
+**开发环境为development， 生成环境为production**
+```bash
+rails db:create  RAILS_ENV=development
+```
+
+#### 9. 导入数据表结构
 
 ```bash
 bundle exec rake sync_table_structure:import_csv
 ```
 
-### 7. 执行migrate迁移文件
+#### 10. 执行migrate迁移文件
 **开发环境为development， 生成环境为production**
 ```bash
 rails db:migrate RAILS_ENV=development
 ```
 
-### 8. 启动redis(此处已mac系统为例)
+#### 11. clone前端代码
+**将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
+```bash
+git clone -b standalone https://git.trustie.net/jasder/build.git
+```
+
+#### 12. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```
 
-### 9. 启动sidekiq
+#### 13. 启动sidekiq
 **开发环境为development， 生成环境为production**
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-### 10. 启动rails服务
+#### 14. 启动rails服务
 ```bash
 rails s
 ```
 
-### 11. 浏览器访问
+#### 15. 浏览器访问
 在浏览器中输入如下地址访问：
 ```bash
 http://localhost:3000/
 ```
 
+#### 16. 其他说明
+通过页面注册都第一个用户为平台管理员用户
 
 ## 页面展示
 
 - 代码库
 
-![](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
 

api_document.md

@@ -1,4 +1,3 @@
----
 
 
 # API文档
@@ -19,7 +18,6 @@
 
 
 ### API接口
----
 
 #### 用户注册(通过其他平台)
 ```
@@ -286,7 +284,6 @@ http://localhost:3000/api/licenses/  | jq
 |licenses|array |返回数据|
 |-- id             |int   |id |
 |-- name           |string|开源许可证名称|
-|-- is_secret           |string|是否为特殊许可证|
 
 
 返回值
@@ -295,33 +292,23 @@ http://localhost:3000/api/licenses/  | jq
   "licenses": [
     {
       "id": 57,
-      "name": "AFL-1.2",
-      "is_secret": false
+      "name": "AFL-1.2"
     },
     {
       "id": 76,
-      "name": "AFL-3.0",
-      "is_secret": false
+      "name": "AFL-3.0"
     },
     {
       "id": 214,
-      "name": "AFL-1.1",
-      "is_secret": false
+      "name": "AFL-1.1"
     },
     {
       "id": 326,
-      "name": "AFL-2.1",
-      "is_secret": false
+      "name": "AFL-2.1"
     },
     {
       "id": 350,
-      "name": "AFL-2.0",
-      "is_secret": false
-    },
-    {
-      "id": 359,
-      "name": "PHengLEI",
-      "is_secret": true
+      "name": "AFL-2.0"
     }
   ]
 }
@@ -567,8 +554,6 @@ curl -X GET http://localhost:3000/api/repositories/:id/edit.json | jq
 |project_category_id  |int|项目类别id|
 |project_language_id  |int|项目语言id|
 |private              |boolean|项目是否私有, true：为私有，false: 公开  |
-|is_secret            |boolean|项目是否为特殊协议项目, true：是，false: 否  |
-
 
 
 返回值
@@ -581,8 +566,7 @@ curl -X GET http://localhost:3000/api/repositories/:id/edit.json | jq
   "project_description": "my first project mirror_demo",
   "project_category_id": 1,
   "project_language_id": 2,
-  "private": false,
-  "is_secret": true
+  "private": false
 }
 ```
 ---
@@ -1162,7 +1146,6 @@ http://localhost:3000/api/projects  | jq
 |forked_count    |int|被fork的数量|
 |praises_count   |int|star数量|
 |is_public       |boolean|是否公开， true:公开，false:未公开|
-|is_secret       |boolean|是否为特殊许可证项目， true:是，false:否|
 |mirror_url      |string|镜像url|
 |last_update_time|int|最后更新时间，为UNIX格式的时间戳|
 |author          |object|项目创建者|
@@ -1173,10 +1156,6 @@ http://localhost:3000/api/projects  | jq
 |language        |object|项目语言|
 |-- id           |int|项目语言id|
 |-- name         |string|项目语言名称|
-|user_apply_signatures        |object|用户创建的特殊许可申请|
-|-- id           |int|用户创建的特殊许可申请id|
-|-- status       |int|用户创建的特殊许可申请审核状态， 'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
-
 
 
 返回值
@@ -1192,7 +1171,6 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
-      "is_secret": true,
       "mirror_url": null,
       "last_update_time": 1577697461,
       "author": {
@@ -1206,13 +1184,7 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      },
-      "user_apply_signatures":[
-        {
-          "id": 1,
-          "status": "waiting"
-        }
-      ]
+      }
     },
     {
       "id": 2,
@@ -1222,7 +1194,6 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
-      "is_secret": false,
       "mirror_url": null,
       "last_update_time": 1577697403,
       "author": {
@@ -1236,8 +1207,7 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      },
-      "user_apply_signatures":[]
+      }
     },
     {
       "id": 3,
@@ -1247,7 +1217,6 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
-      "is_secret": true,  
       "mirror_url": null,
       "last_update_time": 1577415173,
       "author": {
@@ -1261,8 +1230,7 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      },
-      "user_apply_signatures":[]
+      }
     },
     {
       "id": 5,
@@ -1272,7 +1240,6 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": false,
-      "is_secret": true,
       "mirror_url": "https://gitea.com/CasperVector/slew.git",
       "last_update_time": 1577346228,
       "author": {
@@ -1286,8 +1253,7 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      },
-      "user_apply_signatures":[]
+      }
     },
     {
       "id": 7,
@@ -1297,7 +1263,6 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
-      "is_secret": true,
       "mirror_url": null,
       "last_update_time": 1577341572,
       "author": {
@@ -1311,8 +1276,7 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      },
-      "user_apply_signatures":[]
+      }
     }
   ]
 }
@@ -4864,8 +4828,133 @@ curl --location --request DELETE 'http://localhost:3000/api/ci/templates/10'
 
 ------
 
+#### 参数列表查询
+
+```
+GET /api/ci/secrets/secrets?owner={owner}&repo={repo}
+```
+
+*示例*
+
+```bash
+curl --location --request GET 'http://localhost:3000/api/ci/secrets?owner=test&repo=test'
+```
+
+*请求参数说明:*
+
+| 参数名 | 必选 | 类型   | 说明       |
+| ------ | ---- | ------ | ---------- |
+| owner  | 是   | string | 仓库所有人 |
+| repo   | 是   | string | 仓库名     |
+
+*返回参数说明:*
+
+| 参数名 | 类型   | 说明   |
+| ------ | ------ | ------ |
+| name   | string | 参数名 |
+| data   | string | 参数值 |
+| repo   | string | 仓库   |
+
+返回值
+
+```json
+ [
+        {
+            "id": 1,
+            "name": "test",
+            "data": "test",
+            "repo": "test"
+        }
+]
+
+```
+
 ------
 
+#### 参数新增/更新
+
+```
+POST  /api/ci/secrets?owner={owner}&repo={repo}
+```
+
+*示例*
+
+```bash
+curl --location --request POST 'http://localhost:3000/api/ci/secrets?owner=test&repo=test' \
+--data-raw ' {
+            "name": "ip",
+            "data": "1.1.1.1",
+            "id": 21
+}' 
+```
+
+*请求参数说明:*
+
+| 参数名 | 必选 | 类型   | 说明         |
+| ------ | ---- | ------ | ------------ |
+| owner  | 是   | string | 仓库拥有者   |
+| repo   | 是   | string | 仓库名       |
+| name   | 是   | string | 参数名       |
+| data   | 是   | string | 参数值       |
+| id     | 否   | int    | id，更新时传 |
+
+*返回参数说明:*
+
+| 参数名  | 类型   | 说明         |
+| ------- | ------ | ------------ |
+| status  | int    | 状态码 0成功 |
+| message | string | 消息         |
+
+返回值
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+
+------
+
+#### 参数删除
+
+```
+DELETE  /api/ci/secrets/{id}?name={name}&owner={owner}&repo={repo}
+```
+
+*示例*
+
+```bash
+curl --location --request DELETE 'http://localhost:3000/api/ci/secrets/1?name=p1&owner=victor&repo=trustieTest' \
+```
+
+*请求参数说明:*
+
+| 参数名 | 必选 | 类型   | 说明   |
+| ------ | ---- | ------ | ------ |
+| name   | 是   | string | 参数名 |
+| id     | 是   | int    | 参数id |
+
+*返回参数说明:*
+
+| 参数名  | 类型   | 说明         |
+| ------- | ------ | ------------ |
+| status  | int    | 状态码 0成功 |
+| message | string | 返回消息     |
+
+返回值
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+
+------
+
+
+
 
 #### 解除CI服务器绑定
 ```
@@ -4927,7 +5016,6 @@ http://localhost:3000/api/users/Jason/projects.json | jq
 |forked_count    |int|被fork的数量|
 |praises_count   |int|star数量|
 |is_public       |boolean|是否公开， true:公开，false:未公开|
-|is_secret       |boolean|是否为特殊许可证项目， true:是，false:否|
 |mirror_url      |string|镜像url|
 |last_update_time|int|最后更新时间，为UNIX格式的时间戳|
 |author          |object|项目创建者|
@@ -4938,9 +5026,7 @@ http://localhost:3000/api/users/Jason/projects.json | jq
 |language        |object|项目语言|
 |-- id           |int|项目语言id|
 |-- name         |string|项目语言名称|
-|user_apply_signatures        |object|用户创建的特殊许可申请|
-|-- id           |int|用户创建的特殊许可申请id|
-|-- status       |int|用户创建的特殊许可申请审核状态， 'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
+
 
 返回值
 ```json
@@ -4955,7 +5041,6 @@ http://localhost:3000/api/users/Jason/projects.json | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
-      "is_secret": false,
       "mirror_url": null,
       "last_update_time": 1577697461,
       "author": {
@@ -4969,163 +5054,9 @@ http://localhost:3000/api/users/Jason/projects.json | jq
       "language": {
         "id": 2,
         "name": "C"
-      },
-      "user_apply_signatures":[
-        {
-          "id": 1,
-          "status": "waiting"
-        }
-      ]
+      }
     }
   ]
 }
 ```
 ---
-
-#### 特殊许可证项目申请列表
-```
-GET /api/apply_signatures
-```
-*示例*
-```bash
-curl -X GET \
--d "project_id=36" \
--d "page=1" \
--d "limit=5" \
--d "search=16895620" \
--d "status=waiting" \
-http://localhost:3000/api/apply_signatures  | jq
-```
-*请求参数说明:*
-
-|参数名|必选|类型|说明|
-|-|-|-|-|
-|project_id    |是|int    |项目id  |
-|page          |否|string |页数，第几页  |
-|limit         |否|string |每页多少条数据，默认15条  |
-|search        |否|string |用户名、登录名匹配搜索  |
-|status        |否|string |状态匹配搜索，'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过  |
-
-
-*返回参数说明:*
-
-|参数名|类型|说明|
-|-|-|-|
-|total_count       |int   |返回记录总条数 |
-|apply_signatures  |array|特殊许可证项目申请信息|
-|-- id             |int|特殊许可证项目申请id|
-|-- status         |int|特殊许可证项目申请状态，'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
-|user              |object|用户|
-|-- id             |int|用户id|
-|-- name           |string|用户名称|
-|-- login          |string|用户登录名/标识|
-|-- image_url      |string|用户头像|
-|-- email          |string|用户邮箱|
-|-- is_owner       |boolean|是否是项目的拥有者，true:是， false:不是|
-|attachment        |object|上传附件|
-|--filename        |string|附件名称|
-|--path            |string|附件地址|
-
-
-返回值
-```json
-{
-    "total_count": 1,
-    "apply_signatures": [
-        {
-            "id": 18,
-            "status": "passed",
-            "user": {
-                "id": 3,
-                "name": "16895620",
-                "login": "16895620",
-                "image_url": "avatars/User/boy.jpg",
-                "email": "2456233122@qq.com",
-                "is_owner": false
-            },
-            "attachment": {
-                "filename": "PHengLEI软件开源协议.docx",
-                "path": "/api/attachments/23"
-            }
-        }
-    ]
-}
-```
----
-#### 特殊许可证项目用户创建申请
-```
-POST  /api/apply_signatures
-```
-
-*示例*
-```bash
-curl -X POST \
--d "project_id=8" \
--d "attachment_id=4" \
-http://localhost:3000/api/apply_signatures.json | jq
-```
-
-*请求参数说明:*
-
-|参数名|必选|类型|说明|
-|-|-|-|-|
-|project_id          |是|int |项目id  |
-|attachment_id       |是|int |上传的文件id |
-
-*返回参数说明:*
-
-|参数名|类型|说明|
-|-|-|-|
-|id           |int|特殊许可证项目用户创建申请的id|
-|attachment   |object|上传的文件|
-|--filename   |string|上传的文件的文件名|
-
-返回值
-```json
-{
-    "id": 5,
-    "attachment": {
-        "filename": "timg.jpeg"
-    }
-}
-```
----
-#### 特殊许可证项目申请修改
-```
-PATCH  /api/apply_signatures/:id
-```
-
-*示例*
-```bash
-curl -X POST \
--d "id=18" \
--d "status=passed" \
--d "project_id=36" \
-http://localhost:3000/api/apply_signatures/18 | jq
-```
-
-*请求参数说明:*
-
-|参数名|必选|类型|说明|
-|-|-|-|-|
-|id                  |是|int |特殊许可证项目申请id  |
-|status              |是|string |特殊许可证项目申请状态 ，'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
-|project_id          |是|int |项目id|
-
-
-*返回参数说明:*
-
-|参数名|类型|说明|
-|-|-|-|
-|status            |int   |0:添加成功， -1: 更改失败， 1: 表示已经是该状态了 |
-|message           |string|返回信息说明|
-
-
-返回值
-```json
-{
-  "status": 0,
-  "message": "success"
-}
-```
----

app/assets/javascripts/admins/faqs.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/helps/faqs.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/stylesheets/admins/faqs.scss

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

app/assets/stylesheets/helps/faqs.scss

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

app/controllers/accounts_controller.rb

@@ -169,6 +169,7 @@ class AccountsController < ApplicationController
 
   # 用户登录
   def login
+    Users::LoginForm.new(account_params).validate!
     @user = User.try_to_login(params[:login], params[:password])
 
     return normal_status(-2, "错误的账号或密码") if @user.blank?
@@ -195,6 +196,25 @@ class AccountsController < ApplicationController
     # session[:user_id] = @user.id
   end
 
+  def change_password 
+    @user = User.find_by(login: params[:login])
+    return render_error("未找到相关用户!") if @user.blank?
+    return render_error("旧密码不正确") unless @user.check_password?(params[:old_password])
+
+    sync_params = {
+      password: params[:password].to_s,
+      email: @user.mail
+    }
+
+    interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
+    if interactor.success?
+      @user.update_attribute(:password, params[:password])
+      render_ok
+    else
+      render_error(interactor.error)
+    end
+  end
+
   # 忘记密码
   def reset_password
     begin
@@ -242,7 +262,9 @@ class AccountsController < ApplicationController
   end
 
   def set_autologin_cookie(user)
-    token = Token.get_or_create_permanent_login_token(user, autologin_cookie_name)
+    token = Token.get_or_create_permanent_login_token(user, "autologin")
+    sync_user_token_to_trustie(user.login, token.value)
+
     cookie_options = {
                       :value => token.value,
                       :expires => 1.month.from_now,
@@ -343,4 +365,7 @@ class AccountsController < ApplicationController
     params.require(:user).permit(:login, :email, :phone)
   end
 
+  def account_params 
+    params.require(:account).permit(:login, :password)
+  end
 end

app/controllers/admins/apply_signatures_controller.rb

@@ -1,32 +0,0 @@
-class Admins::ApplySignaturesController < Admins::BaseController
-
-    def index
-      sort_by = params[:sort_by] ||= 'created_on'
-      sort_direction = params[:sort_direction] ||= 'desc'
-
-      @apply_signatures = paginate ApplySignature.waiting.includes(:attachments)
-    end
-
-    def update
-      ActiveRecord::Base.transaction do
-        begin
-          apply_signature = ApplySignature.find_by!(id: params[:id])
-          apply_signature.update_attributes!(apply_signatures_params)
-          if apply_signature.status == "passed"
-            Projects::AddMemberInteractor.call(apply_signature.project.owner, apply_signature.project, apply_signature.user, "read", true)
-          end
-          redirect_to admins_apply_signatures_path
-          flash[:success] = "更新成功"
-        rescue => e
-          raise ActiveRecord::Rollback
-          redirect_to admins_apply_signatures_path
-          flash[:danger] = "更新失败"
-        end
-      end
-    end
-
-    private
-    def apply_signatures_params
-      params.permit(:status)
-    end
-  end

app/controllers/admins/auth_schools_controller.rb

@@ -32,7 +32,7 @@ class Admins::AuthSchoolsController < Admins::BaseController
   def search_manager
     school = School.find_by(id: params[:school_id])
     user_ids = school&.ec_school_users&.pluck(:user_id)
-    @users = User.where.not(id: user_ids).where("concat(lastname, firstname) like ?", "%#{params[:name].strip.to_s}%").limit(10)
+    @users = User.where.not(id: user_ids).where("CONCAT(lastname, firstname) like ? OR nickname like ?", "%#{params[:name].strip.to_s}%",  "%#{params[:name].strip.to_s}%").limit(10)
   end
 
   # 添加认证学校管理员

app/controllers/admins/faqs_controller.rb

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

app/controllers/admins/laboratories_controller.rb

@@ -33,7 +33,7 @@ class Admins::LaboratoriesController < Admins::BaseController
     keyword = params[:keyword].to_s.strip
     if keyword.present?
       like_sql = 'shixuns.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword '\
-                 'OR mirror_repositories.name LIKE :keyword'
+                 'users.nickname LIKE :keyword OR mirror_repositories.name LIKE :keyword'
       shixuns = shixuns.joins(:user, :mirror_repositories).where(like_sql, keyword: "%#{keyword}%")
     end
 
@@ -48,7 +48,7 @@ class Admins::LaboratoriesController < Admins::BaseController
 
     keyword = params[:keyword].to_s.strip
     if keyword.present?
-      like_sql = 'subjects.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword'
+      like_sql = 'subjects.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword'
       subjects = subjects.joins(:user).where(like_sql, keyword: "%#{keyword}%")
     end
 

app/controllers/admins/phenglei_users_controller.rb

@@ -1,36 +0,0 @@
-class Admins::PhengleiUsersController < Admins::BaseController
-  before_action :phenglei_project, only: [:index]
-
-  def index 
-    if params[:keyword].present?
-      @phenglei_users = PhengleiUser.ransack(phone_cont: params[:keyword]).result
-    else
-      @phenglei_users = PhengleiUser 
-    end
-    @phenglei_users = @phenglei_users.page(page).per(per_page)
-  end
-
-  def new 
-    @phenglei_user = PhengleiUser.new
-  end
-
-  def create 
-    @phenglei_user = PhengleiUser.new(phenglei_user_params)
-    if @phenglei_user.save 
-      redirect_to admins_phenglei_users_path
-      flash[:success] = "创建成功"
-    else  
-      redirect_to admins_phenglei_users_path 
-      flash[:error] = "创建失败"
-    end
-  end
-
-  private 
-  def phenglei_project 
-    @phenglei_project = Project.find_by_id(EduSetting.get("sync_phenglei_user_project"))
-  end
-
-  def phenglei_user_params
-    params.require(:phenglei_user).permit(:phone)
-  end
-end

app/controllers/admins/project_categories_controller.rb

@@ -3,8 +3,8 @@ class Admins::ProjectCategoriesController < Admins::BaseController
   before_action :validate_names, only: [:create, :update]
 
   def index 
-    sort_by = params[:sort_by] ||= 'created_at'
-    sort_direction = params[:sort_direction] ||= 'desc'
+    sort_by = ProjectCategory.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
+    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
     q = ProjectCategory.ransack(name_cont: params[:name])
     project_categories = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_categories = paginate(project_categories)

app/controllers/admins/project_ignores_controller.rb

@@ -3,8 +3,8 @@ class Admins::ProjectIgnoresController < Admins::BaseController
   before_action :validate_params, only: [:create, :update]
 
   def index
-    sort_by = params[:sort_by] ||= 'created_at'
-    sort_direction = params[:sort_direction] ||= 'desc'
+    sort_by = Ignore.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
+    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
     q = Ignore.ransack(name_cont: params[:search])
     project_ignores = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_ignores = paginate(project_ignores)

app/controllers/admins/project_languages_controller.rb

@@ -3,8 +3,8 @@ class Admins::ProjectLanguagesController < Admins::BaseController
   before_action :validate_names, only: [:create, :update]
 
   def index 
-    sort_by = params[:sort_by] ||= 'created_at'
-    sort_direction = params[:sort_direction] ||= 'desc'
+    sort_by = ProjectLanguage.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
+    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
     q = ProjectLanguage.ransack(name_cont: params[:search])
     project_languages = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_languages = paginate(project_languages)

app/controllers/admins/project_licenses_controller.rb

@@ -3,8 +3,8 @@ class Admins::ProjectLicensesController < Admins::BaseController
   before_action :validate_params, only: [:create, :update]
 
   def index
-    sort_by = params[:sort_by] ||= 'created_at'
-    sort_direction = params[:sort_direction] ||= 'desc'
+    sort_by = License.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
+    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
     q = License.ransack(name_cont: params[:search])
     project_licenses = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_licenses = paginate(project_licenses)

app/controllers/admins/projects_controller.rb

@@ -1,13 +1,11 @@
 class Admins::ProjectsController < Admins::BaseController
-  before_action :load_project, only: [:sync_phenglei_user]
 
   def index
-    sort_by = params[:sort_by] ||= 'created_on'
-    sort_direction = params[:sort_direction] ||= 'desc'
-
+    sort_by = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_on'
+    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
     search = params[:search].to_s.strip
     projects = Project.where("name like ?", "%#{search}%").order("#{sort_by} #{sort_direction}")
-    @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score, :license)
+    @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score)
   end
 
   def destroy
@@ -23,20 +21,4 @@ class Admins::ProjectsController < Admins::BaseController
       redirect_to admins_projects_path
       flash[:danger] = "删除失败"
   end
-
-  def sync_phenglei_user
-    if @project.is_secret
-      SyncPhengleiUserJob.perform_later(@project.id)
-      redirect_to admins_phenglei_users_path
-      flash[:success] = "已开启后台同步任务"
-    else
-      redirect_to admins_phenglei_users_path
-      flash[:danger] = "非风雷协议项目"
-    end
-  end
-
-  private
-  def load_project
-    @project = Project.find_by!(id: params[:id])
-  end
 end

app/controllers/application_controller.rb

@@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base
 	DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
 	OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"
 
-	helper_method :current_user
+	helper_method :current_user, :base_url
 
 	# 所有请求必须合法签名
 	def check_sign
@@ -374,7 +374,7 @@ class ApplicationController < ActionController::Base
 			# auto-login feature starts a new session
 			user = nil
 			Rails.logger.info("111111111111111111#{default_yun_session}, session is #{session[:"#{default_yun_session}"]} ")
-			user = User.try_to_autologin(cookies[autologin_cookie_name], autologin_cookie_name)
+			user = User.try_to_autologin(cookies[autologin_cookie_name])
 			# start_user_session(user) if user # TODO 解决sso退出不同步的问题
 			user
 		end
@@ -615,8 +615,8 @@ class ApplicationController < ActionController::Base
 		end
 
 		# 排序
-		rorder = option[:order] || "updated_at"
-		b_order = option[:b_order] || "desc"
+		rorder = UserExtension.column_names.include?(option[:order]) ? option[:order] : "updated_at"
+		b_order = %w(desc asc).include?(option[:b_order]) ? option[:b_order] : "desc"
 		if rorder == "created_at" || rorder == "work_score"
 			work_list = work_list.order("graduation_works.#{rorder} #{b_order}")
 		elsif rorder == "student_id"
@@ -770,6 +770,30 @@ class ApplicationController < ActionController::Base
 		@repository ||= load_project&.repository
 	end
 
+	def base_url
+		request.base_url
+	end
+
+	def convert_image!
+		@image = params[:image] || user_params[:image]
+    return unless @image.present?
+    max_size = EduSetting.get('upload_avatar_max_size') || 2 * 1024 * 1024 # 2M
+    if @image.class == ActionDispatch::Http::UploadedFile
+      render_error('请上传文件') if @image.size.zero?
+      render_error('文件大小超过限制') if @image.size > max_size.to_i
+    else
+      image = @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(object)
+    ApplicationController.helpers.disk_filename(object.class, object.id)
+  end
+
   private
 	def object_not_found
 		uid_logger("Missing template or cant't find record, responding with 404")

app/controllers/applied_projects_controller.rb

@@ -0,0 +1,13 @@
+class AppliedProjectsController < ApplicationController
+  before_action :require_login
+  def create 
+    @applied_project = Projects::ApplyJoinService.call(current_user, applied_params)
+  rescue Projects::ApplyJoinService::Error => ex
+    render_error(ex.message)
+  end
+
+  private 
+  def applied_params 
+    params.require(:applied_project).permit(:code, :role)
+  end
+end

app/controllers/apply_signatures_controller.rb

@@ -1,78 +0,0 @@
-class ApplySignaturesController < ApplicationController
-  include ApplicationHelper
-  before_action :find_project, only: [:index, :create, :update]
-  before_action :require_owner, only: [:update]
-  before_action :find_apply_signature, only: [:update]
-
-  def index 
-    @apply_signatures = @project.apply_signatures.with_status(status).includes(user: :user_extension)
-    @apply_signatures = @apply_signatures.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%")
-    @apply_signatures = kaminari_paginate(@apply_signatures)
-  end
-
-  def template_file
-    license = License.find_by_name("PHengLEI")
-    file = license.attachments.take
-    normal_status(-1, "文件不存在") if file.blank?
-    send_file(absolute_path(local_path(file)), filename: file.title,stream:false, type: file.content_type.presence || 'application/octet-stream')
-  end
-
-  def create 
-    ActiveRecord::Base.transaction do
-      begin
-        @signature = current_user.apply_signatures.find_or_create_by!(project_id: params[:project_id])
-        @signature.status = 0
-        @signature.attachments = Attachment.none
-        @attachment = Attachment.find_by_id(params[:attachment_id])
-        @attachment.container = @signature
-        @signature.save!
-        @attachment.save!
-      rescue Exception => e
-        tip_exception("#{e}")
-        raise ActiveRecord::Rollback
-      end
-      render_json
-    end
-  end
-
-  def update
-    @apply_signature.update_attributes!(apply_signature_params)
-    if @apply_signature.status == "passed"
-      Projects::AddMemberInteractor.call(@apply_signature.project.owner, @apply_signature.project, @apply_signature.user, "read", true)
-    else
-      Projects::DeleteMemberInteractor.call(@apply_signature.project.owner, @apply_signature.project, @apply_signature.user)
-    end
-    render_ok
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def find_project
-    @project = Project.find_by_id(params[:project_id])
-    normal_status(-1, "项目不存在") unless @project.present?
-  end
-
-  def find_apply_signature
-    @apply_signature = ApplySignature.find_by_id(params[:id])
-    normal_status(-1, "特殊许可申请不存在") unless @apply_signature.present?
-    normal_status(1, "已经是该状态了") if @apply_signature.status == params[:status]
-  end
-
-  def apply_signature_params
-    params.permit(:status)
-  end
-
-  def search 
-    params.fetch(:search, "").to_s.downcase
-  end
-
-  def status 
-    params.fetch(:status, "all")
-  end
-
-  def require_owner
-    normal_status(403, "") unless @project.owner?(current_user)
-  end
-end 

app/controllers/attachments_controller.rb

@@ -42,7 +42,6 @@ class AttachmentsController < ApplicationController
     # 2. 上传到云
     begin
       upload_file = params["file"] || params["#{params[:file_param_name]}"]# 这里的file_param_name是为了方便其他插件名称
-      dun_check_file = upload_file.dup
       uid_logger("#########################file_params####{params["#{params[:file_param_name]}"]}")
       raise "未上传文件" unless upload_file
 
@@ -80,16 +79,8 @@ class AttachmentsController < ApplicationController
         @attachment.digest = digest
         @attachment.author_id = current_user.id
         @attachment.disk_directory = month_folder
-        # @attachment.cloud_url = remote_path
-        # @attachment.save!
-        if @attachment.save!
-          check_result = Attachment.check_image_able(dun_check_file)
-          if check_result[:status].to_i == -1
-            @attachment.destroy
-            raise "上传失败，#{check_result[:message]}"
-            # return render json: {status: -1, message: "上传失败，#{check_result[:message]}" } 
-          end
-        end
+        @attachment.cloud_url = remote_path
+        @attachment.save!
       else
         logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
       end

app/controllers/ci/secrets_controller.rb

@@ -0,0 +1,53 @@
+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

app/controllers/composes_controller.rb

@@ -3,13 +3,12 @@ class ComposesController < ApplicationController
   before_action :find_compose, except: [:index, :new,:create]
 
   def index
-    @order_type = params[:order] || "created_at"
     @search_name = params[:search]
     composes = Compose.compose_includes
     if @search_name.present?
       composes = composes.where("title like ?", "%#{@search_name}%")
     end
-    composes = composes.order("#{@order_type} desc")
+    composes = composes.order("#{order_type} desc")
     @page  = params[:page]  || 1
     @limit = params[:limit] || 15
     @composes_size = composes.size
@@ -96,4 +95,8 @@ class ComposesController < ApplicationController
     end
   end
 
+  def order_type 
+    Compose.column_names.include?(params[:order_type]) ? params[:order_type] : 'created_at'
+  end
+
 end

app/controllers/concerns/acceleratorable.rb

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

app/controllers/concerns/laboratory_helper.rb

@@ -8,9 +8,6 @@ module LaboratoryHelper
     helper_method :default_setting
     helper_method :default_yun_session
     helper_method :default_course_links
-    helper_method :manager_main_site_url
-    helper_method :main_web_site_url
-    helper_method :current_main_site_url
   end
 
   def current_laboratory
@@ -35,29 +32,18 @@ module LaboratoryHelper
   end
 
   def default_course_links
-
+    # my_projects: "/users/#{current_user.try(:login)}/projects",
+    #       my_projects: "https://www.trustie.net/users/#{current_user.try(:login)}/user_projectlist",
     {
-      # new_syllabuses: "https://www.trustie.net/syllabuses/new",
-      # 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_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations",
-      # default_url: "https://www.trustie.net/",
-      tiding_url: "#{main_web_site_url}/users/#{current_user.try(:login)}/user_tidings",
-      register_url: "#{main_web_site_url}/user_join"
+      new_syllabuses: "https://www.trustie.net/syllabuses/new",
+      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_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",
+      register_url: "https://www.trustie.net/login?login=false"
     }
   end
-
-  def manager_main_site_url
-    {name: '管理', link: "#{main_web_site_url}/managements"}
-  end
-
-  def main_web_site_url
-    EduSetting.get('host_main_site')
-  end
-
-  def current_main_site_url
-    EduSetting.get('host_name')
-  end
 end

app/controllers/concerns/login_helper.rb

@@ -6,12 +6,14 @@ module LoginHelper
   end
 
   def autologin_cookie_name
-    edu_setting('autologin_cookie_name').presence || 'autologin_forge_military'
+    edu_setting('autologin_cookie_name').presence || 'autologin'
   end
 
   def set_autologin_cookie(user)
-    Rails.logger.info("set_cookie_user_id is=======> #{user.id}")
-    token = Token.get_or_create_permanent_login_token(user, autologin_cookie_name)
+    token = Token.get_or_create_permanent_login_token(user, "autologin")
+    sync_user_token_to_trustie(user.login, token.value)
+
+    Rails.logger.info "###### def set_autologin_cookie and get_or_create_permanent_login_token result: #{token&.value}"
     cookie_options = {
       :value => token.value,
       :expires => 1.month.from_now,

app/controllers/concerns/register_helper.rb

@@ -3,11 +3,8 @@ module RegisterHelper
 
   def autologin_register(username, email, password, platform= 'forge')
     result = {message: nil, user: nil}
-    email =  email.blank? ? "#{username}@example.org" : email
-
-    user = User.find_by(login: username)
-    user ||= User.new(admin: false, login: username, mail: email, type: "User")
 
+    user = User.new(admin: false, login: username, mail: email, type: "User")
     user.password = password
     user.platform = platform
     user.activate
@@ -21,7 +18,7 @@ module RegisterHelper
       user.gitea_token = result['sha1']
       user.gitea_uid = gitea_user[:body]['id']
       if user.save!
-        UserExtension.create!(user_id: user.id) if user.user_extension.blank?
+        UserExtension.create!(user_id: user.id)
         result[:user] = {id: user.id, token: user.gitea_token}
       end
     else

app/controllers/concerns/repository/languages_percentagable.rb

@@ -14,6 +14,6 @@ module Repository::LanguagesPercentagable
     hash.transform_values { |v|
       ActionController::Base.helpers
         .number_to_percentage((v * 100.0 / total_byte_size), precision: 1)
-    }
+    }.select{|k,v| v != "0.0%"}
   end
 end

app/controllers/helps/faqs_controller.rb

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

app/controllers/issue_tags_controller.rb

@@ -7,9 +7,6 @@ class IssueTagsController < ApplicationController
 
 
   def index
-    order_name = params[:order_name] || "created_at"
-    order_type = params[:order_type] || "desc"
-
     issue_tags = @project.issue_tags.order("#{order_name} #{order_type}")
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
     @page  = params[:page]  || 1
@@ -138,4 +135,14 @@ class IssueTagsController < ApplicationController
     end
   end
 
+  private 
+
+  def order_name
+    IssueTag.column_names.include?(params[:order_name]) ? params[:order_name] : 'created_at'
+  end
+
+  def order_type 
+    %w(desc asc).include?(params[:order_type]) ? params[:order_type] : 'desc'
+  end
+
 end

app/controllers/issues_controller.rb

@@ -6,20 +6,26 @@ 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]
 
   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
 
-    @all_issues_size = issues.size
-    @open_issues_size = issues.where.not(status_id: 5).size
-    @close_issues_size = issues.where(status_id: 5).size
-    @assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size
-    @my_published_size = issues.where(author_id: current_user&.id).size
+    @all_issues = issues
+    @filter_issues = @all_issues
+    @filter_issues = @filter_issues.where.not(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::ADD
+    @filter_issues = @filter_issues.where(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::SOLVING
+    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
+    @open_issues = @all_issues.where.not(status_id: IssueStatus::CLOSED)
+    @close_issues = @all_issues.where(status_id: IssueStatus::CLOSED)
+    @assign_to_me = @filter_issues.where(assigned_to_id: current_user&.id)
+    @my_published = @filter_issues.where(author_id: current_user&.id)
     scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
     @issues_size = scopes.size
     @issues = paginate(scopes)
@@ -95,76 +101,16 @@ class IssuesController < ApplicationController
   end
 
   def new
-    # @all_branches = get_branches
-    @issue_chosen = issue_left_chosen(@project, nil)
+    @issue_chosen = get_associated_data(@project)
   end
 
   def create
-    if params[:subject].blank?
-      normal_status(-1, "标题不能为空")
-    elsif params[:subject].to_s.size > 255
-      normal_status(-1, "标题不能超过255个字符")
-    else
-      issue_params = issue_send_params(params)
-
-      @issue = Issue.new(issue_params)
-      if @issue.save!
-        if params[:attachment_ids].present?
-          params[:attachment_ids].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
-        if params[:issue_tag_ids].present?
-          params[:issue_tag_ids].each do |tag|
-            IssueTagsRelate.create!(issue_id: @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: @issue.id, container_type: 'Issue',
-                         parent_container_id: @project.id, parent_container_type: "Project",
-                         tiding_type: 'issue', status: 0)
-        end
-
-        @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
-        render json: {status: 0, message: "创建成", id: @issue.id}
-      else
-        normal_status(-1, @issue.errors.messages.values[0][0])
-      end
-
-    end
-
-  end
-
-  def edit
-    # @issue_chosen = issue_left_chosen(@project, @issue.id)
-    @issue_attachments = @issue.attachments
-  end
-
-  def update
-    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|
-        IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
-      end
-    end
-
-    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|
+    issue_params = issue_send_params(params)
+    Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
+    @issue = Issue.new(issue_params)
+    if @issue.save!
+      if params[:attachment_ids].present?
+        params[:attachment_ids].each do |id|
           attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
           unless attachment.blank?
             attachment.container = @issue
@@ -174,6 +120,65 @@ class IssuesController < ApplicationController
           end
         end
       end
+      if params[:issue_tag_ids].present?
+        params[:issue_tag_ids].each do |tag|
+          IssueTagsRelate.create!(issue_id: @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: @issue.id, container_type: 'Issue',
+                       parent_container_id: @project.id, parent_container_type: "Project",
+                       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}
+    else
+      normal_status(-1, "创建失败")
+    end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+
+  def edit
+    # @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
+    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|
+        IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
+      end
+    end
+
+    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
+        end
+      end
+    end
 
       # if params[:issue_tag_ids].present?
       #   issue_current_tags = @issue&.issue_tags&.select(:id)&.pluck(:id)
@@ -189,16 +194,39 @@ class IssuesController < ApplicationController
       #   end
       # end
 
-      if params[:status_id].to_i == 5
-        @issue.issue_times.update_all(end_time: Time.now)
-        #@issue.update_closed_issues_count_in_project!
-      end
-
-      @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
-      normal_status(0, "更新成功")
+    if @issue.issue_type.to_s == "2" &&  params[:status_id].to_i == 5 && @issue.author_id != current_user.try(:id)
+      normal_status(-1, "不允许修改为关闭状态")
     else
-      normal_status(-1, @issue.errors.messages.values[0][0])
+      issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
+      Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
+      if @issue.update_attributes(issue_params)
+        if params[:status_id].to_i == 5  #任务由非关闭状态到关闭状态时
+          @issue.issue_times.update_all(end_time: Time.now)
+          @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, "更新失败")
+      end
     end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
   end
 
   def show
@@ -218,17 +246,32 @@ class IssuesController < ApplicationController
   end
 
   def destroy
-    if @issue.destroy
-      normal_status(0, "删除成功")
-    else
+    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, "删除失败")
+    else
     end
+
   end
 
   def clean
+    #批量删除，暂时只能删除未悬赏的
     issue_ids = params[:ids]
     if issue_ids.present?
-      if Issue.where(id: issue_ids).destroy_all
+      if Issue.where(id: issue_ids, issue_type: "1").destroy_all
         normal_status(0, "删除成功")
       else
         normal_status(-1, "删除失败")
@@ -420,4 +463,32 @@ 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

app/controllers/journals_controller.rb

@@ -46,7 +46,7 @@ class JournalsController < ApplicationController
         render :json => { status: 0, message: "评论成功", id:  journal.id}
         # normal_status(0, "评论成功")
       else
-        normal_status(-1, journal.errors.messages.values[0][0])
+        normal_status(-1, "评论失败")
       end
     end
   end
@@ -70,7 +70,7 @@ class JournalsController < ApplicationController
       if @journal.update_attribute(:notes, content)
         normal_status(0, "更新成功")
       else
-        normal_status(-1, @journal.errors.messages.values[0][0])
+        normal_status(-1, "更新失败")
       end
     else
       normal_status(-1, "评论的内容不能为空")

app/controllers/members_controller.rb

@@ -18,7 +18,7 @@ class MembersController < ApplicationController
     scope = @project.members.includes(:roles, user: :user_extension)
     search = params[:search].to_s.downcase
     role = params[:role].to_s
-    scope = scope.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
+    scope = scope.joins(:user).merge(User.like(search))
     scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present?
 
     @total_count = scope.size
@@ -47,7 +47,7 @@ class MembersController < ApplicationController
   end
 
   def member_exists?
-    @project.member?(params[:user_id])
+    @project.members.exists?(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 member_exists?
+    return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless @project.member?(params[:user_id])
   end
 end

app/controllers/oauth/educoder_controller.rb

@@ -8,7 +8,7 @@ class Oauth::EducoderController < Oauth::BaseController
 
       ::OauthEducoderForm.new({login: login, token: token, callback_url: callback_url}).validate!
 
-      open_user= OpenUsers::Educoder.find_by(uid: login)
+      open_user= OpenUsers::Educoder.find_by(uid: login) || OpenUsers::Educoder.find_by(uid: mail)
 
       if open_user.present? && open_user.user.present? && open_user.user.email_binded?
         Rails.logger.info "######## open_user exist and open_user.user exsit and email is binded ok"

app/controllers/organizations/base_controller.rb

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

app/controllers/organizations/organization_users_controller.rb

@@ -5,7 +5,7 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
   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 = @organization_users.joins(:user).merge(User.like(search))
 
     @organization_users = kaminari_paginate(@organization_users)
   end

app/controllers/organizations/organizations_controller.rb

@@ -1,5 +1,5 @@
 class Organizations::OrganizationsController < Organizations::BaseController
-  before_action :require_login, except: [:index, :show]
+  before_action :require_login, except: [:index, :show, :recommend]
   before_action :convert_image!, only: [:create, :update]
   before_action :load_organization, only: [:show, :update, :destroy]
   before_action :check_user_can_edit_org, only: [:update, :destroy]
@@ -25,6 +25,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
 
   def create
     ActiveRecord::Base.transaction do
+      Organizations::CreateForm.new(organization_params).validate!
       @organization = Organizations::CreateService.call(current_user, organization_params)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
     end
@@ -35,9 +36,12 @@ class Organizations::OrganizationsController < Organizations::BaseController
 
   def update
     ActiveRecord::Base.transaction do
+      Organizations::CreateForm.new(organization_params).validate!
       login = @organization.login
-      @organization.update!(login: organization_params[:name]) if organization_params[:name].present?
-      @organization.organization_extension.update_attributes!(organization_params.except(:name))
+      @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
@@ -58,31 +62,19 @@ class Organizations::OrganizationsController < Organizations::BaseController
     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)
+  def recommend
+    recommend = %W(xuos Huawei_Technology openatom_foundation pkecosystem TensorLayer)
+    
+    @organizations = Organization.with_visibility(%w(common))
+      .where(login: recommend).select(:id, :login, :firstname, :lastname, :nickname)
   end
 
-  def avatar_path(organization)
-    ApplicationController.helpers.disk_filename(organization.class, organization.id)
-  end
+  private
 
   def organization_params
     params.permit(:name, :description, :website, :location,
                   :repo_admin_change_team_access, :visibility,
-                  :max_repo_creation)
+                  :max_repo_creation, :nickname)
   end
 
   def password
@@ -96,11 +88,11 @@ class Organizations::OrganizationsController < Organizations::BaseController
   end
 
   def sort_by
-    params.fetch(:sort_by, "created_at")
+    OrganizationExtension.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
   end
 
   def sort_direction
-    params.fetch(:sort_direction, "desc")
+    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
   end
 
 end

app/controllers/organizations/projects_controller.rb

@@ -36,10 +36,10 @@ class Organizations::ProjectsController < Organizations::BaseController
   end
 
   def sort
-    params.fetch(:sort_by, "updated_on")
+    Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'updated_on'
   end
 
   def sort_direction
-    params.fetch(:sort_direction, "desc")
+    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
   end
 end

app/controllers/organizations/team_users_controller.rb

@@ -8,7 +8,7 @@ class Organizations::TeamUsersController < Organizations::BaseController
     @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 = @team_users.joins(:user).merge(User.like(search))
 
     @team_users = kaminari_paginate(@team_users)
   end

app/controllers/organizations/teams_controller.rb

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

app/controllers/project_categories_controller.rb

@@ -7,5 +7,7 @@ class ProjectCategoriesController < ApplicationController
 
   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
   end
 end

app/controllers/projects/applied_transfer_projects_controller.rb

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

app/controllers/projects/project_units_controller.rb

@@ -0,0 +1,24 @@
+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

app/controllers/projects_controller.rb

@@ -2,19 +2,37 @@ 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]
+  include Acceleratorable
+
+  before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about menu_list]
   before_action :load_project, except: %i[index group_type_list migrate create recommend]
   before_action :authorizate_user_can_edit_project!, only: %i[update]
   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 = kaminari_paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :apply_signatures, :members, :owner)
+    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
 
     category_id = params[:category_id]
-    @total_count = @projects.total_count
+    @total_count =
       if category_id.blank?
         ps = ProjectStatistic.first
         ps.common_projects_count + ps.mirror_projects_count unless ps.blank?
@@ -37,41 +55,81 @@ class ProjectsController < ApplicationController
 
   def migrate
     Projects::MigrateForm.new(mirror_params).validate!
-    @project = Projects::MigrateService.new(current_user, mirror_params).call
+
+    @project = 
+      if enable_accelerator?(mirror_params[:clone_addr])
+        source_clone_url = mirror_params[:clone_addr]
+        uid_logger("########## 已动加速器 ##########")
+        result = Gitea::Accelerator::MigrateService.call(mirror_params)
+        if result[:status] == :success
+          Rails.logger.info "########## 加速镜像成功 ########## "
+          Projects::MigrateService.call(current_user, 
+            mirror_params.merge(source_clone_url: source_clone_url, 
+              clone_addr: accelerator_url(mirror_params[:repository_name])))
+        else
+          Projects::MigrateService.call(current_user, mirror_params)
+        end
+      else
+        Projects::MigrateService.call(current_user, mirror_params)
+      end
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
   end
 
   def branches
-    @branches = @project.forge? ? Gitea::Repository::Branches::ListService.new(@owner, @project.identifier).call : []
+    return @branches = [] unless @project.forge?
+
+    result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
+    @branches =  result.is_a?(Hash) && result.key?(:status) ? [] : result
   end
 
   def group_type_list
-    # if current_user&.logged?
-    #   projects = Project.list_user_projects(current_user.id)
-    # else
-    #   projects = Project.visible
-    # end
-    projects = Project.no_anomory_projects.secret_and_visible
-    language_lists = projects.joins(:project_language).group("project_languages.name", "project_languages.id").size.keys.sort.to_h
-    @project_group_list = language_lists.delete_if { |k, v| k.blank? }
+    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
   end
 
   def update
     ActiveRecord::Base.transaction do
-      # Projects::CreateForm.new(project_params).validate!
-      private = params[:private]
-      gitea_params = {
-        private: private,
-        default_branch: params[:default_branch]
-      }
-      if [true, false].include? private
+      # TODO:
+      # 临时特殊处理修改website、lesson_url操作方法
+      if project_params.has_key?("website")
+        @project.update(project_params)
+      else
+        validate_params = project_params.slice(:name, :description, 
+          :project_category_id, :project_language_id, :private)
+  
+        Projects::UpdateForm.new(validate_params).validate!
+  
+        private = params[:private] || false
+
         new_project_params = project_params.except(:private).merge(is_public: !private)
-        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
-        @project.repository.update_column(:hidden, private)
+        @project.update_attributes!(new_project_params)
+        gitea_params = {
+          private: private,
+          default_branch: @project.default_branch,
+          website: @project.website
+        }
+        if [true, false].include? private
+          Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+          @project.repository.update_column(:hidden, private)
+        end
       end
-      @project.update_attributes!(new_project_params)
     end
   rescue Exception => e
     uid_logger_error(e.message)
@@ -82,7 +140,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!
@@ -119,7 +177,7 @@ class ProjectsController < ApplicationController
   end
 
   def recommend
-    @projects = Project.recommend.includes(:repository, :project_category, :owner).limit(5)
+    @projects = Project.recommend.includes(:repository, :project_category, :owner).order(visits: :desc)
   end
 
   def about
@@ -138,6 +196,7 @@ class ProjectsController < ApplicationController
         end
         if @project_detail.save!
           attachment_ids = Array(params[:attachment_ids])
+          logger.info "=============> #{Array(params[:attachment_ids])}"
           @attachments =  Attachment.where(id: attachment_ids)
           @attachments.update_all(
             container_id: @project_detail.id,
@@ -152,7 +211,7 @@ class ProjectsController < ApplicationController
 
   private
   def project_params
-    params.permit(:user_id, :name, :description, :repository_name,
+    params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url,
                   :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
   end
 

app/controllers/pull_requests_controller.rb

@@ -8,13 +8,16 @@ class PullRequestsController < ApplicationController
 
 
   def index
+    return render_not_found unless @project.has_menu_permission("pulls")
     # @issues = Gitea::PullRequest::ListService.new(@user,@repository.try(:identifier)).call   #通过gitea获取
     issues = @project.issues.issue_pull_request.issue_index_includes.includes(pull_request: :user)
     issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
-    @all_issues_size = issues.size
-    @open_issues_size = issues.joins(:pull_request).where(pull_requests: {status: 0}).size
-    @close_issues_size = issues.joins(:pull_request).where(pull_requests: {status: 2}).size
-    @merged_issues_size = issues.joins(:pull_request).where(pull_requests: {status: 1}).size
+    @all_issues = issues.distinct
+    @filter_issues = @all_issues
+    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
+    @open_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::OPEN})
+    @close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
+    @merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::MERGED})
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
 
     scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "PullRequest")
@@ -104,10 +107,8 @@ class PullRequestsController < ApplicationController
                 normal_status(-1, "PullRequest更新失败")
               end
             else
-              normal_status(-1, @pull_request.errors.messages.values[0][0])
+              normal_status(-1, "PullRequest更新失败")
             end
-          else
-            normal_status(-1, @issue.errors.messages.values[0][0])
           end
         rescue => e
           normal_status(-1, e.message)
@@ -137,11 +138,12 @@ class PullRequestsController < ApplicationController
   def show
     @issue_user = @issue.user
     @issue_assign_to = @issue.get_assign_user
-
+    @gitea_pull = Gitea::PullRequest::GetService.call(@owner.login, 
+      @repository.identifier, @pull_request.gpid, current_user&.gitea_token)
   end
 
   def pr_merge
-    return render_forbidden("你没有权限操作.") if @project.reporter?(current_user)
+    return render_forbidden("你没有权限操作.") unless @project.operator?(current_user)
 
     if params[:do].blank?
       normal_status(-1, "请选择合并方式")
@@ -150,12 +152,12 @@ class PullRequestsController < ApplicationController
         begin
           result = PullRequests::MergeService.call(@owner, @repository, @pull_request, current_user, params)
 
-          if result && @pull_request.merge!
+          if result.status == 200 && @pull_request.merge!
             @pull_request.project_trend_status!
             @issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
             normal_status(1, "合并成功")
           else
-            normal_status(-1, "合并失败")
+            normal_status(-1, result.message)
           end
         rescue => e
           normal_status(-1, e.message)
@@ -216,7 +218,7 @@ class PullRequestsController < ApplicationController
   def get_relatived
     @project_tags = @project.issue_tags&.select(:id,:name, :color).as_json
     @project_versions = @project.versions&.select(:id,:name, :status).as_json
-    @project_members = @project.members_user_infos
+    @project_members = @project.all_developers
     @project_priories = IssuePriority&.select(:id,:name, :position).as_json
   end
 

app/controllers/repositories_controller.rb

@@ -7,10 +7,29 @@ class RepositoriesController < ApplicationController
   before_action :load_repository
   before_action :authorizate!, except: [:sync_mirror, :tags, :commit]
   before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
-  before_action :get_ref, only: %i[entries sub_entries top_counts]
+  before_action :get_ref, only: %i[entries sub_entries top_counts file]
   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
@@ -34,6 +53,16 @@ class RepositoriesController < ApplicationController
       @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}/"
+
+      # TODO
+      # 临时处理readme文件问题
+      result = Gitea::Repository::Readme::GetService.call(@owner.login, @project.identifier, @ref, @owner&.gitea_token)
+      @readme = 
+      if result[:status] == :success
+        result[:body]
+      else
+        {}
+      end
     end
   end
 
@@ -84,7 +113,13 @@ class RepositoriesController < ApplicationController
   end
 
   def tags
-    @tags = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]})
+    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
@@ -187,7 +222,7 @@ class RepositoriesController < ApplicationController
   end
 
   def get_ref
-    @ref = params[:ref] || "master"
+    @ref = params[:ref] || @project&.default_branch
   end
 
   def get_latest_commit

app/controllers/settings_controller.rb

@@ -1,4 +1,57 @@
 class SettingsController < ApplicationController
   def show
+    @old_projects_url = nil
+    get_add_menu
+    get_common_menu
+    get_personal_menu
+
   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

app/controllers/sync_forge_controller.rb

@@ -309,12 +309,12 @@ class SyncForgeController < ApplicationController
   #   end
   # end
 
-  # # def check_token
-  # #   sync_params = params[:sync_params]
-  # #   unless sync_params[:token] && sync_params[:token] == get_token
-  # #     render json: {message: "token_errors"}
-  # #   end
-  # # end
+  # def check_token
+  #   sync_params = params[:sync_params]
+  #   unless sync_params[:token] && sync_params[:token] == get_token
+  #     render json: {message: "token_errors"}
+  #   end
+  # end
 
   # def get_token
   #   "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e"

app/controllers/users/applied_messages_controller.rb

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

app/controllers/users/applied_projects_controller.rb

@@ -0,0 +1,39 @@
+class Users::AppliedProjectsController < Users::BaseController 
+  before_action :check_auth
+  before_action :find_applied_project, except: [:index]
+  before_action :find_project, except: [:index]
+
+  def index 
+    @applied_projects = AppliedProject.where(project_id: observed_user.full_admin_projects)
+    @applied_projects = paginate @applied_projects.order("created_at desc")
+  end
+
+  # 接受申请
+  def accept 
+    @applied_project = Projects::AcceptJoinService.call(current_user, @applied_project)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  # 拒绝申请
+  def refuse 
+    @applied_project = Projects::RefuseJoinService.call(current_user, @applied_project)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+  def check_auth 
+    return render_forbidden unless current_user.admin? || observed_logged_user?
+  end
+
+  def find_applied_project 
+    @applied_project = AppliedProject.find_by_id params[:id]
+  end
+
+  def find_project 
+    @project = @applied_project.project
+  end
+end

app/controllers/users/applied_transfer_projects_controller.rb

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

app/controllers/users/banks_controller.rb

@@ -1,8 +1,8 @@
 class Users::BanksController < Users::BaseController
   before_action :params_filter
   def index
-    order = params[:order] || "updated_at"
-    sort = params[:sort] || "desc"
+    order = CourseList.column_names.include?(params[:order]) ? params[:order] : "updated_at"
+    sort = %w(desc asc).includes?(params[:sort]) ? params[:sort] : "desc"
     @banks = @object_type.classify.constantize.where(@object_filter)
     @course_lists = CourseList.where(id: @banks.pluck(:course_list_id))
     @banks = @banks.where(course_list_id: params[:tag_id]) unless params[:tag_id].blank?

app/controllers/users/headmaps_controller.rb

@@ -0,0 +1,26 @@
+class Users::HeadmapsController < Users::BaseController
+  def index 
+    result = Gitea::User::HeadmapService.call(observed_user.login, start_stamp, end_stamp)
+    @headmaps = result[2]
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+  def start_stamp
+    if params[:year].present?
+      Date.new(params[:year], 1).to_time.to_i
+    else 
+      Date.today.to_time.to_i - 365*24*60*60
+    end
+  end
+
+  def end_stamp 
+    if params[:year].present?
+      Date.new(params[:year], 1).to_time.to_i + 365*24*60*60
+    else 
+      Date.today.to_time.to_i 
+    end
+  end
+end

app/controllers/users/is_pinned_projects_controller.rb

@@ -0,0 +1,45 @@
+class Users::IsPinnedProjectsController < Users::BaseController 
+  before_action :private_user_resources!, only: [:pin]
+  def index 
+    @is_pinned_projects = observed_user.pinned_projects.order(position: :desc, created_at: :asc).includes(project: [:project_category, :project_language, :repository]).order(position: :desc)
+    @is_pinned_projects = kaminari_paginate(@is_pinned_projects)
+  end 
+  
+  def pin 
+    observed_user.is_pinned_project_ids = is_pinned_project_ids
+    render_ok
+  rescue ActiveRecord::RecordNotFound => e
+    render_not_found
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def update 
+    @pinned_project = PinnedProject.find_by_id(params[:id])
+    @pinned_project.attributes = pinned_project_params 
+    if @pinned_project.save 
+      render_ok
+    else 
+      render_error
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+  def is_pinned_project_ids 
+    if params[:is_pinned_project_ids].present?
+      return params[:is_pinned_project_ids].select{|id| observed_user.full_member_projects.visible.pluck(:id).include?(id.to_i) }
+    end
+    if params[:is_pinned_project_id].present?
+      return observed_user.is_pinned_project_ids unless observed_user.full_member_projects.visible.pluck(:id).include?(params[:is_pinned_project_id].to_i)
+      return observed_user.is_pinned_project_ids.include?(params[:is_pinned_project_id].to_i) ? observed_user.is_pinned_project_ids : observed_user.is_pinned_project_ids.push(params[:is_pinned_project_id].to_i)
+    end
+  end
+  
+  def pinned_project_params
+    params.require(:pinned_project).permit(:position)
+  end
+end

app/controllers/users/organizations_controller.rb

@@ -16,10 +16,10 @@ class Users::OrganizationsController < Users::BaseController
 
   private
   def sort_by
-    params.fetch(:sort_by, "created_at")
+    OrganizationExtension.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at' 
   end
 
   def sort_direction
-    params.fetch(:sort_direction, "desc")
+    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'  
   end
 end

app/controllers/users/project_trends_controller.rb

@@ -0,0 +1,11 @@
+class Users::ProjectTrendsController < Users::BaseController 
+
+  def index 
+    if params[:date].present?
+      @project_trends = observed_user.project_trends.where("DATE(created_at) = ?", params[:date])
+    else 
+      @project_trends = observed_user.project_trends
+    end
+    @project_trends = kaminari_paginate(@project_trends.includes(:trend, :project).order(created_at: :desc))
+  end
+end

app/controllers/users/statistics_controller.rb

@@ -0,0 +1,217 @@
+class Users::StatisticsController < Users::BaseController 
+  before_action :preload_develop_data, only: [:develop]
+
+  # 近期活动统计
+  def activity 
+    date_range = (1.week.ago.to_date..Date.today).to_a
+    commit_request = Gitea::User::HeadmapService.call(observed_user.login, 1.week.ago.to_date.to_time.to_i, Date.today.to_time.to_i)
+    commit_data = commit_request[2]
+    @date_data = []
+    @issue_data = []
+    @pull_request_data = []
+    @commit_data = []
+    date_range.each do |date|
+      @date_data << date.strftime("%Y.%m.%d")
+      @issue_data << observed_user.issues.where("DATE(created_on) = ?", date).size
+      @pull_request_data << observed_user.pull_requests.where("DATE(created_at) = ?", date).size
+      date_commit_data = commit_data.select{|item| item["timestamp"] == date.to_time.to_i}
+      @commit_data << (date_commit_data.blank? ? 0 : date_commit_data[0]["contributions"].to_i)
+    end
+    render :json => {dates: @date_data, issues_count: @issue_data, pull_requests_count: @pull_request_data, commits_count: @commit_data}
+  end
+
+  # 开发能力
+  def develop 
+    if params[:start_time].present? && params[:end_time].present?
+      # 影响力
+      @influence = (60.0 + @follow_count / (@follow_count + 10.0) * 40.0).to_i
+      @platform_influence = (60.0 + @platform_follow_count / (@platform_follow_count + 10.0) * 40.0).to_i
+      # 贡献度
+      @contribution = (60.0 + @pullrequest_count / (@pullrequest_count + 10.0) * 40.0).to_i
+      @platform_contribution = (60.0 + @platform_pullrequest_count / (@platform_pullrequest_count + 10.0) * 40.0).to_i
+      # 活跃度
+      @activity = (60.0 + @issues_count / (@issues_count + 10.0) * 40.0).to_i
+      @platform_activity = (60.0 + @platform_issues_count / (@platform_issues_count + 10.0) * 40.0).to_i
+      # 项目经验
+      @experience = 10 * @project_count + 5 * @fork_count + @project_watchers_count + @project_praises_count
+      @experience = (60.0 + @experience / (@experience + 100.0) * 40.0).to_i
+      @platform_experience = 10 * @platform_project_count + 5 * @platform_fork_count + @platform_project_watchers_count + @platform_project_praises_count
+      @platform_experience = (60.0 + @platform_experience / (@platform_experience + 100.0) * 40.0).to_i
+      # 语言能力  
+      @language = (60.0 + @project_languages_count.length / (@project_languages_count.length + 5.0) * 40.0).to_i
+      @platform_language = (60.0 + @platform_project_languages_count.length / (@platform_project_languages_count.length + 5.0) * 40.0).to_i
+      # 语言百分比
+      @languages_percent = Hash.new
+      for key in @project_languages_count.keys do
+        @languages_percent[key] = (@project_languages_count[key].to_f / @project_languages_count.values.sum).round(2)
+      end
+      @platform_languages_percent = Hash.new
+      for key in @platform_project_languages_count.keys do
+        @platform_languages_percent[key] = (@platform_project_languages_count[key].to_f / @platform_project_languages_count.values.sum).round(2)
+      end
+      # 各门语言分数
+      @each_language_score = Hash.new
+      for key in @project_languages_count.keys do
+        @each_language_score[key] = (60.0 + @project_languages_count[key] / (@project_languages_count[key] + 5.0) * 40.0).to_i
+      end
+      @platform_each_language_score = Hash.new
+      for key in @platform_project_languages_count.keys do
+        @platform_each_language_score[key] = (60.0 + @platform_project_languages_count[key] / (@platform_project_languages_count[key] + 5.0) * 40.0).to_i
+      end
+    else
+      # 影响力
+      @influence = (60.0 + @follow_count / (@follow_count + 20.0) * 40.0).to_i 
+      @platform_influence = (60.0 + @platform_follow_count / (@platform_follow_count + 20.0) * 40.0).to_i 
+
+      # 贡献度
+      @contribution = (60.0 + @pullrequest_count / (@pullrequest_count + 20.0) * 40.0).to_i
+      @platform_contribution = (60.0 + @platform_pullrequest_count / (@platform_pullrequest_count + 20.0) * 40.0).to_i
+
+       # 活跃度
+      @activity = (60.0 + @issues_count / (@issues_count + 80.0) * 40.0).to_i
+      @platform_activity = (60.0 + @platform_issues_count / (@platform_issues_count + 80.0) * 40.0).to_i
+
+      # 项目经验
+      @experience = 10 * @project_count + 5 * @fork_count + @project_watchers_count + @project_praises_count
+      @experience = (60.0 + @experience / (@experience + 100.0) * 40.0).to_i
+      @platform_experience = 10 * @platform_project_count + 5 * @platform_fork_count + @platform_project_watchers_count + @platform_project_praises_count
+      @platform_experience = (60.0 + @platform_experience / (@platform_experience + 100.0) * 40.0).to_i
+      # 语言能力
+      @language = (60.0 + @project_languages_count.length / (@project_languages_count.length + 5.0) * 40.0).to_i
+      @platform_language = (60.0 + @platform_project_languages_count.length / (@platform_project_languages_count.length + 5.0) * 40.0).to_i
+
+      # 语言百分比
+      @languages_percent = Hash.new
+      for key in @project_languages_count.keys do
+        @languages_percent[key] = (@project_languages_count[key].to_f / @project_languages_count.values.sum).round(2)
+      end
+      # @platform_languages_percent = Hash.new
+      # for key in @platform_project_languages_count.keys do
+      #   @platform_languages_percent[key] = (@platform_project_languages_count[key].to_f / @platform_project_languages_count.values.sum).round(2)
+      # end
+      # 各门语言分数
+      @each_language_score = Hash.new
+      for key in @project_languages_count.keys do
+        @each_language_score[key] = (60.0 + @project_languages_count[key] / (@project_languages_count[key] + 5.0) * 40.0).to_i
+      end
+      # @platform_each_language_score = Hash.new
+      # for key in @platform_project_languages_count.keys do
+      #   @platform_each_language_score[key] = (60.0 + @platform_project_languages_count[key] / (@platform_project_languages_count[key] + 5.0) * 40.0).to_i
+      # end
+    end
+    
+  end
+
+  # 角色定位
+  def role 
+    full_member_projects = observed_user.full_member_projects
+    owner_projects = filter_member_projects_by_role("Owner")
+    manager_projects = filter_member_projects_by_role("Manager").where.not(id: owner_projects.ids)
+    developer_projects = filter_member_projects_by_role("Developer").where.not(id: owner_projects.ids + manager_projects.ids)
+    reporter_projects = filter_member_projects_by_role("Reporter").where.not(id: owner_projects.ids + manager_projects.ids + developer_projects.ids)
+
+    @full_member_projects_count = full_member_projects.size
+    @owner_projects_count = owner_projects.size
+    @manager_projects_count = manager_projects.size
+    @developer_projects_count = developer_projects.size
+    @reporter_projects_count = reporter_projects.size
+
+  end
+
+  # 专业定位
+  def major 
+    # 参与项目
+    join_normal_projects_sql = Project.members_projects(observed_user.id).to_sql
+    join_org_projects_sql = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: observed_user.id}).to_sql
+    # 关注项目
+    star_projects_sql = Project.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observed_user.id}).to_sql 
+    # fork项目
+    fork_projects_sql = Project.where(id: observed_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id)).to_sql 
+    major_projects = Project.from("( #{ join_normal_projects_sql} UNION #{ join_org_projects_sql } UNION #{ star_projects_sql } UNION #{fork_projects_sql}) AS projects").distinct
+    categories = ProjectCategory.joins(:projects).merge(Project.where(id: time_filter(major_projects, 'created_on'))).distinct.pluck(:name)
+    render :json => {categories: categories}
+  end
+
+  private 
+  def time_filter(collection, time_field) 
+    if params[:start_time].present? && params[:end_time].present?
+      return collection.where("#{time_field} > ? AND #{time_field} < ?", Time.at(params[:start_time].to_i).beginning_of_day, Time.at(params[:end_time].to_i).end_of_day)
+    else 
+      return collection
+    end
+  rescue 
+    return collection
+  end
+
+  def filter_member_projects_by_role(role)
+    case role 
+    when 'Owner'
+      normal_projects_sql =  Project.joins(members: :roles).where(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Manager'}).to_sql 
+      org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "owner"}, team_users: {user_id: observed_user.id}).to_sql
+    when "Manager"
+      normal_projects_sql = Project.joins(members: :roles).where.not(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Manager'}).to_sql 
+      org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "admin"}, team_users: {user_id: observed_user.id}).to_sql
+    when "Developer"
+      normal_projects_sql = Project.joins(members: :roles).where.not(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Developer'}).to_sql 
+      org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "write"}, team_users: {user_id: observed_user.id}).to_sql
+    when "Reporter"
+      normal_projects_sql = Project.joins(members: :roles).where.not(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Reporter'}).to_sql 
+      org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "read"}, team_users: {user_id: observed_user.id}).to_sql
+    end
+    return time_filter(Project.from("( #{normal_projects_sql} UNION #{org_projects_sql} ) AS projects").distinct, 'created_on')
+  end
+
+  def preload_develop_data
+    if params[:start_time].present? && params[:end_time].present?
+      # 用户被follow数量
+      @follow_count = time_filter(Watcher.where(watchable: observed_user), 'created_at').count
+      @platform_follow_count = time_filter(Watcher.where(watchable_type: 'User'), 'created_at').count
+      # 用户pr数量
+      @pullrequest_count = time_filter(PullRequest.where(user_id: observed_user.id), 'created_at').count
+      @platform_pullrequest_count = time_filter(PullRequest, 'created_at').count  
+      # 用户issue数量
+      @issues_count = time_filter(Issue.where(author_id: observed_user.id), 'created_on').count 
+      @platform_issues_count = time_filter(Issue, 'created_on').count
+      # 用户总项目数 
+      @project_count = time_filter(Project.where(user_id:observed_user.id), 'created_on').count
+      @platform_project_count = time_filter(Project, 'created_on').count
+      # 用户项目被fork数量
+      @fork_count = time_filter(Project.where(user_id:observed_user.id), 'created_on').sum("forked_count") 
+      @platform_fork_count = time_filter(Project, 'created_on').sum("forked_count") 
+      # 用户项目关注数
+      @project_watchers_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').sum("watchers_count")
+      @platform_project_watchers_count = time_filter(Project, 'created_on').sum("watchers_count")
+      # 用户项目点赞数
+      @project_praises_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').sum("praises_count")
+      @platform_project_praises_count = time_filter(Project, 'created_on').sum("praises_count")
+      # 用户不同语言项目数量
+      @project_languages_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').joins(:project_language).group("project_languages.name").count
+      @platform_project_languages_count = time_filter(Project, 'created_on').joins(:project_language).group("project_languages.name").count
+    else
+      # 用户被follow数量
+      @follow_count = Cache::UserFollowCountService.call(observed_user)
+      @platform_follow_count = Cache::PlatformFollowCountService.call
+      # 用户pr数量
+      @pullrequest_count = Cache::UserPullrequestCountService.call(observed_user)
+      @platform_pullrequest_count = Cache::PlatformPullrequestCountService.call
+      # 用户issue数量
+      @issues_count = Cache::UserIssueCountService.call(observed_user)
+      @platform_issues_count = Cache::PlatformIssueCountService.call
+      # 用户总项目数 
+      @project_count = Cache::UserProjectCountService.call(observed_user)
+      @platform_project_count = Cache::PlatformProjectCountService.call
+      # 用户项目被fork数量
+      @fork_count = Cache::UserProjectForkCountService.call(observed_user)
+      @platform_fork_count = Cache::PlatformProjectForkCountService.call
+      # 用户项目关注数
+      @project_watchers_count = Cache::UserProjectWatchersCountService.call(observed_user)
+      @platform_project_watchers_count = Cache::PlatformProjectWatchersCountService.call 
+      # 用户项目点赞数
+      @project_praises_count = Cache::UserProjectPraisesCountService.call(observed_user)
+      @platform_project_praises_count = Cache::PlatformProjectPraisesCountService.call
+      # 用户不同语言项目数量
+      @project_languages_count = Cache::UserProjectLanguagesCountService.call(observed_user)
+      @platform_project_languages_count = Cache::PlatformProjectLanguagesCountService.call
+    end
+  end
+end

app/controllers/users_controller.rb

@@ -2,10 +2,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]
-  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users]
-  before_action :require_login, only: %i[me list]
+  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 :convert_image!, only: [:update]
   skip_before_action :check_sign, only: [:attachment_show]
 
   def connect_to_ci_db(options={})
@@ -27,12 +28,26 @@ class UsersController < ApplicationController
 
   def show
       #待办事项，现在未做
-      @undo_events = 0
+      if User.current.admin? || User.current.login == @user.login 
+        @waiting_applied_messages = @user.applied_messages.waiting
+        @common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common
+        @common_applied_projects = AppliedProject.where(project_id: @user.full_admin_projects).common
+        @undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
+      else 
+        @waiting_applied_messages = AppliedMessage.none
+        @common_applied_transfer_projects = AppliedTransferProject.none
+        @common_applied_projects = AppliedProject.none
+        @undo_events = 0
+      end
       #用户的组织数量
       # @user_composes_count =  @user.composes.size
       @user_composes_count = 0
-      @user_org_count = User.current.logged? ? @user.organizations.with_visibility(%w(common limited)).size + @user.organizations.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).size : @user.organizations.with_visibility("common").size
-      user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? @user.projects : @user.projects.visible
+      user_organizations =  User.current.logged? ? @user.organizations.with_visibility(%w(common limited)) + @user.organizations.with_visibility("privacy").joins(:team_users).where(team_users: {user_id: current_user.id}) : @user.organizations.with_visibility("common")
+      @user_org_count = user_organizations.size
+      normal_projects = Project.members_projects(@user.id).to_sql
+      org_projects = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: @user.id}).to_sql
+      projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
+      user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? projects : projects.visible
       @projects_common_count = user_projects.common.size
       @projects_mirrior_count = user_projects.mirror.size
       @projects_sync_mirrior_count = user_projects.sync_mirror.size
@@ -50,16 +65,22 @@ class UsersController < ApplicationController
 
   def fan_users
     watchers = @user.watchers.includes(:user).order("watchers.created_at desc")
-    watchers = watchers.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login)) LIKE ?", "%#{params[:search].split(" ").join('|')}%") if params[:search].present?
-
+    watchers = watchers.joins(:user).merge(User.like(params[:search]))
     @watchers_count = watchers.size
     @watchers = paginate(watchers)
   end
 
+  def hovercard
+  end
+
   def update
-    @user = User.find params[:id]
-    @user.update!(user_params)
-    render_ok
+    return render_not_found unless @user = User.find_by_id(params[:id]) || User.find_by(login: params[:id])
+    return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
+    Util.write_file(@image, avatar_path(@user)) if user_params[:image].present?
+    @user.attributes = user_params.except(:image)
+    unless @user.save
+      render_error(@user.errors.full_messages.join(", "))
+    end
   end
 
   def me
@@ -155,7 +176,8 @@ class UsersController < ApplicationController
   # 其他平台登录后，必须将token同步到forge平台，实现sso登录功能
   def sync_token
     return render_error('未找相关用户!')  unless @user
-    token = Token.get_or_create_permanent_login_token(@user, autologin_cookie_name)
+
+    token = Token.get_or_create_permanent_login_token(@user, 'autologin')
     token.update_column(:value, params[:token])
     render_ok
   end
@@ -232,17 +254,39 @@ 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])
   end
 
   def user_params
-    params.require(:user).permit(:nickname, :lastname, :show_realname,:login,:mail,
+    params.require(:user).permit(:nickname, :image,
                                   user_extension_attributes: [
                                   :gender, :location, :location_city,
                                   :occupation, :technical_title,
-                                  :school_id, :department_id,:identity, :student_id, :description]
+                                  :school_id, :department_id, :province, :city,
+                                  :custom_department, :identity, :student_id, :description,
+                                  :show_email, :show_location, :show_department]
                                 )
   end
 

app/controllers/users_for_private_messages_controller.rb

@@ -11,7 +11,7 @@ class UsersForPrivateMessagesController < ApplicationController
       return
     end
 
-    users = users.where('LOWER(concat(lastname, firstname, nickname)) LIKE ?', "%#{keyword}%")
+    users = users.like(keyword)
 
     @users = users.limit(10).includes(:user_extension)
   end

app/controllers/version_releases_controller.rb

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

app/controllers/versions_controller.rb

@@ -5,9 +5,8 @@ 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"
     status = params[:status]
     versions = @project.versions.version_includes
     @open_versions_size = versions.where(status: "open")&.size
@@ -26,9 +25,6 @@ class VersionsController < ApplicationController
   end
 
   def show
-    order_name = params[:order_name] || "created_on"
-    order_type = params[:order_type] || "desc"
-
     version_issues = @version.issues.issue_includes
 
     status_type = params[:status_type] || "1"
@@ -83,7 +79,7 @@ class VersionsController < ApplicationController
         if version.save
           normal_status(0, "里程碑创建成功")
         else
-          normal_status(-1, version.errors.messages.values[0][0])
+          normal_status(-1, "里程碑创建失败")
         end
       end
 
@@ -121,7 +117,7 @@ class VersionsController < ApplicationController
         if @version.update_attributes(tag_params)
           normal_status(0, "里程碑更新成功")
         else
-          normal_status(-1, version.errors.messages.values[0][0])
+          normal_status(-1, "里程碑更新失败")
         end
       end
     else
@@ -166,4 +162,12 @@ class VersionsController < ApplicationController
     end
   end
 
+   def order_name
+    Version.column_names.include?(params[:order_name]) ? params[:order_name] : 'created_on'
+   end
+
+   def order_type
+    %w(desc asc).include?(params[:order_type]) ? params[:order_type] : 'desc'
+   end
+
 end

app/controllers/weapps/courses_controller.rb

@@ -86,7 +86,7 @@ class Weapps::CoursesController < Weapps::BaseController
     end
 
     if search.present?
-      @teacher_list = @teacher_list.joins(:user).where("LOWER(CONCAT(users.lastname, users.firstname)) like ?", "%#{search}%")
+      @teacher_list = @teacher_list.joins(:user).where("LOWER(CONCAT(users.lastname, users.firstname)) like ? OR users.nickname like ?", "%#{search}%", "%#{search}%")
     end
 
     @teacher_list_size = @teacher_list.size
@@ -127,8 +127,8 @@ class Weapps::CoursesController < Weapps::BaseController
     @students = CourseMember.students(@course)
 
     if search.present?
-      @students = @students.joins(user: :user_extension).where("LOWER(CONCAT(users.lastname, users.firstname)) like ? or
-                                                        user_extensions.student_id like ?", "%#{search}%", "%#{search}%")
+      @students = @students.joins(user: :user_extension).where("LOWER(CONCAT(users.lastname, users.firstname)) like ? or users.nickname like ? or
+                                                        user_extensions.student_id like ?", "%#{search}%", "%#{search}%", "%#{search}%")
     end
 
     if course_group_id.present?

app/controllers/zips_controller.rb

@@ -86,7 +86,7 @@ class ZipsController < ApplicationController
 
           #搜索
           if params[:search].present?
-            @ex_users = @ex_users.joins(user: :user_extension).where("CONCAT(lastname, firstname) like ? OR student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%")
+            @ex_users = @ex_users.joins(user: :user_extension).where("CONCAT(lastname, firstname) like ? OR nickname like ? OR student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%", "%#{params[:search]}%")
           end
 
           default_ex_users_size = @ex_users&.size
@@ -130,8 +130,8 @@ class ZipsController < ApplicationController
       end
 
       unless params[:search].blank?
-        @all_student_works = @all_student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ?
-                         or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%")
+        @all_student_works = @all_student_works.joins(user: :user_extension).where("CONCAT(lastname, firstname) like ? or nickname like ? 
+                         or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%", "%#{params[:search]}%")
       end
 
       student_work_sizes = @all_student_works&.size

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

@@ -1,5 +1,91 @@
 # Projects
 
+## 申请加入项目
+申请加入项目
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/applied_projects.json
+```
+
+```javascript
+await octokit.request('POST /api/appliedr_projects.json')
+```
+
+### HTTP 请求
+`POST /api/applied_projects.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|applied_project.code     |是| |string |邀请码  |
+|applied_project.role     |否| |string |项目权限，reporter: 报告者, developer: 开发者，manager：管理员  |
+
+> 请求的JSON示例
+
+```json
+{
+  "applied_project": {
+    "code": "1una34",
+    "role": "developer"
+  }
+}
+```
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |申请id |
+|status         |string   |申请状态，canceled:取消,common:正在申请, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |项目申请创建的时间 |
+|project.id     |int      |申请项目的id |
+|project.identifier     |string      |申请项目的标识 |
+|project.name     |string      |申请项目的名称 |
+|project.description     |string      |申请项目的描述 |
+|project.is_public     |bool      |申请项目是否公开 |
+|project.owner.id     |bool      |申请项目拥有者id |
+|project.owner.type     |string      |申请项目拥有者类型 |
+|project.owner.name     |string      |申请项目拥有者昵称 |
+|project.owner.login     |string      |申请项目拥有者标识 |
+|project.owner.image_url     |string      |申请项目拥有者头像 |
+|user.id     |int      |申请创建者的id |
+|user.type     |string      |申请创建者的类型 |
+|user.name     |string      |申请创建者的名称 |
+|user.login     |string      |申请创建者的标识 |
+|user.image_url     |string      |申请创建者头像 |
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 74,
+        "identifier": "hehuisssjssjjsjs",
+        "name": "hehuisssjssjjsjs",
+        "description": "wwww",
+        "is_public": false,
+        "owner": {
+            "id": 10,
+            "type": "User",
+            "name": "testforge1",
+            "login": "testforge1",
+            "image_url": "system/lets/letter_avatars/2/T/19_237_174/120.png"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "何慧",
+        "login": "yystopf",
+        "image_url": "images/avatars/User/6?t=1622513134"
+    },
+    "id": 7,
+    "status": "common",
+    "created_at": "2021-06-09 16:41",
+    "time_ago": "1分钟前"
+}
+```
+
 ## 获取项目列表
 获取项目列表，也可以更加相关条件过滤搜素
 
@@ -168,6 +254,55 @@ Remember — a happy kitten is an authenticated kitten!
 </aside>
 
 
+## 项目导航
+获取项目导航信息
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
+```
+
+```javascript
+await octokit.request('GET /api/yystopf/ceshi/menu_list')
+```
+
+### HTTP 请求
+`GET api/:owner/:repo/menu_list`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner             |是| |string |用户登录名
+repo             |是| |string |项目标识identifier
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+menu_name     |string|导航名称， home:主页,code:代码库,issues:易修,pulls:合并请求,devops:工作流,versions:里程碑,activity:动态,setting:仓库设置
+
+
+> 返回的JSON示例:
+
+```json
+[
+    {
+        "menu_name": "home"
+    },
+    {
+        "menu_name": "code"
+    },
+    {
+        "menu_name": "pulls"
+    },
+    {
+        "menu_name": "activity"
+    }
+]
+```
+
+
 ## 项目主页
 获取项目主页信息
 
@@ -212,6 +347,84 @@ attachments     |array|附件
 Remember — a happy kitten is an authenticated kitten!
 </aside>
 
+## 项目模块信息
+项目模块信息
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/yystopf/ceshi/project_units.json
+```
+
+```javascript
+await octokit.request('GET /api/yystopf/ceshi/project_units')
+```
+
+### HTTP 请求
+`GET /api/yystopf/ceshi/project_units`
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|type          |string|模块名称 |
+
+> 返回的JSON示例:
+
+```json
+[
+    {
+        "type": "code"
+    },
+    {
+        "type": "pulls"
+    },
+    {
+        "type": "issues"
+    }
+]
+```
+
+## 更改项目模块展示
+更改项目模块展示
+
+> 示例:
+
+```shell
+curl -X POST \
+-H  "accept: application/json" \
+-H  "Content-Type: application/json" \
+-d "{ \"unit_typs\": [\"code\", \"pulls\"]}" \
+http://localhost:3000/api/yystopf/ceshi/project_units.json
+```
+
+```javascript
+await octokit.request('POST /api/yystopf/ceshi/project_units')
+```
+
+### HTTP 请求
+`POST /api/yystopf/ceshi/project_units`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|unit_types |是| |array    | 项目模块内容， 支持以下参数:code:代码库,issues:易修,pulls:合并请求,devops:工作流,versions:里程碑 |
+
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|status          |int|返回状态， 0: 表示操作成功 |
+|message         |string|返回信息说明|
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
 
 ## 创建项目
 创建项目
@@ -399,3 +612,241 @@ await octokit.request('POST /api/jaser/jasder_test/forks.json')
   "identifier": "newadm"
 }
 ```
+
+## 用户管理的组织列表
+用户管理的组织列表
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizations.json  | jq
+```
+
+```javascript
+await octokit.request('GET /api/:owner/:repo/applied_transfer_projects/organizations')
+```
+
+### HTTP 请求
+`GET api/:owner/:repo/applied_transfer_projects/organizations`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner             |是| |string |用户登录名
+repo             |是| |string |项目标识identifier
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+name     |string|组织标识
+nickname |string|组织名称
+description|string|组织描述
+avatar_url|string｜组织头像
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 3,
+    "organizations": [
+        {
+            "id": 9,
+            "name": "ceshi_org",
+            "nickname": "测试组织",
+            "description": "测试组织",
+            "avatar_url": "images/avatars/Organization/9?t=1612706073"
+        },
+        {
+            "id": 51,
+            "name": "ceshi",
+            "nickname": "测试组织哈哈哈",
+            "description": "23212312",
+            "avatar_url": "images/avatars/Organization/51?t=1618800723"
+        },
+        {
+            "id": 52,
+            "name": "ceshi1",
+            "nickname": "身份卡手动阀",
+            "description": "1231手动阀是的",
+            "avatar_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    ]
+}
+```
+
+## 迁移项目
+迁移项目，edit接口is_transfering为true表示正在迁移
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects.json
+```
+
+```javascript
+await octokit.request('POST /api/:owner/:repo/applied_transfer_projects.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/applied_transfer_projects.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner     |是| |string |用户登录名  |
+|repo      |是| |string |项目标识identifier  |
+|owner_name|是| |string |迁移对象标识  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |项目id |
+|status         |string   |项目迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |项目迁移创建的时间 |
+|project.id     |int      |迁移项目的id |
+|project.identifier     |string      |迁移项目的标识 |
+|project.name     |string      |迁移项目的名称 |
+|project.description     |string      |迁移项目的描述 |
+|project.is_public     |bool      |迁移项目是否公开 |
+|project.owner.id     |bool      |迁移项目拥有者id |
+|project.owner.type     |string      |迁移项目拥有者类型 |
+|project.owner.name     |string      |迁移项目拥有者昵称 |
+|project.owner.login     |string      |迁移项目拥有者标识 |
+|project.owner.image_url     |string      |迁移项目拥有者头像 |
+|user.id     |int      |迁移创建者的id |
+|user.type     |string      |迁移创建者的类型 |
+|user.name     |string      |迁移创建者的名称 |
+|user.login     |string      |迁移创建者的标识 |
+|user.image_url     |string      |迁移创建者头像 |
+|owner.id     |int      |迁移接受者的id |
+|owner.type     |string      |迁移接受者的类型 |
+|owner.name     |string      |迁移接受者的名称 |
+|owner.login     |string      |迁移接受者的标识 |
+|owner.image_url     |string      |迁移接受者头像 |
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 86,
+        "identifier": "ceshi_repo1",
+        "name": "测试项目啊1",
+        "description": "二十多",
+        "is_public": true,
+        "owner": {
+            "id": 52,
+            "type": "Organization",
+            "name": "身份卡手动阀",
+            "login": "ceshi1",
+            "image_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "yystopf",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "owner": {
+        "id": 9,
+        "type": "Organization",
+        "name": "测试组织",
+        "login": "ceshi_org",
+        "image_url": "images/avatars/Organization/9?t=1612706073"
+    },
+    "id": 4,
+    "status": "common",
+    "created_at": "2021-04-26 09:54",
+    "time_ago": "1分钟前"
+}
+```
+
+## 取消迁移项目
+迁移项目，edit接口is_transfering为true表示正在迁移
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/cancel.json
+```
+
+```javascript
+await octokit.request('POST /api/:owner/:repo/applied_transfer_projects/cancel.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/applied_transfer_projects/cancel.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner     |是| |string |用户登录名  |
+|repo      |是| |string |项目标识identifier  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |迁移id |
+|status         |string   |迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |迁移创建的时间 |
+|project.id     |int      |迁移项目的id |
+|project.identifier     |string      |迁移项目的标识 |
+|project.name     |string      |迁移项目的名称 |
+|project.description     |string      |迁移项目的描述 |
+|project.is_public     |bool      |迁移项目是否公开 |
+|project.owner.id     |bool      |迁移项目拥有者id |
+|project.owner.type     |string      |迁移项目拥有者类型 |
+|project.owner.name     |string      |迁移项目拥有者昵称 |
+|project.owner.login     |string      |迁移项目拥有者标识 |
+|project.owner.image_url     |string      |迁移项目拥有者头像 |
+|user.id     |int      |迁移创建者的id |
+|user.type     |string      |迁移创建者的类型 |
+|user.name     |string      |迁移创建者的名称 |
+|user.login     |string      |迁移创建者的标识 |
+|user.image_url     |string      |迁移创建者头像 |
+|owner.id     |int      |迁移接受者的id |
+|owner.type     |string      |迁移接受者的类型 |
+|owner.name     |string      |迁移接受者的名称 |
+|owner.login     |string      |迁移接受者的标识 |
+|owner.image_url     |string      |迁移接受者头像 |
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 86,
+        "identifier": "ceshi_repo1",
+        "name": "测试项目啊1",
+        "description": "二十多",
+        "is_public": true,
+        "owner": {
+            "id": 52,
+            "type": "Organization",
+            "name": "身份卡手动阀",
+            "login": "ceshi1",
+            "image_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "yystopf",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "owner": {
+        "id": 9,
+        "type": "Organization",
+        "name": "测试组织",
+        "login": "ceshi_org",
+        "image_url": "images/avatars/Organization/9?t=1612706073"
+    },
+    "id": 4,
+    "status": "common",
+    "created_at": "2021-04-26 09:54",
+    "time_ago": "1分钟前"
+}
+```

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

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

app/forms/contents/create_form.rb

@@ -1,24 +1,13 @@
 class Contents::CreateForm < BaseForm
-  attr_accessor :filepath, :branch, :new_branch, :content
+  attr_accessor :filepath, :branch, :new_branch
 
   validates :filepath, presence: true
 
   validate :check_branch
 
-  validate :dun_content_check
-
   def check_branch
     raise "branch和new_branch必须存在一个 " if branch.blank? && new_branch.blank?
     # raise "branch和new_branch只能存在一个" if !branch.blank? && !new_branch.blank?
   end
 
-  def dun_content_check
-    if content.present? 
-      check_result = DunCheck::TextCheck.new({title: "", content: content}).call
-      if check_result[:status].to_i == -1
-        raise "内容含有：#{check_result[:extra_params][:infos]}，请修改"
-      end
-    end
-  end
-
 end

app/forms/issues/create_form.rb

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

app/forms/issues/update_form.rb

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

app/forms/organizations/create_form.rb

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

app/forms/organizations/create_team_form.rb

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

app/forms/projects/create_form.rb

@@ -2,11 +2,15 @@ class Projects::CreateForm < BaseForm
   REPOSITORY_NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
   attr_accessor :user_id, :name, :description, :repository_name, :project_category_id,
                 :project_language_id, :ignore_id, :license_id, :private, :owner
-
+  
   validates :user_id, :name, :description,:repository_name,
             :project_category_id, :project_language_id, presence: true
   validates :repository_name, format: { with: REPOSITORY_NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
 
+  validates :name, length: { maximum: 50 }
+  validates :repository_name, length: { maximum: 100 }
+  validates :description, length: { maximum: 200 }
+
   validate :check_ignore, :check_license, :check_owner, :check_max_repo_creation
   validate do
     check_project_category(project_category_id)

app/forms/projects/update_form.rb

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

app/forms/users/login_form.rb

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

app/forms/users/update_info_form.rb

@@ -0,0 +1,9 @@
+class Users::UpdateInfoForm
+  include ActiveModel::Model
+
+  attr_accessor :email, :password, :login
+
+  validates :email, presence: true, format: { with: CustomRegexp::EMAIL }
+  validates :password, presence: true
+  validates :login, presence: true
+end

app/helpers/admins/faqs_helper.rb

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

app/helpers/admins/projects_helper.rb

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

app/helpers/application_helper.rb

@@ -35,12 +35,6 @@ module ApplicationHelper
     course.course_modules.find_by(module_type: "graduation").try(:id)
   end
 
-  # 是否关注
-  # from_user_id为被关注的用户
-  def follow?(from_user_id, user_id)
-    Watcher.where(watchable_type: 'Principal', watchable_id: from_user_id, user_id: user_id).exists?
-  end
-
   # git用户
   # git用户命名规则：login+"@educoder.net"
   def git_username(email)
@@ -144,17 +138,12 @@ module ApplicationHelper
     if File.exist?(disk_filename(source&.class, source&.id))
       ctime = File.ctime(disk_filename(source.class, source.id)).to_i
       if %w(User Organization).include?(source.class.to_s)
-        File.join(relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+        File.join("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
       else
         File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
       end
     elsif source.class.to_s == 'User'
-      str = source.user_extension.try(:gender).to_i == 0 ? "boy.jpg" : "girl.jpg"
-      File.join(relative_path, "#{source.class}", str)
-    elsif source.class.to_s == 'Subject'
-      File.join("images","educoder", "index", "subject", "subject#{rand(17)}.jpg")
-    elsif source.class.to_s == 'Shixun'
-      File.join("images","educoder", "index", "shixun", "shixun#{rand(23)}.jpg")
+      source.get_letter_avatar_url
     end
   end
 
@@ -449,4 +438,14 @@ module ApplicationHelper
     return nil if str.blank?
     Base64.decode64 str
   end
+
+  def render_admin_statistics_item
+    url = Rails.application.config_for(:configuration)["admin_statistics_url"]
+
+    return if url.blank?
+    content_tag(:li) do
+      sidebar_item(url, "数据统计", icon: 'bar-chart', controller: 'root')
+    end
+  end
+  
 end

app/helpers/helps/faqs_helper.rb

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

app/helpers/projects_helper.rb

@@ -1,4 +1,9 @@
 module ProjectsHelper
+  def menu_hash_by_name(name)
+    {
+      menu_name: name
+    }
+  end
 
   def render_zh_project_type(project_type)
     case project_type
@@ -29,15 +34,14 @@ module ProjectsHelper
   end
 
   def json_response(project, user)
-    # repo = project.repository
-    repo = Repository.includes(:mirror).select(:id, :mirror_url).find_by(project: project)
+    repo = Repository.includes(:mirror).select(:id, :mirror_url, :source_clone_url).find_by(project: project)
 
     tmp_json = {}
     unless project.common?
       tmp_json = tmp_json.merge({
         mirror_status: repo.mirror_status,
         mirror_num: repo.mirror_num,
-        mirror_url: repo.mirror_url,
+        mirror_url: repo.remote_mirror_url,
         first_sync: repo.first_sync?
       })
     end
@@ -50,10 +54,7 @@ module ProjectsHelper
       repo_id: repo.id,
       open_devops: (user.blank? || user.is_a?(AnonymousUser)) ? false : project.open_devops?,
       type: project.numerical_for_project_type,
-      author: render_owner(project),
-      is_secret: project.is_secret,
-      is_member: project.member?(user.id),
-      user_apply_signatures: project.apply_signatures.with_user_id(user.id).collect{|s| {id: s.id, status: s.status}}
+      author: render_owner(project)
     }).compact
 
     render json: tmp_json
@@ -88,8 +89,4 @@ module ProjectsHelper
   def render_educoder_avatar_url(project_educoder)
     [Rails.application.config_for(:configuration)['educoder']['cdn_url'], project_educoder&.image_url].join('/')
   end
-
-  def render_avatar_url(owner)
-    ['images', url_to_avatar(owner)].join('/')
-  end
 end

app/helpers/repositories_helper.rb

@@ -1,7 +1,6 @@
 module RepositoriesHelper
   def render_permission(user, project)
     return "Admin" if user&.admin?
-    return "Owner" if user === project.owner
     project.get_premission(user)
   end
 
@@ -28,39 +27,43 @@ 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)
     return nil if str.blank?
-    content = Base64.decode64(str).force_encoding('UTF-8')
+    begin
+      content = Base64.decode64(str).force_encoding('UTF-8')
 
-    c_regex = /\!\[.*?\]\((.*?)\)/
-    src_regex = /src=\"(.*?)\"/
-    ss = content.to_s.scan(c_regex)
-    ss_src = content.to_s.scan(src_regex)
-    total_images = ss + ss_src
-    if total_images.length > 0
-      total_images.each do |s|
-        image_title = /\"(.*?)\"/
-        r_content = s[0]
-        remove_title = r_content.to_s.scan(image_title)
-        if remove_title.length > 0
-          r_content = r_content.gsub(/#{remove_title[0]}/, "").strip
+      c_regex = /\!\[.*?\]\((.*?)\)/
+      src_regex = /src=\"(.*?)\"/
+      ss = content.to_s.scan(c_regex)
+      ss_src = content.to_s.scan(src_regex)
+      total_images = ss + ss_src
+      if total_images.length > 0
+        total_images.each do |s|
+          image_title = /\"(.*?)\"/
+          r_content = s[0]
+          remove_title = r_content.to_s.scan(image_title)
+          if remove_title.length > 0
+            r_content = r_content.gsub(/#{remove_title[0]}/, "").strip
+          end
+          if r_content.include?("?")
+            new_r_content = r_content + "&raw=true"
+          else
+            new_r_content = r_content + "?raw=true"
+          end
+          unless r_content.include?("http://") || r_content.include?("https://") || r_content.include?("mailto:")
+            new_r_content = "#{path}" + new_r_content
+          end
+          content = content.gsub(/#{r_content}/, new_r_content)
         end
-        if r_content.include?("?")
-          new_r_content = r_content + "&raw=true"
-        else
-          new_r_content = r_content + "?raw=true"
-        end
-        unless r_content.include?("http://") || r_content.include?("https://") || r_content.include?("mailto:")
-          new_r_content = "#{path}" + new_r_content
-        end
-        content = content.gsub(/#{r_content}/, new_r_content)
       end
+  
+      return content
+    rescue
+      return str
     end
-
-    return content
   end
 
   # unix_time values for example: 1604382982

app/helpers/tag_chosen_helper.rb

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

app/interactors/gitea/create_file_interactor.rb

@@ -48,8 +48,7 @@ module Gitea
       {
         filepath: @params[:filepath],
         branch: @params[:branch],
-        new_branch: @params[:new_branch],
-        content: @params[:content]
+        new_branch: @params[:new_branch]
       }
     end
 

app/interactors/projects/add_member_interactor.rb

@@ -1,19 +1,18 @@
 module Projects
   class AddMemberInteractor
-    def self.call(owner, project, collaborator, permission="write", is_apply_signature=false)
-      interactor = new(owner, project, collaborator, permission, is_apply_signature)
+    def self.call(owner, project, collaborator, permission="write")
+      interactor = new(owner, project, collaborator, permission)
       interactor.run
       interactor
     end
 
     attr_reader :error, :result
 
-    def initialize(owner, project, collaborator, permission, is_apply_signature)
-      @owner              = owner
-      @project            = project
-      @collaborator       = collaborator
-      @permission         = permission
-      @is_apply_signature = is_apply_signature
+    def initialize(owner, project, collaborator, permission)
+      @owner        = owner
+      @project      = project
+      @collaborator = collaborator
+      @permission   = permission
     end
 
     def success?
@@ -24,7 +23,7 @@ module Projects
       ActiveRecord::Base.transaction do
         gitea_result = Gitea::Repository::Members::AddService.new(owner, project.identifier, collaborator.login, permission).call
         if gitea_result.status == 204
-          project.add_member!(collaborator.id, set_member_role, is_apply_signature)
+          project.add_member!(collaborator.id, role_name)
         end
         fail!(nil)
       end
@@ -33,19 +32,25 @@ module Projects
     end
 
     private
-    attr_reader :owner, :project, :collaborator, :permission, :is_apply_signature
+    attr_reader :owner, :project, :collaborator, :permission
 
     def fail!(error)
       @error = error
     end
 
-    def set_member_role
-      @role ||=
-        case @permission
-        when "write" then "Developer"
-        when "read" then "Reporter"
-        else "Developer"
-        end
+    def role_name
+      case permission 
+      when 'read'
+        'Reporter'
+      when 'write'
+        'Developer'
+      when 'admin'
+        'Manager'
+      when 'owner'
+        'Manager'
+      else 
+        'Reporter'
+      end
     end
 
   end

app/jobs/reset_platform_cache_job.rb

@@ -0,0 +1,14 @@
+class ResetPlatformCacheJob < ApplicationJob
+  queue_as :cache
+
+  def perform
+    Cache::PlatformFollowCountService.new.reset
+    Cache::PlatformIssueCountService.new.reset 
+    Cache::PlatformProjectCountService.new.reset 
+    Cache::PlatformProjectForkCountService.new.reset 
+    Cache::PlatformProjectLanguagesCountService.new.reset
+    Cache::PlatformProjectPraisesCountService.new.reset 
+    Cache::PlatformProjectWatchersCountService.new.reset
+    Cache::PlatformPullrequestCountService.new.reset
+  end
+end

app/jobs/reset_user_cache_job.rb

@@ -0,0 +1,14 @@
+class ResetUserCacheJob < ApplicationJob
+  queue_as :cache
+
+  def perform(user)
+    Cache::UserFollowCountService.new(user).reset
+    Cache::UserIssueCountService.new(user).reset 
+    Cache::UserProjectCountService.new(user).reset 
+    Cache::UserProjectForkCountService.new(user).reset 
+    Cache::UserProjectLanguagesCountService.new(user).reset
+    Cache::UserProjectPraisesCountService.new(user).reset 
+    Cache::UserProjectWatchersCountService.new(user).reset
+    Cache::UserPullrequestCountService.new(user).reset
+  end
+end

app/jobs/send_join_project_applied_message_job.rb

@@ -0,0 +1,27 @@
+class SendJoinProjectAppliedMessageJob < ApplicationJob
+  queue_as :default
+
+  def perform(applied_project, applied_user, message_status)
+    project = applied_project.project 
+    return unless project.present?
+    return unless applied_user.present?
+    return unless applied_project.user.present?
+    AppliedMessage.find_or_create_by!(user_id: applied_project.user_id,
+      applied: applied_project,
+      status: message_status,
+      name: build_name(project.name, message_status),
+      applied_user_id: applied_user.id,
+      project_id: project.id)
+  end
+
+  private 
+  def build_name(repo_name, message_status, applied_name="")
+    case message_status
+    when 'successed'
+      return "已通过你加入【#{repo_name}】仓库的申请。"
+    when 'failure'
+      return "已拒绝你加入【#{repo_name}】仓库的申请。"
+    end
+    ""
+  end
+end

app/jobs/send_transfer_project_applied_message_job.rb

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

app/jobs/sync_forge_project_job.rb

@@ -1,48 +0,0 @@
-class SyncForgeProjectJob < ApplicationJob
-  queue_as :default
-
-  def perform(sync_parmas)
-    # sync_parmas.permit!
-    Rails.logger.info("=======begin to sync forge projects, and sync_parmas: #{sync_parmas}")
-    get_rand_user = rand_user
-    project_params = sync_parmas[:project]
-    repository_params = sync_parmas[:repository]
-    project_socre_params = sync_parmas[:project_socre]
-    begin
-      unless Project.select(:identifier).exists?(identifier: project_params[:identifier])
-        project_params = project_params.merge({user_id: get_rand_user.id })
-        project = Project.new(project_params)
-        if project.save 
-          repository_params = {
-            hidden: false,
-            identifier: repository_params[:identifier],
-            mirror_url: repository_params[:url].to_s.gsub("https://gitea.", "https://git."),
-            user_id: get_rand_user.id,
-            login: get_rand_user.login,
-            password: "",
-            is_mirror: false
-          }
-          Repositories::MigrateService.new(get_rand_user, project, repository_params).call
-          project_score = ProjectScore.new(project_socre_params.merge({project_id: project.id}))
-          project_score.save
-        end
-      end
-      Rails.logger.info("=======end to sync forge projects")
-    rescue => e
-      Rails.logger.info("=======sync forge projects has errors: #{e}")
-      raise ActiveRecord::Rollback
-    end
-  end
-
-  private 
-
-  def rand_user 
-    user_ids = User.select(:id, :type, :gitea_token, :gitea_uid).where("gitea_token is not null and gitea_uid is not null and type = ?", "User").pluck(:id)
-    range_user_id = user_ids[rand(user_ids.length-1)]
-    rand_sync_user = User.find_by_id(range_user_id)  #生成随机用户
-    unless rand_sync_user.present?
-      rand_user
-    end
-    rand_sync_user
-  end
-end

app/jobs/sync_mirrored_repository_job.rb

@@ -5,7 +5,27 @@ class SyncMirroredRepositoryJob < ApplicationJob
     repo = Repository.find_by(id: repo_id)
     current_user = User.find_by(id: user_id)
     return if repo.blank? || current_user.blank?
-    result = Gitea::Repository::SyncMirroredService.new(repo.user.login, repo.identifier, token: current_user.gitea_token).call
-    repo&.mirror&.set_status! if result[:status] == 200 && repo.mirror.present?
+
+    # TODO
+    # 先同步镜像库
+    if repo.config_accelerator?
+      puts "[gitea-accelerator]: ###### 镜像库开始同步 ######"
+      result = Gitea::Accelerator::SyncMirroredService.call(repo.identifier)
+      puts "[gitea-accelerator]: ###### 镜像库同步状态为 #{result[:status]}"
+
+      # TODO 暂时解决从镜像库镜像动作时间先执行的问题
+      # 避免了Gitea::Repository::SyncMirroredService先执行后，加速器Gitea::Accelerator::SyncMirroredService
+      # 再执行的导致Gitea::Repository::SyncMirroredService执行镜像不是最新代码的问题
+      sleep 3.seconds
+    end
+
+    sync_common!(repo, current_user)
   end
+
+  def sync_common!(repo, user)
+    result = Gitea::Repository::SyncMirroredService.call(repo.owner.login,
+      repo.identifier, token: user.gitea_token)
+    repo&.mirror.set_status! if result[:status] === 200
+  end
+
 end

app/jobs/sync_phenglei_user_job.rb

@@ -1,36 +0,0 @@
-class SyncPhengleiUserJob < ApplicationJob
-  queue_as :default
-
-  def perform(project_id=nil)
-    project_id ||= EduSetting.get("sync_phenglei_user_project")
-    project = Project.find_by_id(project_id)
-    return if project.nil?
-    member_count, success_count, error_count, not_exsit_count = 0, 0, 0, 0
-    Rails.logger.info("======begin to sync phenglei user to project#{project.owner.login + "/" + project.identifier}")
-    PhengleiUser.find_each do |i|
-      puts "======开始处理#{i.phone}"
-      user = User.find_by(phone: i.phone)
-      if user.present?
-        if project.member?(user.id)
-          puts "======#{i.phone}用户已经是外围贡献者了"
-          member_count += 1
-        else
-          interactor = Projects::AddMemberInteractor.call(project.owner, project, user, "read", true)
-          if interactor.error.nil?
-            puts "========用户#{i.phone}成功添加为项目的外围贡献者======="
-            success_count += 1
-          else
-            puts "========用户#{i.phone}添加失败"
-            error_count += 1
-          end
-        end
-      else
-        puts "=====#{i.phone}用户不存在"
-        not_exsit_count += 1
-        next
-      end
-    end
-    Rails.logger.info("======已存在外围贡献者数量#{member_count}, 成功添加用户数量#{success_count}, 添加失败用户数量#{error_count}, 找不到用户数量#{not_exsit_count}")
-    Rails.logger.info("======end to sync phenglei user to project#{project.owner.login + "/" + project.identifier}")
-  end
-end

app/libs/ci/drone/api.rb

@@ -85,4 +85,24 @@ class Ci::Drone::API < Ci::Drone::Request
     post(endpoint, "/api/users", {login: options[:login], email: options[:email], avatar_url:options[:avatar_url],active:true, drone_token: options[:token]})
   end
 
+  # Creates a secret.
+  def create_secret
+    post(endpoint, "/api/repos/#{owner}/#{repo}/secrets", {name: options[:name], data: options[:data], pull_request:true, drone_token: drone_token})
+  end
+
+  # Update a secret.
+  def update_secret
+    patch(endpoint, "/api/repos/#{owner}/#{repo}/secrets/#{options[:name]}", { data: options[:data], pull_request:true, drone_token: drone_token})
+  end
+
+  # list of secrets.
+  def secrets
+    get(endpoint, "/api/repos/#{owner}/#{repo}/secrets", drone_token: drone_token)
+  end
+
+  # delete secret.
+  def delete_secret
+    delete(endpoint, "/api/repos/#{owner}/#{repo}/secrets/#{options[:name]}", drone_token: drone_token)
+  end
+
 end

app/libs/dun_check/image_check.rb

@@ -1,167 +0,0 @@
-class DunCheck::ImageCheck
-    
-  #检测结果，0：通过，1：嫌疑，2：不通过
-  # include ActionView::Helpers::LoopTextsHelper
-
-  require 'uri'
-  require 'net/http'
-  
-  def initialize(image_params)                                                                                                                                      
-    @image_params = image_params 
-  end 
-
-  def call
-    begin
-      Rails.logger.info("==========@image_params===========#{@image_params}")
-      dun_params = check_dun_params(@image_params)
-      
-      api_url = EduSetting.get("dun_image_api")
-
-      uri = URI.parse(api_url)
-
-      http = Net::HTTP.new(uri.hostname, uri.port)
-      if api_url.include?("https://")
-        http.use_ssl = true
-      end
-      dun_params_str = URI.encode_www_form(dun_params)
-     
-      header = {'content-type':'application/x-www-form-urlencoded'}
-      response = http.post(uri.path, dun_params_str, header)
-      
-      response_body = JSON.parse(response.body)
-      if response_body["code"].to_i == 200 
-        response_body_result = response_body["antispam"]
-        response_lables = response_body_result[0]["labels"]
-        return_sub_lable = ""
-        if response_lables.present?
-          return_sub_lable = get_sub_labels(response_lables)
-        end
-        render_status = response_body_result[0]["action"].to_i == 0 ? 1 : -1
-        tip_status(render_status, return_sub_lable.present? ? "图片含有: #{return_sub_lable}" : response_body["msg"] )
-      else
-        tip_status(-1, response_body["msg"])
-      end
-    rescue Exception => ex
-      Rails.logger.info "*** transaction abored!"
-      Rails.logger.info "*** errors: #{ex.message}"
-      tip_status(-1, "检测失败")
-    end
-
-  end
-
-  private
-
-  def check_dun_params(image_params)
-    
-    dun_public_params = DunCheck::PublicParams.new("image")
-    check_params = {
-      version: "v4",
-      images: image_params.to_json
-    }
-    check_params.merge!(dun_public_params.call)
-    dun_params = dun_public_params.generate_sign(check_params)
-    
-    return dun_params
-  end
-
-  def tip_status(status, message, msg_params={})
-    return {status: status, message: message, extra_params: msg_params}
-  end
-
-  def get_sub_labels(labels)
-    _sub_labels = []
-    labels.each do |label|
-      error_label = label["subLabels"].present? ? label["subLabels"][0]["subLabel"] : ""
-      if error_label.present?
-        _sub_labels.push(sub_lables[:"#{error_label.to_s}"])
-      end
-    end
-    return _sub_labels.present? ? _sub_labels.join(",") : ""
-  end
-
-  def sub_lables
-    {
-      "10000": "色情",
-      "10001": "女下体",
-      "10002": "女胸",
-      "10003": "男下体",
-      "10004": "性行为",
-      "10005": "臀部",
-      "10006": "口交",
-      "10007": "卡通色情",
-      "10008": "色情人物",
-      "10009": "儿童色情",
-      "11000": "性感低俗",
-      "11001": "亲吻",
-      "11002": "腿部特写",
-      "11003": "非漏点赤膊",
-      "11004": "胸部",
-      "100001": "色情文字-色情其他",
-      "100002":	"色情文字-色情传播",
-      "100003":	"色情文字-色情性器官",
-      "100004":	"色情文字-色情挑逗",
-      "100005":	"色情文字-色情低俗段子",
-      "100006":	"色情文字-色情性行为",
-      "100007":	"色情文字-色情舆情事件",
-      "100008":	"色情文字-色情交友类",
-      "20000":	"广告",
-      "20001":	"广告带文字",
-      "200009":	"广告文字-商业推广",
-      "200010":	"广告文字-广告法",
-      "200011":	"刷量行为",
-      "200012":	"广告其他",
-      "260052":	"广告文字-广告法-涉医疗用语",
-      "260053":	"广告文字-广告法-迷信用语",
-      "260054":	"广告文字-广告法-需要凭证",
-      "260055":	"广告文字-广告法-限时性用语",
-      "260056":	"广告文字-广告法-涉嫌诱导消费者",
-      "260057":	"广告文字-广告法-涉嫌欺诈消费者",
-      "260058":	"广告文字-广告法-法律风险较高",
-      "260059":	"广告文字-广告法-极限词",
-      "21000":	"二维码",
-      "30000":	"暴恐",
-      "30001":	"暴恐图集",
-      "30002":	"暴恐旗帜",
-      "30003":	"暴恐人物",
-      "30004":	"暴恐标识",
-      "30005":	"暴恐场景",
-      "300016":	"暴恐文字-暴恐其他",
-      "40000":	"违禁",
-      "40001":	"违禁图集",
-      "40002":	"违禁品",
-      "40003":	"特殊标识",
-      "40004":	"血腥模型",
-      "40005":	"公职服饰",
-      "40006":	"不文明",
-      "40007":	"违禁人物",
-      "40008":	"违禁场景",
-      "40009":	"火焰",
-      "40010":	"骷髅",
-      "40011":	"货币",
-      "40012":	"毒品",
-      "400017":	"违禁文字-违禁其他",
-      "600018":	"违禁文字-谩骂其他",
-      "50000":	"涉政",
-      "50001":	"涉政图集",
-      "50002":	"中国地图",
-      "50003":	"涉政人物",
-      "50004":	"涉政旗帜",
-      "50005":	"涉政标识",
-      "50006":	"涉政场景",
-      "500013":	"涉政文字-涉政其他",
-      "500014":	"涉政文字-敏感专项",
-      "500015":	"涉政文字-严格涉政",
-      "500039":	"涉政文字-时事报道",
-      "500040":	"涉政文字-领导人相关",
-      "500041":	"涉政文字-英雄烈士相关",
-      "500042":	"涉政文字-邪教迷信",
-      "500043":	"涉政文字-落马官员相关",
-      "500044":	"涉政文字-热点舆情",
-      "500045":	"涉政文字-涉政综合",
-      "90000":	"其他",
-      "90002":	"自定义用户名单",
-      "90003":	"自定义IP名单",
-      "900020":	"文字违规-其他"
-    }
-  end
-end

app/libs/dun_check/public_params.rb

@@ -1,31 +0,0 @@
-class DunCheck::PublicParams
-  def initialize(type)                                                                                                                                      
-    @type = type 
-  end 
-
-  def call
-   
-    public_params = {
-      secretId: EduSetting.get("dun_secret_id"), 
-      businessId: EduSetting.get("dun_#{@type}_businessId"),
-      timestamp: DateTime.current.strftime('%Q').to_i,
-      nonce: rand(10 ** 11).to_i
-    }
-    return public_params
-  end
-
-  def generate_sign(params)
-    secretkey = EduSetting.get("dun_secrect_key")
-    sort_params = params.sort.to_h 
-    sign_str = ""
-    sort_params.each do |k,v|
-      sign_str += "#{k.to_s}#{v.to_s}"
-    end
-    sign_str += secretkey
-    md5_sign = Digest::MD5.hexdigest(sign_str.to_s.force_encoding("UTF-8"))
-    return sort_params.merge!(signature: md5_sign)
-  end
-
-end
-
-