资助激励功能

fix structure.sql
merge integrated_blockchain
2021-04-08 18:53:19 +08:00 · 2021-04-08 18:41:31 +08:00 · 2021-04-08 16:19:27 +08:00 · 2021-04-08 16:05:40 +08:00 · 2021-04-07 11:35:09 +08:00 · 2021-04-02 18:58:08 +08:00
381 changed files with 3303 additions and 9733 deletions
--- a/.gitignore
+++ b/.gitignore
@ -36,7 +36,6 @@ public/react/yarn.lock
 /.idea/*

 # Ignore react node_modules
-public/system/*
 public/react/*
 /public/react/.cache
 /public/react/node_modules/
@ -83,5 +82,4 @@ docker/
 educoder.sql
 redis_data/
 Dockerfile
-dump.rdb
-.tags*
+dump.rdb
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,76 +1,4 @@
 # 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

--- a/5
+++ b/5
@ -100,6 +100,7 @@ gem 'rails-i18n', '~> 5.1'
 # job
 gem 'sidekiq'
 gem 'sinatra'
+gem 'whenever'
 gem "sidekiq-cron", "~> 1.1"

 # batch insert
@ -127,4 +128,6 @@ gem 'harmonious_dictionary', '~> 0.0.1'

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

-gem 'letter_avatar'
+# log
+gem 'multi_logger'
+
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -98,6 +98,7 @@ GEM
    chromedriver-helper (2.1.1)
      archive-zip (~> 0.10)
      nokogiri (~> 1.8)
+    chronic (0.10.2)
    chunky_png (1.3.11)
    concurrent-ruby (1.1.6)
    connection_pool (2.2.2)
@ -162,7 +163,6 @@ GEM
      activerecord
      kaminari-core (= 1.2.0)
    kaminari-core (1.2.0)
-    letter_avatar (0.3.8)
    listen (3.1.5)
      rb-fsevent (~> 0.9, >= 0.9.4)
      rb-inotify (~> 0.9, >= 0.9.7)
@ -176,14 +176,14 @@ GEM
      mimemagic (~> 0.3.2)
    maruku (0.7.3)
    method_source (0.9.2)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
+    mimemagic (0.3.4)
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
    minitest (5.14.0)
    msgpack (1.3.3)
    multi_json (1.14.1)
+    multi_logger (0.2.0)
+      railties
    multi_xml (0.6.0)
    multipart-post (2.1.1)
    mustermann (1.1.1)
@ -423,6 +423,8 @@ GEM
    websocket-driver (0.7.1)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.4)
+    whenever (1.0.0)
+      chronic (>= 0.6.3)
    wkhtmltopdf-binary (0.12.5.4)
    xpath (3.2.0)
      nokogiri (~> 1.8)
@ -459,8 +461,8 @@ DEPENDENCIES
  jbuilder (~> 2.5)
  jquery-rails
  kaminari (~> 1.1, >= 1.1.1)
-  letter_avatar
  listen (>= 3.0.5, < 3.2)
+  multi_logger
  mysql2 (>= 0.4.4, < 0.6.0)
  oauth2
  omniauth (~> 1.9.0)
@ -502,6 +504,7 @@ DEPENDENCIES
  tzinfo-data
  uglifier (>= 1.3.0)
  web-console (>= 3.3.0)
+  whenever
  wkhtmltopdf-binary

 BUNDLED WITH
--- a/137
+++ b/137
@ -1,124 +1,21 @@
-木兰宽松许可证， 第2版
+MIT License

-2020年1月 http://license.coscl.org.cn/MulanPSL2
+Copyright (c) [year] [fullname]

-您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
+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:

-0.   定义
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of 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.
+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.
--- a/README.md
+++ b/README.md
@ -21,7 +21,7 @@ Trustie （确实）是一个以大众化协同开发、开放式资源共享、

 * Redis 5+

-* imagemagick
+* NodeJS > 13.0.0

 ### Steps

@ -65,7 +65,7 @@ default: &default

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

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

@ -80,64 +80,60 @@ gitea:
 #### 6. 安装redis环境
 **请自行搜索各平台如何安装部署redis环境**

-#### 7. 安装imagemagick插件
- Mac OS X
-```bash
- brew install imagemagick ghostscript
-```

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

-#### 9. 导入数据表结构
+#### 8. 导入数据表结构

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

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

-#### 11. clone前端代码
+#### 10. clone前端代码
 **将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
 ```bash
 git clone -b standalone https://git.trustie.net/jasder/build.git
 ```

-#### 12. 启动redis(此处已mac系统为例)
+#### 11. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```

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

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

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

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

 ## 页面展示
--- a/app/assets/javascripts/admins/faqs.js
+++ b/app/assets/javascripts/admins/faqs.js
--- a/app/assets/javascripts/sponsor_tiers.js
+++ b/app/assets/javascripts/sponsor_tiers.js
--- a/app/assets/javascripts/sponsorships.js
+++ b/app/assets/javascripts/sponsorships.js
@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
--- a/app/assets/javascripts/wallets.js
+++ b/app/assets/javascripts/wallets.js
@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
--- a/app/assets/stylesheets/helps/faqs.scss
+++ b/app/assets/stylesheets/helps/faqs.scss
@ -1,3 +1,3 @@
-// Place all the styles related to the helps/faqs controller here.
+// Place all the styles related to the log controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/assets/stylesheets/scaffolds.scss
+++ b/app/assets/stylesheets/scaffolds.scss
@ -0,0 +1,84 @@
+body {
+  background-color: #fff;
+  color: #333;
+  margin: 33px;
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a {
+  color: #000;
+
+  &:visited {
+    color: #666;
+  }
+
+  &:hover {
+    color: #fff;
+    background-color: #000;
+  }
+}
+
+th {
+  padding-bottom: 5px;
+}
+
+td {
+  padding: 0 5px 7px;
+}
+
+div {
+  &.field, &.actions {
+    margin-bottom: 10px;
+  }
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px 7px 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px -7px 0;
+    background-color: #c00;
+    color: #fff;
+  }
+
+  ul li {
+    font-size: 12px;
+    list-style: square;
+  }
+}
+
+label {
+  display: block;
+}
--- a/app/assets/stylesheets/sponsor_tiers.scss
+++ b/app/assets/stylesheets/sponsor_tiers.scss
@ -0,0 +1,3 @@
+// Place all the styles related to the SponsorTiers controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/assets/stylesheets/sponsorships.scss
+++ b/app/assets/stylesheets/sponsorships.scss
@ -0,0 +1,3 @@
+// Place all the styles related to the Sponsorships controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/assets/stylesheets/admins/faqs.scss
+++ b/app/assets/stylesheets/admins/faqs.scss
@ -1,3 +1,3 @@
-// Place all the styles related to the admins/faqs controller here.
+// Place all the styles related to the Wallets controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -169,7 +169,6 @@ 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?
@ -196,25 +195,6 @@ 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
@ -254,6 +234,7 @@ class AccountsController < ApplicationController

    set_autologin_cookie(user)
    UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id), :ip => request.remote_ip)
+    # user.daily_reward
    user.update_column(:last_login_on, Time.now)
    session[:"#{default_yun_session}"] = user.id
    Rails.logger.info("#########_____session_default_yun_session__________###############{default_yun_session}")
@ -365,7 +346,4 @@ class AccountsController < ApplicationController
    params.require(:user).permit(:login, :email, :phone)
  end

-  def account_params 
-    params.require(:account).permit(:login, :password)
-  end
 end
--- a/app/controllers/admins/auth_schools_controller.rb
+++ b/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 ? OR nickname like ?", "%#{params[:name].strip.to_s}%",  "%#{params[:name].strip.to_s}%").limit(10)
+    @users = User.where.not(id: user_ids).where("concat(lastname, firstname) like ?", "%#{params[:name].strip.to_s}%").limit(10)
  end

  # 添加认证学校管理员
--- a/app/controllers/admins/faqs_controller.rb
+++ b/app/controllers/admins/faqs_controller.rb
@ -1,58 +0,0 @@
-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
--- a/app/controllers/admins/laboratories_controller.rb
+++ b/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 '\
-                 'users.nickname LIKE :keyword OR mirror_repositories.name 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 OR users.nickname LIKE :keyword'
+      like_sql = 'subjects.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword'
      subjects = subjects.joins(:user).where(like_sql, keyword: "%#{keyword}%")
    end

--- a/app/controllers/admins/project_categories_controller.rb
+++ b/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 = 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'
+    sort_by = params[:sort_by] ||= 'created_at'
+    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)
--- a/app/controllers/admins/project_ignores_controller.rb
+++ b/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 = 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'
+    sort_by = params[:sort_by] ||= 'created_at'
+    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)
--- a/app/controllers/admins/project_languages_controller.rb
+++ b/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 = 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'
+    sort_by = params[:sort_by] ||= 'created_at'
+    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)
--- a/app/controllers/admins/project_licenses_controller.rb
+++ b/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 = 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'
+    sort_by = params[:sort_by] ||= 'created_at'
+    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)
--- a/app/controllers/admins/projects_controller.rb
+++ b/app/controllers/admins/projects_controller.rb
@ -1,8 +1,9 @@
 class Admins::ProjectsController < Admins::BaseController

  def index
-    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'
+    sort_by = params[:sort_by] ||= 'created_on'
+    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)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -1,6 +1,7 @@
 require 'oauth2'

 class ApplicationController < ActionController::Base
+
 	include CodeExample
 	include RenderExpand
 	include RenderHelper
@ -10,12 +11,14 @@ class ApplicationController < ActionController::Base
 	include LoggerHelper
 	include LoginHelper
 	include RegisterHelper
+	include UpdateHelper

 	protect_from_forgery prepend: true, unless: -> { request.format.json? }

 	before_action :check_sign
 	before_action :user_setup
 	#before_action :check_account
+  after_action :user_trace_log

 	# TODO
 	# check sql query time
@ -28,7 +31,7 @@ class ApplicationController < ActionController::Base
 	DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
 	OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"

-	helper_method :current_user, :base_url
+	helper_method :current_user

 	# 所有请求必须合法签名
 	def check_sign
@ -329,7 +332,6 @@ class ApplicationController < ActionController::Base
 				User.current = user
 			end
 		end
-
 		# if !User.current.logged? && Rails.env.development?
 		# 	User.current = User.find 1
 		# end
@ -344,7 +346,8 @@ class ApplicationController < ActionController::Base
 				User.current = User.find 8686
 			elsif params[:debug] == 'admin'
 				logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
-				user =  User.find 36480
+				# user =  User.find 36480
+				user = User.find 5
 				User.current = user
 				cookies.signed[:user_id] = user.id
 			end
@ -367,7 +370,19 @@ class ApplicationController < ActionController::Base
 			# RSS key authentication does not start a session
 			User.find_by_rss_key(params[:key])
 		end
-	end
+  end
+
+  def user_trace_log
+    user = current_user
+    # print("*********************url:", request.url, "****routes", request.request_method)
+    Rails.logger.user_trace.info("{id: #{user.id}, login: #{user.login}, url: #{request.url}, method: #{request.method}, params: #{params}, response_code: #{response.code}, time: #{Time.now}}")
+  end
+
+  def user_trace_update_log(old_value_hash)
+    user = current_user
+    str = "{id: #{user.id}, login: #{user.login}, url: #{request.url}, method: #{request.method}, params: #{params.merge(old_value: old_value_hash)}, response_code: #{response.code}, time: #{Time.now}}"
+    Rails.logger.user_trace.info(str)
+  end

 	def try_to_autologin
 		if cookies[autologin_cookie_name]
@ -393,291 +408,291 @@ class ApplicationController < ActionController::Base
 		respond_to do |format|
      format.json
    end
-	end
+  end

-	## 输出错误信息
-	def error_status(message = nil)
-		@status = -1
-		@message = message
-	end
+  ## 输出错误信息
+  def error_status(message = nil)
+    @status = -1
+    @message = message
+  end

-	# 实训等对应的仓库地址
-	def repo_ip_url(repo_path)
-		"#{edu_setting('git_address_ip')}/#{repo_path}"
-	end
+  # 实训等对应的仓库地址
+  def repo_ip_url(repo_path)
+    "#{edu_setting('git_address_ip')}/#{repo_path}"
+  end

-	def repo_url(repo_path)
-		"#{edu_setting('git_address_domain')}/#{repo_path}"
-	end
+  def repo_url(repo_path)
+    "#{edu_setting('git_address_domain')}/#{repo_path}"
+  end

-	# 通关后，把最后一次成功的代码存到数据库
-	# type 0 创始内容， 1 最新内容
-	# def game_passed_code(path, myshixun, game_id)
-	# 	# 如果代码窗口是隐藏的，则不用保存代码
-	# 	return if myshixun.shixun.hide_code || myshixun.shixun.vnc
-	# 	file_content = git_fle_content myshixun.repo_path, path
-	# 	#unless file_content.present?
-	# 	#	raise("获取文件代码异常")
-	# 	#end
-	# 	logger.info("#######game_id:#{game_id}, file_content:#{file_content}")
-	# 	game_code = GameCode.where(:game_id => game_id, :path => path).first
-	# 	if game_code.nil?
-	# 		GameCode.create!(:game_id => game_id, :new_code => file_content, :path => path)
-	# 	else
-	# 		game_code.update_attributes!(:new_code => file_content)
-	# 	end
+  # 通关后，把最后一次成功的代码存到数据库
+  # type 0 创始内容， 1 最新内容
+  # def game_passed_code(path, myshixun, game_id)
+  # 	# 如果代码窗口是隐藏的，则不用保存代码
+  # 	return if myshixun.shixun.hide_code || myshixun.shixun.vnc
+  # 	file_content = git_fle_content myshixun.repo_path, path
+  # 	#unless file_content.present?
+  # 	#	raise("获取文件代码异常")
+  # 	#end
+  # 	logger.info("#######game_id:#{game_id}, file_content:#{file_content}")
+  # 	game_code = GameCode.where(:game_id => game_id, :path => path).first
+  # 	if game_code.nil?
+  # 		GameCode.create!(:game_id => game_id, :new_code => file_content, :path => path)
+  # 	else
+  # 		game_code.update_attributes!(:new_code => file_content)
+  # 	end
  # end

-	# Post请求
-	def uri_post(uri, params)
-		begin
-			uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
-			uri = URI.parse(URI.encode(uri.strip))
-			res = Net::HTTP.post_form(uri, params).body
-			uid_logger_dubug("--uri_exec: .....res is #{res}")
-			JSON.parse(res)
-		rescue Exception => e
-			uid_logger_error("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new("实训平台繁忙（繁忙等级：84）")
-		end
-	end
+  # Post请求
+  def uri_post(uri, params)
+    begin
+      uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
+      uri = URI.parse(URI.encode(uri.strip))
+      res = Net::HTTP.post_form(uri, params).body
+      uid_logger_dubug("--uri_exec: .....res is #{res}")
+      JSON.parse(res)
+    rescue Exception => e
+      uid_logger_error("--uri_exec: exception #{e.message}")
+      raise Educoder::TipException.new("实训平台繁忙（繁忙等级：84）")
+    end
+  end

-	#　处理返回非０就报错的请求
-	def interface_post(uri, params, status, message)
-		begin
-			uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
-			uri = URI.parse(URI.encode(uri.strip))
-			res = Net::HTTP.post_form(uri, params).body
-			uid_logger_dubug("--uri_exec: .....res is #{res}")
-			res = JSON.parse(res)
-			if (res && res['code'] != 0)
-				tip_exception(status, message)
-			else
-				res
-			end
-		rescue Exception => e
-			uid_logger("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new(message)
-		end
-	end
+  #　处理返回非０就报错的请求
+  def interface_post(uri, params, status, message)
+    begin
+      uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
+      uri = URI.parse(URI.encode(uri.strip))
+      res = Net::HTTP.post_form(uri, params).body
+      uid_logger_dubug("--uri_exec: .....res is #{res}")
+      res = JSON.parse(res)
+      if (res && res['code'] != 0)
+        tip_exception(status, message)
+      else
+        res
+      end
+    rescue Exception => e
+      uid_logger("--uri_exec: exception #{e.message}")
+      raise Educoder::TipException.new(message)
+    end
+  end

-	# json格式请求
-	def interface_json_post(uri, params, status, message)
-		begin
-			uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
-			uri = URI.parse(URI.encode(uri.strip))
-			res = Net::HTTP.start(uri.host, uri.port) do |http|
-				req = Net::HTTP::Post.new(uri)
-				req['Content-Type'] = 'application/json'
-				req.body = params.to_json
-				http.request(req)
-			end
-			uid_logger_dubug("--uri_exec: .....res is #{res.body}")
-			res = JSON.parse(res.body)
-			if (res && res['code'] != 0)
-				tip_exception(status, message)
-			else
-				res
-			end
-		rescue Exception => e
-			uid_logger("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new("服务器繁忙")
-		end
-	end
+  # json格式请求
+  def interface_json_post(uri, params, status, message)
+    begin
+      uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
+      uri = URI.parse(URI.encode(uri.strip))
+      res = Net::HTTP.start(uri.host, uri.port) do |http|
+        req = Net::HTTP::Post.new(uri)
+        req['Content-Type'] = 'application/json'
+        req.body = params.to_json
+        http.request(req)
+      end
+      uid_logger_dubug("--uri_exec: .....res is #{res.body}")
+      res = JSON.parse(res.body)
+      if (res && res['code'] != 0)
+        tip_exception(status, message)
+      else
+        res
+      end
+    rescue Exception => e
+      uid_logger("--uri_exec: exception #{e.message}")
+      raise Educoder::TipException.new("服务器繁忙")
+    end
+  end


-	# 适用与已经用url_safe编码后，回调字符串形式
-	def tran_base64_decode64(str)
-		s_size = str.size % 4
-		if s_size != 0
-			str += "=" * (4 - s_size)
-		end
-		if str.blank?
-			str
-		else
-			Base64.decode64(str.tr("-_", "+/")).force_encoding("utf-8")
-		end
-	end
+  # 适用与已经用url_safe编码后，回调字符串形式
+  def tran_base64_decode64(str)
+    s_size = str.size % 4
+    if s_size != 0
+      str += "=" * (4 - s_size)
+    end
+    if str.blank?
+      str
+    else
+      Base64.decode64(str.tr("-_", "+/")).force_encoding("utf-8")
+    end
+  end

-	def sucess_status(message = 'success')
-		render :json => { status: 1, message: message }
-	end
+  def sucess_status(message = 'success')
+    render :json => { status: 1, message: message }
+  end

-	# 随机生成字符
-	def generate_identifier(container, num, pre='')
-		code = DCODES.sample(num).join
-		if container == User
-			while container.exists?(login: pre+code) do
-				code = DCODES.sample(num).join
-			end
-		else
-			while container.exists?(identifier: code) do
-				code = DCODES.sample(num).join
-			end
-		end
-		code
-	end
+  # 随机生成字符
+  def generate_identifier(container, num, pre='')
+    code = DCODES.sample(num).join
+    if container == User
+      while container.exists?(login: pre+code) do
+        code = DCODES.sample(num).join
+      end
+    else
+      while container.exists?(identifier: code) do
+        code = DCODES.sample(num).join
+      end
+    end
+    code
+  end


-	# 实训主类别列表，自带描述
-	def shixun_main_type
-		list = []
-		mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_main_mirror
-		mirrors.try(:each) do |mirror|
-			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description), mirror_name: mirror.name}
-		end
-		list
-	end
+  # 实训主类别列表，自带描述
+  def shixun_main_type
+    list = []
+    mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_main_mirror
+    mirrors.try(:each) do |mirror|
+      list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description), mirror_name: mirror.name}
+    end
+    list
+  end

-	# 小类别列表
-	def shixun_small_type
-		list = []
-		mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_small_mirror
-		mirrors.try(:each) do |mirror|
-			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description, mirror_name: mirror.name}
-		end
-		list
-	end
+  # 小类别列表
+  def shixun_small_type
+    list = []
+    mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_small_mirror
+    mirrors.try(:each) do |mirror|
+      list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description, mirror_name: mirror.name}
+    end
+    list
+  end

-	def container_limit(mirror_repositories)
-		container = []
-		mirror_repositories.each do |mr|
-			if mr.name.present?
-				container << {:image => mr.name, :cpuLimit => mr.cpu_limit, :memoryLimit =>  "#{mr.memory_limit}M", :type => mr.try(:main_type) == "1" ? "main" : "sub"}
-			end
-		end
-		container.to_json
-	end
+  def container_limit(mirror_repositories)
+    container = []
+    mirror_repositories.each do |mr|
+      if mr.name.present?
+        container << {:image => mr.name, :cpuLimit => mr.cpu_limit, :memoryLimit =>  "#{mr.memory_limit}M", :type => mr.try(:main_type) == "1" ? "main" : "sub"}
+      end
+    end
+    container.to_json
+  end

-	# 实训中间层pod配置
-	def shixun_container_limit shixun
-		container = []
-		shixun.shixun_service_configs.each do |config|
-			mirror = config.mirror_repository
-			if mirror.name.present?
-				# 资源限制没有就传默认值。
-				cpu_limit = config.cpu_limit.presence || 1
-				cpu_request = config.lower_cpu_limit.presence || 0.1
-				memory_limit = config.memory_limit.presence || 1024
-				request_limit = config.request_limit.presence || 10
-				resource_limit = config.resource_limit.presence || 10000
-				container << {:image => mirror.name,
-											:cpuLimit => cpu_limit,
-											:cpuRequest => cpu_request,
-											:memoryLimit => "#{memory_limit}M",
-											:memoryRequest => "#{request_limit}M",
-											:resourceLimit => "#{resource_limit}K",
-											:type => mirror.try(:main_type) == "1" ? "main" : "sub"}
-			end
-		end
-		container.to_json
-	end
+  # 实训中间层pod配置
+  def shixun_container_limit shixun
+    container = []
+    shixun.shixun_service_configs.each do |config|
+      mirror = config.mirror_repository
+      if mirror.name.present?
+        # 资源限制没有就传默认值。
+        cpu_limit = config.cpu_limit.presence || 1
+        cpu_request = config.lower_cpu_limit.presence || 0.1
+        memory_limit = config.memory_limit.presence || 1024
+        request_limit = config.request_limit.presence || 10
+        resource_limit = config.resource_limit.presence || 10000
+        container << {:image => mirror.name,
+                      :cpuLimit => cpu_limit,
+                      :cpuRequest => cpu_request,
+                      :memoryLimit => "#{memory_limit}M",
+                      :memoryRequest => "#{request_limit}M",
+                      :resourceLimit => "#{resource_limit}K",
+                      :type => mirror.try(:main_type) == "1" ? "main" : "sub"}
+      end
+    end
+    container.to_json
+  end

-	# 毕设任务列表的赛选
-	def course_work(task, **option)
-		logger.info("#############{option}")
-		course = task.course
-		work_list = task.graduation_works.includes(user: [:user_extension])
-		# 教师评阅搜索 0: 未评， 1 已评
-		if option[:teacher_comment]
-			graduation_work_ids = GraduationWorkScore.where(graduation_work_id: work_list.map(&:id)).pluck(:graduation_work_id)
-			if option[:teacher_comment].zero?
-				work_list  = work_list.where.not(id: graduation_work_ids)
-			elsif option[:teacher_comment] == 1
-				work_list = work_list.where(id: graduation_work_ids).where.not(work_status: 0)
-			end
-		end
+  # 毕设任务列表的赛选
+  def course_work(task, **option)
+    logger.info("#############{option}")
+    course = task.course
+    work_list = task.graduation_works.includes(user: [:user_extension])
+    # 教师评阅搜索 0: 未评， 1 已评
+    if option[:teacher_comment]
+      graduation_work_ids = GraduationWorkScore.where(graduation_work_id: work_list.map(&:id)).pluck(:graduation_work_id)
+      if option[:teacher_comment].zero?
+        work_list  = work_list.where.not(id: graduation_work_ids)
+      elsif option[:teacher_comment] == 1
+        work_list = work_list.where(id: graduation_work_ids).where.not(work_status: 0)
+      end
+    end

-		# 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
-		if option[:task_status]
-			work_list = work_list.where(work_status: option[:task_status])
-		end
+    # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
+    if option[:task_status]
+      work_list = work_list.where(work_status: option[:task_status])
+    end

-		# 分班情况
-		if option[:course_group]
-			group_user_ids = course.course_members.where(course_group_id: option[:course_group]).pluck(:user_id)
-			# 有分组只可能是老师身份查看列表
-			work_list = work_list.where(user_id: group_user_ids)
-		end
+    # 分班情况
+    if option[:course_group]
+      group_user_ids = course.course_members.where(course_group_id: option[:course_group]).pluck(:user_id)
+      # 有分组只可能是老师身份查看列表
+      work_list = work_list.where(user_id: group_user_ids)
+    end

-		# 只看我的交叉评阅
-		if option[:cross_comment]
-			graduation_work_id = task.graduation_work_comment_assignations.where(:user_id => current_user.id)
-															 .pluck(:graduation_work_id).uniq if task.graduation_work_comment_assignations
-			work_list = work_list.where(id: graduation_work_id)
-		end
+    # 只看我的交叉评阅
+    if option[:cross_comment]
+      graduation_work_id = task.graduation_work_comment_assignations.where(:user_id => current_user.id)
+                               .pluck(:graduation_work_id).uniq if task.graduation_work_comment_assignations
+      work_list = work_list.where(id: graduation_work_id)
+    end

-		# 输入姓名和学号搜索
-		# TODO user_extension 如果修改 请调整
-		if option[:search]
-			work_list = work_list.joins(user: :user_extension).where("concat(lastname, firstname) like ?
+    # 输入姓名和学号搜索
+    # TODO user_extension 如果修改 请调整
+    if option[:search]
+      work_list = work_list.joins(user: :user_extension).where("concat(lastname, firstname) like ?
                         or student_id like ?", "%#{option[:search]}%", "%#{option[:search]}%")
-		end
+    end

-		# 排序
-		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"
-			work_list = work_list.joins(user: :user_extension).order("user_extensions.#{rorder} #{b_order}")
-		end
-		work_list
-	end
+    # 排序
+    rorder = option[:order] || "updated_at"
+    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"
+      work_list = work_list.joins(user: :user_extension).order("user_extensions.#{rorder} #{b_order}")
+    end
+    work_list
+  end

-	def strip_html(text, len=0, endss="...")
-		ss = ""
-		if !text.nil? && text.length>0
-			ss=text.gsub(/<\/?.*?>/, '').strip
-			ss = ss.gsub(/&nbsp;*/, '')
-			ss = ss.gsub(/\r\n/,'')  #新增
-			ss = ss.gsub(/\n/,'')  #新增
-			if len > 0 && ss.length > len
-				ss = ss[0, len] + endss
-			elsif len > 0 && ss.length <= len
-				ss = ss
-				#ss = truncate(ss, :length => len)
-			end
-		end
-		ss
-	end
+  def strip_html(text, len=0, endss="...")
+    ss = ""
+    if !text.nil? && text.length>0
+      ss=text.gsub(/<\/?.*?>/, '').strip
+      ss = ss.gsub(/&nbsp;*/, '')
+      ss = ss.gsub(/\r\n/,'')  #新增
+      ss = ss.gsub(/\n/,'')  #新增
+      if len > 0 && ss.length > len
+        ss = ss[0, len] + endss
+      elsif len > 0 && ss.length <= len
+        ss = ss
+        #ss = truncate(ss, :length => len)
+      end
+    end
+    ss
+  end

-	# Returns a string that can be used as filename value in Content-Disposition header
-	def filename_for_content_disposition(name)
-		request.env['HTTP_USER_AGENT'] =~ %r{MSIE|Trident|Edge} ? ERB::Util.url_encode(name) : name
-	end
+  # Returns a string that can be used as filename value in Content-Disposition header
+  def filename_for_content_disposition(name)
+    request.env['HTTP_USER_AGENT'] =~ %r{MSIE|Trident|Edge} ? ERB::Util.url_encode(name) : name
+  end

-	def format_time(time)
-		time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M")
-	end
+  def format_time(time)
+    time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M")
+  end

-	# 获取Oauth Client
-	def get_client(site)
-		client_id = Rails.configuration.educoder['client_id']
-		client_secret = Rails.configuration.educoder['client_secret']
+  # 获取Oauth Client
+  def get_client(site)
+    client_id = Rails.configuration.educoder['client_id']
+    client_secret = Rails.configuration.educoder['client_secret']

-		OAuth2::Client.new(client_id, client_secret, site: site)
-	end
+    OAuth2::Client.new(client_id, client_secret, site: site)
+  end

-	def paginate(relation)
-		limit = params[:limit] || params[:per_page]
-		limit  = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
-		page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
-		offset = (page - 1) * limit
+  def paginate(relation)
+    limit = params[:limit] || params[:per_page]
+    limit  = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
+    page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
+    offset = (page - 1) * limit

-		if relation.is_a?(Array)
-			relation[offset, limit]
-		else
-			relation.limit(limit).offset(offset)
-		end
-	end
+    if relation.is_a?(Array)
+      relation[offset, limit]
+    else
+      relation.limit(limit).offset(offset)
+    end
+  end

-	def kaminari_paginate(relation)
-		limit = params[:limit] || params[:per_page]
-		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
-		page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
+  def kaminari_paginate(relation)
+    limit = params[:limit] || params[:per_page]
+    limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
+    page  = params[:page].to_i.zero? ? 1 : params[:page].to_i

-		relation.page(page).per(limit)
+    relation.page(page).per(limit)
 	end

 	def kaminari_array_paginate(relation)
@ -692,29 +707,30 @@ class ApplicationController < ActionController::Base
 		time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M:%S")
 	end

-	def strf_date(date)
-		date.blank? ? '' : date.to_date.strftime("%Y-%m-%d")
-	end
+  def strf_date(date)
+    date.blank? ? '' : date.to_date.strftime("%Y-%m-%d")
+  end

-	def logger_error(error)
-		Rails.logger.error(error.message)
-		error.backtrace.each { |msg| Rails.logger.error(msg) }
-	end
+  def logger_error(error)
+    Rails.logger.error(error.message)
+    error.backtrace.each { |msg| Rails.logger.error(msg) }
+  end

-	def find_user
-		@user = User.find_by_login params[:login]
+  def find_user
+    @user = User.find_by_login params[:login]
    render_not_found("未找到’#{params[:login]}’相关的用户") unless @user
-	end
+  end

-	def find_user_with_id
-		@user = User.find_by_id params[:user_id]
+  def find_user_with_id
+    @user = User.find_by_id params[:user_id]
    # render_not_found("未找到’#{params[:login]}’相关的用户") unless @user
-		render_error("未找到相关的用户") unless @user
-	end
+    render_error("未找到相关的用户") unless @user
+  end

-	def find_repository
-		@repo = @user.repositories.find_by_identifier params[:repo_identifier]
+  def find_repository
+    @repo = @user.repositories.find_by_identifier params[:repo_identifier]
    render_not_found("未找到’#{params[:repo_identifier]}’相关的项目") unless @repo
+
 	end

 	def find_repository_by_id
@ -770,80 +786,56 @@ 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)
+  private
+  def object_not_found
+    uid_logger("Missing template or cant't find record, responding with 404")
+    render json: {message: "您访问的页面不存在或已被删除", status: 404}
+    false
  end

-  private
-	def object_not_found
-		uid_logger("Missing template or cant't find record, responding with 404")
-		render json: {message: "您访问的页面不存在或已被删除", status: 404}
-		false
-	end
+  def tip_show(exception)
+    uid_logger("Tip show status is #{exception.status}, message is #{exception.message}")
+    render json: exception.tip_json
+  end

-	def tip_show(exception)
-		uid_logger("Tip show status is #{exception.status}, message is #{exception.message}")
-		render json: exception.tip_json
-	end
+  def render_parameter_missing
+    render json: { status: -1, message: '参数缺失' }
+  end

-	def render_parameter_missing
-		render json: { status: -1, message: '参数缺失' }
-	end
+  def set_export_cookies
+    cookies[:fileDownload] = true
+  end

-	def set_export_cookies
-		cookies[:fileDownload] = true
-	end
+  # 149课程的评审用户数据创建（包含创建课堂学生）
+  def open_class_user
+    user = User.find_by(login: "OpenClassUser")
+    unless user
+      ActiveRecord::Base.transaction do
+        user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
+                       nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
+                       password: "12345678", phone: "11122223333", profile_completed: 1}
+        user = User.create!(user_params)

-	# 149课程的评审用户数据创建（包含创建课堂学生）
-	def open_class_user
-		user = User.find_by(login: "OpenClassUser")
-		unless user
-			ActiveRecord::Base.transaction do
-				user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
-											 nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
-											 password: "12345678", phone: "11122223333", profile_completed: 1}
-				user = User.create!(user_params)
+        UserExtension.create!(user_id: user.id, gender: 0, school_id: 3396, :identity => 1, :student_id => "openclassuser") # 3396

-				UserExtension.create!(user_id: user.id, gender: 0, school_id: 3396, :identity => 1, :student_id => "openclassuser") # 3396
+        subject = Subject.find_by(id: 149)
+        if subject
+          subject.courses.each do |course|
+            CourseMember.create!(course_id: course.id, role: 3, user_id: user.id) if !course.course_members.exists?(user_id: user.id)
+          end
+        end
+      end
+    end
+    user
+  end

-				subject = Subject.find_by(id: 149)
-				if subject
-					subject.courses.each do |course|
-						CourseMember.create!(course_id: course.id, role: 3, user_id: user.id) if !course.course_members.exists?(user_id: user.id)
-					end
-				end
-			end
-		end
-		user
-	end
+  # 记录热门搜索关键字
+  def record_search_keyword
+    keyword = params[:keyword].to_s.strip
+    return if keyword.blank? || keyword.size <= 1
+    return unless HotSearchKeyword.available?

-	# 记录热门搜索关键字
-	def record_search_keyword
-		keyword = params[:keyword].to_s.strip
-		return if keyword.blank? || keyword.size <= 1
-		return unless HotSearchKeyword.available?
+    HotSearchKeyword.add(keyword)
+  end

-		HotSearchKeyword.add(keyword)
-	end
-
-end
+end
--- a/app/controllers/applied_projects_controller.rb
+++ b/app/controllers/applied_projects_controller.rb
@ -1,13 +0,0 @@
-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
--- a/app/controllers/composes_controller.rb
+++ b/app/controllers/composes_controller.rb
@ -3,12 +3,13 @@ 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
@ -95,8 +96,4 @@ class ComposesController < ApplicationController
    end
  end

-  def order_type 
-    Compose.column_names.include?(params[:order_type]) ? params[:order_type] : 'created_at'
-  end
-
 end
--- a/app/controllers/concerns/.keep
+++ b/app/controllers/concerns/.keep
--- a/app/controllers/concerns/acceleratorable.rb
+++ b/app/controllers/concerns/acceleratorable.rb
@ -1,36 +0,0 @@
-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
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@ -44,6 +44,7 @@ module LoginHelper
    set_autologin_cookie(user)

    UserAction.create(action_id: user&.id, action_type: 'Login', user_id: user&.id, ip: request.remote_ip)
+    # user.daily_reward
    user.update_column(:last_login_on, Time.now)
    # 注册完成后有一天的试用申请(先去掉)
    # UserDayCertification.create(user_id: user.id, status: 1)
--- a/app/controllers/concerns/register_helper.rb
+++ b/app/controllers/concerns/register_helper.rb
@ -1,13 +1,17 @@
 module RegisterHelper
  extend ActiveSupport::Concern

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

    user = User.new(admin: false, login: username, mail: email, type: "User")
    user.password = password
    user.platform = platform
-    user.activate
+    if need_edit_info
+      user.need_edit_info
+    else 
+      user.activate
+    end
    
    return unless user.valid?

@ -27,4 +31,30 @@ module RegisterHelper
    result
  end

+  def autosync_register_trustie(username, password, email)
+    config = Rails.application.config_for(:configuration).symbolize_keys!
+
+    api_host = config[:sync_url]
+
+    return if api_host.blank?
+
+    url = "#{api_host}/api/v1/users/common"
+    sync_json = {
+      "mail": email,
+      "password": password,
+      "login": username
+    }
+    uri = URI.parse(url)
+
+    if api_host
+      http = Net::HTTP.new(uri.hostname, uri.port)
+
+      if api_host.include?("https://")
+        http.use_ssl = true
+      end
+
+      http.send_request('POST', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
+    end
+  end
+
 end
--- a/app/controllers/forks_controller.rb
+++ b/app/controllers/forks_controller.rb
@ -2,9 +2,12 @@ class ForksController < ApplicationController
  before_action :require_login
  before_action :load_project
  before_action :authenticate_project!, :authenticate_user!
+  skip_after_action :user_trace_log, only: [:create]

  def create
    @new_project = Projects::ForkService.new(current_user, @project, params[:organization]).call
+    user = current_user
+    Rails.logger.user_trace.info("{id: #{user.id}, login: #{user.login}, url: #{request.url}, method: #{request.method}, params: #{params.merge(forkee: @new_project.id)}, response_code: #{response.code}, time: #{Time.now}}")
  end

  private
--- a/app/controllers/helps/faqs_controller.rb
+++ b/app/controllers/helps/faqs_controller.rb
@ -1,8 +0,0 @@
-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
--- a/app/controllers/issue_tags_controller.rb
+++ b/app/controllers/issue_tags_controller.rb
@ -7,6 +7,9 @@ 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
@ -135,14 +138,4 @@ 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
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -8,6 +8,8 @@ class IssuesController < ApplicationController
  before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue]
  before_action :check_token_enough, only: [:create, :update]

+  skip_after_action :user_trace_log, only: [:update]
+
  include ApplicationHelper
  include TagChosenHelper

@ -17,15 +19,11 @@ class IssuesController < ApplicationController
    issues = @project.issues.issue_issue.issue_index_includes
    issues = issues.where(is_private: false) unless @user_admin_or_member

-    @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)
+    @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
    scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
    @issues_size = scopes.size
    @issues = paginate(scopes)
@ -105,46 +103,51 @@ class IssuesController < ApplicationController
  end

  def create
-    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
-            attachment.author_id = current_user.id
-            attachment.description = ""
-            attachment.save
+    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
-      end
-      if params[:issue_tag_ids].present?
-        params[:issue_tag_ids].each do |tag|
-          IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
+        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
-      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)
+        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

-      #为悬赏任务时, 扣除当前用户的积分
-      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
@ -193,13 +196,15 @@ class IssuesController < ApplicationController
      #     end
      #   end
      # end
+    issue_hash = old_value_to_hash(@issue, params)

    if @issue.issue_type.to_s == "2" &&  params[:status_id].to_i == 5 && @issue.author_id != current_user.try(:id)
      normal_status(-1, "不允许修改为关闭状态")
    else
      issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-      Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
+
      if @issue.update_attributes(issue_params)
+        user_trace_update_log(issue_hash)
        if params[:status_id].to_i == 5  #任务由非关闭状态到关闭状态时
          @issue.issue_times.update_all(end_time: Time.now)
          @issue.update_closed_issues_count_in_project!
@ -224,9 +229,6 @@ class IssuesController < ApplicationController
        normal_status(-1, "更新失败")
      end
    end
-  rescue Exception => exception
-    puts exception.message
-    normal_status(-1, exception.message)
  end

  def show
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@ -3,6 +3,7 @@ class JournalsController < ApplicationController
  before_action :set_issue
  before_action :check_issue_permission
  before_action :set_journal, only: [:destroy, :edit, :update]
+  skip_after_action :user_trace_log, only: [:update]

  def index
    @page  = params[:page]  || 1
@ -67,7 +68,9 @@ class JournalsController < ApplicationController
  def update
    content = params[:content]
    if content.present?
+      old_value = old_value_to_hash(@journal, params)
      if @journal.update_attribute(:notes, content)
+        user_trace_update_log(old_value)
        normal_status(0, "更新成功")
      else
        normal_status(-1, "更新失败")
--- a/app/controllers/log_controller.rb
+++ b/app/controllers/log_controller.rb
@ -0,0 +1,19 @@
+class LogController < ApplicationController
+  def list
+    path = "#{Rails.root}/log"
+    @file_list = []
+    Dir.foreach(path) do |file|
+      @file_list << file
+    end
+    @file_list = @file_list.sort
+  end
+
+  def download
+    path = "#{Rails.root}/log/#{params[:filename]}"
+    if params[:filename] && File.exist?(path) && File.file?(path)
+      send_file(path, filename: params[:filename])
+    else
+      render json: { message: 'no such file!' }
+    end
+  end
+end
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@ -5,6 +5,7 @@ class MembersController < ApplicationController
  before_action :operate!, except: %i[index]
  before_action :check_member_exists!, only: %i[create]
  before_action :check_member_not_exists!, only: %i[remove change_role]
+  skip_after_action :user_trace_log, only: [:change_role]

  def create
    interactor = Projects::AddMemberInteractor.call(@project.owner, @project, @user)
@ -18,7 +19,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).merge(User.like(search))
+    scope = scope.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
    scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present?

    @total_count = scope.size
@ -34,7 +35,9 @@ class MembersController < ApplicationController
  end

  def change_role
+    old_value = @project.members.where(user_id: params[:user_id])[0].roles.last.name
    interactor = Projects::ChangeMemberRoleInteractor.call(@project.owner, @project, @user, params[:role])
+    user_trace_update_log(old_value)
    render_response(interactor)
  rescue Exception => e
    uid_logger_error(e.message)
@ -47,7 +50,7 @@ class MembersController < ApplicationController
  end

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

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

  def check_member_not_exists!
-    return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless @project.member?(params[:user_id])
+    return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists?
  end
 end
--- a/app/controllers/oauth/base_controller.rb
+++ b/app/controllers/oauth/base_controller.rb
@ -2,6 +2,7 @@ class Oauth::BaseController < ActionController::Base
  include RenderHelper
  include LoginHelper
  include ControllerRescueHandler
+  include LoggerHelper
  # include LaboratoryHelper

  skip_before_action :verify_authenticity_token
@ -11,6 +12,18 @@ class Oauth::BaseController < ActionController::Base
  end

  private
+  def tip_exception(status = -1, message)
+		raise Educoder::TipException.new(status, message)
+  end
+  
+  def tip_show_exception(status = -2, message)
+		raise Educoder::TipException.new(status, message)
+  end
+  
+  def tip_show(exception)
+		uid_logger("Tip show status is #{exception.status}, message is #{exception.message}")
+		render json: exception.tip_json
+	end

  def session_user_id
    # session[:user_id]
@ -48,4 +61,13 @@ class Oauth::BaseController < ActionController::Base
    Rails.logger.info("[wechat] set session unionid: #{unionid}")
    session[:unionid] = unionid
  end
+
+  def session_edulogin
+    session[:edulogin]
+  end
+
+  def set_session_edulogin(login)
+    Rails.logger.info("[educoder] set sesstion edulogin: #{login}")
+    session[:edulogin] = login
+  end
 end
--- a/app/controllers/oauth/educoder_controller.rb
+++ b/app/controllers/oauth/educoder_controller.rb
@ -1,4 +1,6 @@
 class Oauth::EducoderController < Oauth::BaseController
+  include RegisterHelper
+
  def bind
    begin
      login = params[:login]
@ -32,4 +34,41 @@ class Oauth::EducoderController < Oauth::BaseController
      render_error(ex.message)
    end
  end
+
+  # 需要educoder那边设置回调地址
+  def create
+    begin
+      code = params['code'].to_s.strip
+      tip_exception("code不能为空") if code.blank?
+
+      new_user = false
+      result = EducoderOauth::Service.access_token(code)
+      result = EducoderOauth::Service.user_info(result[:access_token])
+
+      # 存在该用户
+      open_user = OpenUsers::Educoder.find_by(uid: result['login'])
+      if open_user.present? && open_user.user.present?
+        successful_authentication(open_user.user)
+      else
+        if current_user.blank? || !current_user.logged?
+          new_user = true
+          login = User.generate_login('E')
+          reg_result = autologin_register(login,"#{login}@forge.com", "Ec#{login}2021#", 'educoder', true)
+          if reg_result[:message].blank?
+            open_user = OpenUsers::Educoder.create!(user_id: reg_result[:user][:id], uid: result['login'], extra: result)
+            autosync_register_trustie(login, "Ec#{login}2021#", "#{login}@forge.com")
+            successful_authentication(open_user.user)
+          else
+            render_error(reg_result[:message])
+          end
+        else
+          OpenUsers::Educoder.create!(user: current_user, uid: result['login'], extra: result)
+        end
+      end
+
+      redirect_to root_path(new_user: new_user)
+    rescue Exception => ex
+      render_error(ex.message)
+    end
+  end
 end
--- a/app/controllers/organizations/base_controller.rb
+++ b/app/controllers/organizations/base_controller.rb
@ -17,12 +17,11 @@ 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
-    !current_user&.admin? && @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
+    @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
  end

  def user_mark
@ -32,4 +31,4 @@ class Organizations::BaseController < ApplicationController
  def project_mark
    params[:repo_name] || params[:id]
  end
-end
+end
--- a/app/controllers/organizations/organization_users_controller.rb
+++ b/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).merge(User.like(search))
+    @organization_users = @organization_users.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?

    @organization_users = kaminari_paginate(@organization_users)
  end
--- a/app/controllers/organizations/organizations_controller.rb
+++ b/app/controllers/organizations/organizations_controller.rb
@ -1,5 +1,5 @@
 class Organizations::OrganizationsController < Organizations::BaseController
-  before_action :require_login, except: [:index, :show, :recommend]
+  before_action :require_login, except: [:index, :show]
  before_action :convert_image!, only: [:create, :update]
  before_action :load_organization, only: [:show, :update, :destroy]
  before_action :check_user_can_edit_org, only: [:update, :destroy]
@ -25,7 +25,6 @@ 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
@ -36,7 +35,6 @@ class Organizations::OrganizationsController < Organizations::BaseController

  def update
    ActiveRecord::Base.transaction do
-      Organizations::CreateForm.new(organization_params).validate!
      login = @organization.login
      @organization.login = organization_params[:name] if organization_params[:name].present?
      @organization.nickname = organization_params[:nickname] if organization_params[:nickname].present?
@ -62,14 +60,26 @@ class Organizations::OrganizationsController < Organizations::BaseController
    tip_exception(e.message)
  end

-  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)
+  private
+  def convert_image!
+    return unless params[:image].present?
+    max_size = EduSetting.get('upload_avatar_max_size') || 2 * 1024 * 1024 # 2M
+    if params[:image].class == ActionDispatch::Http::UploadedFile
+      @image = params[:image]
+      render_error('请上传文件') if @image.size.zero?
+      render_error('文件大小超过限制') if @image.size > max_size.to_i
+    else
+      image = params[:image].to_s.strip
+      return render_error('请上传正确的图片') if image.blank?
+      @image = Util.convert_base64_image(image, max_size: max_size.to_i)
+    end
+  rescue Base64ImageConverter::Error => ex
+    render_error(ex.message)
  end

-  private
+  def avatar_path(organization)
+    ApplicationController.helpers.disk_filename(organization.class, organization.id)
+  end

  def organization_params
    params.permit(:name, :description, :website, :location,
@ -88,11 +98,11 @@ class Organizations::OrganizationsController < Organizations::BaseController
  end

  def sort_by
-    OrganizationExtension.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
+    params.fetch(:sort_by, "created_at")
  end

  def sort_direction
-    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    params.fetch(:sort_direction, "desc")
  end

 end
--- a/app/controllers/organizations/projects_controller.rb
+++ b/app/controllers/organizations/projects_controller.rb
@ -36,10 +36,10 @@ class Organizations::ProjectsController < Organizations::BaseController
  end

  def sort
-    Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'updated_on'
+    params.fetch(:sort_by, "updated_on")
  end

  def sort_direction
-    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    params.fetch(:sort_direction, "desc")
  end
 end
--- a/app/controllers/organizations/team_users_controller.rb
+++ b/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).merge(User.like(search))
+    @team_users = @team_users.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?

    @team_users = kaminari_paginate(@team_users)
  end
--- a/app/controllers/organizations/teams_controller.rb
+++ b/app/controllers/organizations/teams_controller.rb
@ -33,17 +33,13 @@ class Organizations::TeamsController < Organizations::BaseController
  end

  def create
-    ActiveRecord::Base.transaction do
-      Organizations::CreateTeamForm.new(team_params).validate!
-      @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
-    end
+    @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
  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)
@ -64,7 +60,7 @@ class Organizations::TeamsController < Organizations::BaseController

  private
  def team_params
-    params.permit(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
+    params.permit(:name, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
  end

  def load_organization
--- a/app/controllers/projects/applied_transfer_projects_controller.rb
+++ b/app/controllers/projects/applied_transfer_projects_controller.rb
@ -1,26 +0,0 @@
-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
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -2,8 +2,6 @@ class ProjectsController < ApplicationController
  include ApplicationHelper
  include OperateProjectAbilityAble
  include ProjectsHelper
-  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]
@ -55,23 +53,7 @@ class ProjectsController < ApplicationController

  def migrate
    Projects::MigrateForm.new(mirror_params).validate!
-
-    @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
+    @project = Projects::MigrateService.new(current_user, mirror_params).call
  rescue Exception => e
    uid_logger_error(e.message)
    tip_exception(e.message)
@ -106,29 +88,19 @@ class ProjectsController < ApplicationController

  def update
    ActiveRecord::Base.transaction do
-      # 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
+      # Projects::CreateForm.new(project_params).validate!
+      private = params[:private] || false

-        new_project_params = project_params.except(:private).merge(is_public: !private)
-        @project.update_attributes!(new_project_params)
-        gitea_params = {
-          private: private,
-          default_branch: @project.default_branch,
-          website: @project.website
-        }
-        if [true, false].include? private
-          Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
-          @project.repository.update_column(:hidden, private)
-        end
+      new_project_params = project_params.except(:private).merge(is_public: !private)
+      @project.update_attributes!(new_project_params)
+      gitea_params = {
+        private: private,
+        default_branch: @project.default_branch,
+        website: @project.website
+      }
+      if [true, false].include? private
+        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+        @project.repository.update_column(:hidden, private)
      end
    end
  rescue Exception => e
@ -177,7 +149,7 @@ class ProjectsController < ApplicationController
  end

  def recommend
-    @projects = Project.recommend.includes(:repository, :project_category, :owner).order(visits: :desc)
+    @projects = Project.recommend.includes(:repository, :project_category, :owner).limit(5)
  end

  def about
@ -211,7 +183,7 @@ class ProjectsController < ApplicationController

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

--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@ -1,8 +1,11 @@
 class PullRequestsController < ApplicationController
+
  before_action :require_login, except: [:index, :show, :files, :commits]
  before_action :load_repository
  before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits]
  before_action :load_pull_request, only: [:files, :commits]
+
+  skip_after_action :user_trace_log, only: [:update]
  include TagChosenHelper
  include ApplicationHelper

@ -12,12 +15,10 @@ class PullRequestsController < ApplicationController
    # @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 = 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})
+    @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
    @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")
@ -88,8 +89,14 @@ class PullRequestsController < ApplicationController
            end
          end

+          old_issue_value = old_value_to_hash(@issue, @issue_params)
+          old_pr_value = old_value_to_hash(@pull_request, @local_params.compact)
+          old_value = {issue: old_issue_value, pull_request: old_pr_value}
+
          if @issue.update_attributes(@issue_params)
            if @pull_request.update_attributes(@local_params.compact)
+
+              user_trace_update_log(old_value)
              gitea_pull = Gitea::PullRequest::UpdateService.call(@owner.login, @repository.identifier,
                  @pull_request.gpid, @requests_params, current_user.gitea_token)

@ -138,12 +145,11 @@ 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("你没有权限操作.") unless @project.operator?(current_user)
+    return render_forbidden("你没有权限操作.") if @project.reporter?(current_user)

    if params[:do].blank?
      normal_status(-1, "请选择合并方式")
@ -152,12 +158,12 @@ class PullRequestsController < ApplicationController
        begin
          result = PullRequests::MergeService.call(@owner, @repository, @pull_request, current_user, params)

-          if result.status == 200 && @pull_request.merge!
+          if result && @pull_request.merge!
            @pull_request.project_trend_status!
            @issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
            normal_status(1, "合并成功")
          else
-            normal_status(-1, result.message)
+            normal_status(-1, "合并失败")
          end
        rescue => e
          normal_status(-1, e.message)
@ -218,7 +224,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.all_developers
+    @project_members = @project.members_user_infos
    @project_priories = IssuePriority&.select(:id,:name, :position).as_json
  end

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -53,16 +53,6 @@ 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

--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@ -1,10 +1,11 @@
 class SettingsController < ApplicationController
  def show
    @old_projects_url = nil
+    @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
    get_add_menu
    get_common_menu
    get_personal_menu
-
+    get_third_party
  end

  private
@ -40,6 +41,14 @@ class SettingsController < ApplicationController
      end
    end

+    def get_third_party
+      @third_party = []
+      @third_party << {
+        name: 'educoder',
+        url: EducoderOauth.oauth_url
+      }
+    end
+
    def get_site_url(key, value)
      key.to_s === "url" ? append_http(reset_site_url(value)) : reset_site_url(value)
    end
--- a/app/controllers/sponsor_tiers_controller.rb
+++ b/app/controllers/sponsor_tiers_controller.rb
@ -0,0 +1,90 @@
+class SponsorTiersController < ApplicationController
+  before_action :set_sponsor_tier, only: [:show, :edit, :update, :destroy]
+  before_action :check_sponsor, only: [:show]
+  before_action :require_login, only: [:create, :update, :destroy]
+
+  # GET /sponsor_tiers
+  # GET /sponsor_tiers.json
+  def index
+    # @sponsor_tiers = SponsorTier.all
+    user = User.find_by_login(params[:login])
+    @sponsor_tiers = user.sponsor_tier
+  end
+
+  # GET /sponsor_tiers/1
+  # GET /sponsor_tiers/1.json
+  def show
+
+  end
+
+  # POST /sponsor_tiers
+  # POST /sponsor_tiers.json
+  def create
+    # print("------------\n", sponsor_tier_params, "\n------------\n")
+    @check_sponsorship = nil
+    @sponsor_tier = SponsorTier.new(sponsor_tier_params)
+    respond_to do |format|
+      if @sponsor_tier.user_id == User.current.id && @sponsor_tier.save
+        format.html { redirect_to @sponsor_tier, notice: 'Sponsor tier was successfully created.' }
+        format.json { render :show, status: :created, location: @sponsor_tier }
+        # render json: {status: 1, message: '创建成功' }
+      else
+        format.html { render :new }
+        format.json { render json: @sponsor_tier.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /sponsor_tiers/1
+  # PATCH/PUT /sponsor_tiers/1.json
+  def update
+    @check_sponsorship = nil
+    old_value = old_value_to_hash(@sponsor_tier, params)
+    respond_to do |format|
+      if User.current.id == @sponsor_tier.user_id && @sponsor_tier.update(sponsor_tier_update_params)
+        user_trace_update_log(old_value)
+        format.html { redirect_to @sponsor_tier, notice: 'Sponsor tier was successfully updated.' }
+        format.json { render :show, status: :ok, location: @sponsor_tier }
+        # render json: {status: 1, message: '修改成功' }
+      else
+        format.html { render :edit }
+        format.json { render json: @sponsor_tier.errors, status: :unprocessable_entity }
+        # format.json { render status: :unprocessable_entity }
+        # render json: {status: -1, message: '修改失败' }
+      end
+    end
+  end
+
+  # DELETE /sponsor_tiers/1
+  # DELETE /sponsor_tiers/1.json
+  def destroy
+    if User.current.id == @sponsor_tier.user_id
+      @sponsor_tier.destroy
+      respond_to do |format|
+        format.html { redirect_to sponsor_tiers_url, notice: 'Sponsor tier was successfully destroyed.' }
+        format.json { head :no_content }
+      end
+    else
+      format.json { render json: @sponsor_tier.errors, status: :unprocessable_entity }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def check_sponsor
+      @check_sponsorship = Sponsorship.where("sponsor_id=? AND developer_id=?", current_user.id, @sponsor_tier.user.id)
+    end
+
+    def set_sponsor_tier
+      @sponsor_tier = SponsorTier.find(params[:id])
+    end
+
+    def sponsor_tier_update_params
+      params.require(:sponsor_tier).permit(:tier, :description)
+    end
+
+    # Only allow a list of trusted parameters through.
+    def sponsor_tier_params
+      params.require(:sponsor_tier).permit(:tier, :user_id, :description)
+    end
+end
--- a/app/controllers/sponsorships_controller.rb
+++ b/app/controllers/sponsorships_controller.rb
@ -0,0 +1,163 @@
+class SponsorshipsController < ApplicationController
+  before_action :set_sponsorship, only: [:show, :edit, :update, :destroy]
+  # before_action :require_login, except: [:index, :stopped, :sponsored, :sponsoring, :stopped_sponsored, :stopped_sponsoring]
+  before_action :require_login, only: [:create, :edit, :update, :destroy]
+  skip_after_action :user_trace_log, only: [:update]
+  
+  # GET /sponsorships
+  # GET /sponsorships.json
+  def index
+    @sponsorships = Sponsorship.all
+  end
+
+  def stopped
+    @stopped_sponsorships = StoppedSponsorship.all
+  end
+
+  def sponsored
+    if User.current.id == Integer(params[:id])
+      @sponsorships = Sponsorship.where("developer_id=?", params[:id])
+    else
+      @sponsorships = Sponsorship.where("developer_id=? AND visible=1", params[:id])
+    end
+    sort = params[:sort_by] || "created_at"
+    sort_direction = params[:sort_direction] || "desc"
+    @sponsorships = @sponsorships.reorder("#{sort} #{sort_direction}")
+    @total = @sponsorships.length
+    @sponsorships = kaminari_paginate(@sponsorships)
+  end
+
+  def sponsoring
+    if User.current.id == Integer(params[:id])
+      @sponsorships = Sponsorship.where("sponsor_id=?", params[:id])
+    else
+      @sponsorships = Sponsorship.where("sponsor_id=? AND visible=1", params[:id])
+    end
+    sort = params[:sort_by] || "created_at"
+    sort_direction = params[:sort_direction] || "desc"
+    @sponsorships = @sponsorships.reorder("#{sort} #{sort_direction}")
+    @total = @sponsorships.length
+    @sponsorships = kaminari_paginate(@sponsorships)
+  end
+
+  def stopped_sponsored
+    if User.current.id == Integer(params[:id])
+      @stopped_sponsorships = StoppedSponsorship.where("developer_id=?", params[:id])
+    else
+      @stopped_sponsorships = StoppedSponsorship.where("developer_id=? AND visible=1", params[:id])
+    end
+    sort = params[:sort_by] || "created_at"
+    sort_direction = params[:sort_direction] || "desc"
+    @stopped_sponsorships = @stopped_sponsorships.reorder("#{sort} #{sort_direction}")
+    @total = @stopped_sponsorships.length
+    @stopped_sponsorships = kaminari_paginate(@stopped_sponsorships)
+  end
+
+  def stopped_sponsoring
+    if User.current.id == Integer(params[:id])
+      @stopped_sponsorships = StoppedSponsorship.where("sponsor_id=?", params[:id])
+    else
+      @stopped_sponsorships = StoppedSponsorship.where("sponsor_id=? AND visible=1", params[:id])
+    end
+    sort = params[:sort_by] || "created_at"
+    sort_direction = params[:sort_direction] || "desc"
+    @stopped_sponsorships = @stopped_sponsorships.reorder("#{sort} #{sort_direction}")
+    @total = @stopped_sponsorships.length
+    @stopped_sponsorships = kaminari_paginate(@stopped_sponsorships)
+  end
+
+  # GET /sponsorships/1
+  # GET /sponsorships/1.json
+  def show
+  end
+
+  # POST /sponsorships
+  # POST /sponsorships.json
+  def create
+    sponsor_id = User.current.id
+    check_sponsorship = Sponsorship.where("sponsor_id=? AND developer_id=?", sponsor_id, params[:developer_id])
+
+    @sponsorship = Sponsorship.new(sponsorship_params.merge({sponsor_id: sponsor_id}))
+
+    unless check_sponsorship.length.zero?
+      return render json: {status: -1, message: '您已经赞助了TA' }
+    end
+
+    if @sponsorship.pay && @sponsorship.save
+      if params[:single] && @sponsorship.stop
+        return render json: { status: 1, message: '赞助成功' }
+      elsif !params[:single]
+        User.current.update(sponsor_num: User.current.sponsor_num+1)
+        @sponsorship.developer.update(sponsored_num: @sponsorship.developer.sponsored_num + 1)
+        return render json: { status: 1, message: '赞助成功' }
+      else
+        return render json: { status: -1, message: '赞助失败' }
+      end
+    end
+    # return render_result message: '赞助成功' if @sponsorship.save
+    # respond_to do |format|
+    #   if check_sponsorship.length.zero? && @sponsorship.save
+    #     format.html { redirect_to @sponsorship, notice: 'Sponsorship was successfully created.' }
+    #     format.json { render :show, status: :created, location: @sponsorship }
+    #     # render_result status=0, message="赞助成功"
+    #   else
+    #     format.html { render :new }
+    #     format.json { render json: @sponsorship.errors, status: :unprocessable_entity }
+    #   end
+    # end
+  end
+
+  # PATCH/PUT /sponsorships/1
+  # PATCH/PUT /sponsorships/1.json
+  def update
+    # respond_to do |format|
+    #   if @sponsorship.update(sponsorship_params)
+    #     format.html { redirect_to @sponsorship, notice: 'Sponsorship was successfully updated.' }
+    #     format.json { render :show, status: :ok, location: @sponsorship }
+    #   else
+    #     format.html { render :edit }
+    #     format.json { render json: @sponsorship.errors, status: :unprocessable_entity }
+    #   end
+    # end
+
+    if @sponsorship.sponsor.id != current_user.id
+      return render json: {status: 401, message: '没有权限' }
+    end
+    old_value = old_value_to_hash(@sponsorship, params)
+
+    if @sponsorship.update(sponsorship_params)
+      user_trace_update_log(old_value)
+      render json: {status: 1, message: '修改成功' }
+    else
+      render json: {status: -1, message: '修改失败' }
+    end
+  end
+
+  # DELETE /sponsorships/1
+  # DELETE /sponsorships/1.json
+  def destroy
+    # @sponsorship.destroy
+    # respond_to do |format|
+    #   format.html { redirect_to sponsorships_url, notice: 'Sponsorship was successfully destroyed.' }
+    #   format.json { head :no_content }
+    # end
+    developer = @sponsorship.developer
+    sponsor = @sponsorship.sponsor
+    if (User.current.id == developer.id || User.current.id == sponsor.id) && developer.update(sponsored_num: developer.sponsored_num-1) && sponsor.update(sponsor_num: sponsor.sponsor_num-1) && @sponsorship.stop
+      render json: {status: 1, message: "终止成功"}
+    else
+      render json: {status: -1, message: "失败"}
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_sponsorship
+      @sponsorship = Sponsorship.find(params[:id])
+    end
+
+    # Only allow a list of trusted parameters through.
+    def sponsorship_params
+      params.require(:sponsorship).permit(:amount, :visible, :sponsor_id, :developer_id, :single, :page, :limit, :sort_by, :search)
+    end
+end
--- a/app/controllers/users/applied_messages_controller.rb
+++ b/app/controllers/users/applied_messages_controller.rb
@ -1,18 +0,0 @@
-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
--- a/app/controllers/users/applied_projects_controller.rb
+++ b/app/controllers/users/applied_projects_controller.rb
@ -1,39 +0,0 @@
-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
--- a/app/controllers/users/applied_transfer_projects_controller.rb
+++ b/app/controllers/users/applied_transfer_projects_controller.rb
@ -1,41 +0,0 @@
-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
--- a/app/controllers/users/banks_controller.rb
+++ b/app/controllers/users/banks_controller.rb
@ -1,8 +1,8 @@
 class Users::BanksController < Users::BaseController
  before_action :params_filter
  def index
-    order = CourseList.column_names.include?(params[:order]) ? params[:order] : "updated_at"
-    sort = %w(desc asc).includes?(params[:sort]) ? params[:sort] : "desc"
+    order = params[:order] || "updated_at"
+    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?
--- a/app/controllers/users/headmaps_controller.rb
+++ b/app/controllers/users/headmaps_controller.rb
@ -1,26 +0,0 @@
-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
--- a/app/controllers/users/is_pinned_projects_controller.rb
+++ b/app/controllers/users/is_pinned_projects_controller.rb
@ -1,45 +0,0 @@
-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
--- a/app/controllers/users/organizations_controller.rb
+++ b/app/controllers/users/organizations_controller.rb
@ -16,10 +16,10 @@ class Users::OrganizationsController < Users::BaseController

  private
  def sort_by
-    OrganizationExtension.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at' 
+    params.fetch(:sort_by, "created_at")
  end

  def sort_direction
-    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'  
+    params.fetch(:sort_direction, "desc")
  end
 end
--- a/app/controllers/users/project_trends_controller.rb
+++ b/app/controllers/users/project_trends_controller.rb
@ -1,11 +0,0 @@
-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
--- a/app/controllers/users/statistics_controller.rb
+++ b/app/controllers/users/statistics_controller.rb
@ -1,217 +0,0 @@
-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
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -2,11 +2,10 @@ class UsersController < ApplicationController
  include ApplicationHelper
  include Ci::DbConnectable

-  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard]
-  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard]
+  before_action :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 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={})
@ -28,26 +27,12 @@ class UsersController < ApplicationController

  def show
      #待办事项，现在未做
-      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
+      @undo_events = 0
      #用户的组织数量
      # @user_composes_count =  @user.composes.size
      @user_composes_count = 0
-      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
+      @user_org_count = User.current.logged? ? @user.organizations.with_visibility(%w(common limited)).size + @user.organizations.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).size : @user.organizations.with_visibility("common").size
+      user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? @user.projects : @user.projects.visible
      @projects_common_count = user_projects.common.size
      @projects_mirrior_count = user_projects.mirror.size
      @projects_sync_mirrior_count = user_projects.sync_mirror.size
@ -65,22 +50,16 @@ class UsersController < ApplicationController

  def fan_users
    watchers = @user.watchers.includes(:user).order("watchers.created_at desc")
-    watchers = watchers.joins(:user).merge(User.like(params[:search]))
+    watchers = watchers.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login)) LIKE ?", "%#{params[:search].split(" ").join('|')}%") if params[:search].present?
+
    @watchers_count = watchers.size
    @watchers = paginate(watchers)
  end

-  def hovercard
-  end
-
  def update
-    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
+    @user = User.find params[:id]
+    @user.update!(user_params)
+    render_ok
  end

  def me
@ -93,6 +72,10 @@ class UsersController < ApplicationController
      @user = current_user
      # TODO 等消息上线再打开注释
      #@tidding_count = unviewed_tiddings(current_user) if current_user.present?
+      #
+      if(@user.logged?)
+        @user.daily_reward
+      end
    rescue Exception => e
      uid_logger_error(e.message)
      missing_template
@ -254,6 +237,15 @@ class UsersController < ApplicationController
    render_ok
  end

+  def update_description
+    @user = User.find params[:id]
+    if @user.id == User.current.id && @user.update(description: params[:description])
+      render_ok
+    else
+      render_error
+    end
+  end
+
  def sync_user_info
    user = User.find_by_login params[:login]
    return render_forbidden unless user === current_user
@ -267,7 +259,7 @@ class UsersController < ApplicationController

    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)
+      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_ACTIVE)
      render_ok
    else
      render_error(interactor.error)
@ -280,13 +272,11 @@ class UsersController < ApplicationController
  end

  def user_params
-    params.require(:user).permit(:nickname, :image,
+    params.require(:user).permit(:nickname, :lastname, :show_realname,:login,:mail,
                                  user_extension_attributes: [
                                  :gender, :location, :location_city,
                                  :occupation, :technical_title,
-                                  :school_id, :department_id, :province, :city,
-                                  :custom_department, :identity, :student_id, :description,
-                                  :show_email, :show_location, :show_department]
+                                  :school_id, :department_id,:identity, :student_id, :description]
                                )
  end

--- a/app/controllers/users_for_private_messages_controller.rb
+++ b/app/controllers/users_for_private_messages_controller.rb
@ -11,7 +11,7 @@ class UsersForPrivateMessagesController < ApplicationController
      return
    end

-    users = users.like(keyword)
+    users = users.where('LOWER(concat(lastname, firstname, nickname)) LIKE ?', "%#{keyword}%")

    @users = users.limit(10).includes(:user_extension)
  end
--- a/app/controllers/version_releases_controller.rb
+++ b/app/controllers/version_releases_controller.rb
@ -3,12 +3,13 @@ class VersionReleasesController < ApplicationController
  before_action :set_user
  before_action :require_login, except: [:index]
  before_action :find_version , only: [:edit, :update, :destroy]
+  skip_after_action :user_trace_log, only: [:update]

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

  def new
@ -78,14 +79,14 @@ class VersionReleasesController < ApplicationController
      ActiveRecord::Base.transaction do
        begin
          version_params = releases_params
-
+          old_value = old_value_to_hash(@version, version_params)
          if @version.update_attributes!(version_params)
            create_attachments(params[:attachment_ids], @version) if params[:attachment_ids].present?
            git_version_release = Gitea::Versions::UpdateService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
            unless git_version_release
              raise Error, "更新失败"
            end
-
+            user_trace_update_log(old_value)
            normal_status(0, "更新成功")
          else
            normal_status(-1, "更新失败")
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@ -7,6 +7,8 @@ class VersionsController < ApplicationController
  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
@ -25,6 +27,9 @@ 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"
@ -162,12 +167,4 @@ 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
--- a/app/controllers/wallets_controller.rb
+++ b/app/controllers/wallets_controller.rb
@ -0,0 +1,28 @@
+class WalletsController < ApplicationController
+  before_action :require_login
+
+  def balance
+    user = User.find_by_id(params[:id])
+    @wallet = user.get_wallet
+  end
+
+  def coin_changes
+    user = User.find_by_id(params[:id])
+    @wallet = user.get_wallet
+    if params[:category] == 'all'
+      scope = CoinChange.where('to_wallet_id = ? OR from_wallet_id = ?', @wallet.id, @wallet.id)
+    elsif params[:category] == 'income'
+      # @coin_changes = CoinChange.where('to_wallet_id = ?', @wallet.id).limit(100)
+      scope = @wallet.income
+    elsif params[:category] == 'outcome'
+      scope = @wallet.outcome
+    end
+
+    sort = params[:sort_by] || "created_at"
+    sort_direction = params[:sort_direction] || "desc"
+    scope = scope.reorder("#{sort} #{sort_direction}")
+
+    @total = scope.length
+    @coin_changes = kaminari_paginate(scope)
+  end
+end
--- a/app/controllers/weapps/courses_controller.rb
+++ b/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 ? OR users.nickname like ?", "%#{search}%", "%#{search}%")
+      @teacher_list = @teacher_list.joins(:user).where("LOWER(CONCAT(users.lastname, users.firstname)) like ?", "%#{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 users.nickname like ? or
-                                                        user_extensions.student_id like ?", "%#{search}%", "%#{search}%", "%#{search}%")
+      @students = @students.joins(user: :user_extension).where("LOWER(CONCAT(users.lastname, users.firstname)) like ? or
+                                                        user_extensions.student_id like ?", "%#{search}%", "%#{search}%")
    end

    if course_group_id.present?
--- a/app/controllers/zips_controller.rb
+++ b/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 nickname like ? OR student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%", "%#{params[:search]}%")
+            @ex_users = @ex_users.joins(user: :user_extension).where("CONCAT(lastname, firstname) like ? OR student_id like ?", "%#{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 nickname like ? 
-                         or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%", "%#{params[:search]}%")
+        @all_student_works = @all_student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ?
+                         or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%")
      end

      student_work_sizes = @all_student_works&.size
--- a/app/docs/slate/source/includes/_projects.md
+++ b/app/docs/slate/source/includes/_projects.md
@ -1,91 +1,5 @@
 # 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分钟前"
-}
-```
-
 ## 获取项目列表
 获取项目列表，也可以更加相关条件过滤搜素

@ -612,241 +526,3 @@ 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分钟前"
-}
-```
--- a/app/docs/slate/source/includes/_users.md
+++ b/app/docs/slate/source/includes/_users.md
--- a/app/forms/issues/create_form.rb
+++ b/app/forms/issues/create_form.rb
@ -1,11 +0,0 @@
-class Issues::CreateForm
-  include ActiveModel::Model
-
-  attr_accessor :subject
-
-  validates :subject, presence: { message: "不能为空" }
-
-  validates :subject, length: { maximum: 80, too_long: "不能超过80个字符" }
-
-
-end
--- a/app/forms/issues/update_form.rb
+++ b/app/forms/issues/update_form.rb
@ -1,10 +0,0 @@
-class Issues::UpdateForm
-  include ActiveModel::Model
-
-  attr_accessor :subject
-
-  validates :subject, presence: { message: "不能为空" }
-
-  validates :subject, length: { maximum: 80, too_long: "不能超过80个字符" }
-
-end
--- a/app/forms/organizations/create_form.rb
+++ b/app/forms/organizations/create_form.rb
@ -1,11 +0,0 @@
-class Organizations::CreateForm < BaseForm
-  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
-  attr_accessor :name, :description, :website, :location, :repo_admin_change_team_access, :visibility, :max_repo_creation, :nickname
-
-  validates :name, :nickname, :visibility, presence: true
-  validates :name, :nickname, length: { maximum: 100 }
-  validates :location, length: { maximum: 50 }
-  validates :description, length: { maximum: 200 }
-  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
-
-end
--- a/app/forms/organizations/create_team_form.rb
+++ b/app/forms/organizations/create_team_form.rb
@ -1,10 +0,0 @@
-class Organizations::CreateTeamForm < BaseForm
-  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
-  attr_accessor :name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types
-
-  validates :name, :nickname, presence: true
-  validates :name, :nickname, length: { maximum: 100 }
-  validates :description, length: { maximum: 200 }
-  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
-
-end
--- a/app/forms/projects/create_form.rb
+++ b/app/forms/projects/create_form.rb
@ -2,15 +2,11 @@ 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)
--- a/app/forms/projects/update_form.rb
+++ b/app/forms/projects/update_form.rb
@ -1,11 +1,4 @@
 class Projects::UpdateForm < BaseForm
-  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
+  attr_reader :name, :description, :repository_name, :project_category_id

 end
--- a/app/forms/users/login_form.rb
+++ b/app/forms/users/login_form.rb
@ -1,8 +0,0 @@
-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
--- a/app/helpers/admins/faqs_helper.rb
+++ b/app/helpers/admins/faqs_helper.rb
@ -1,2 +0,0 @@
-module Admins::FaqsHelper
-end
--- a/app/helpers/admins/projects_helper.rb
+++ b/app/helpers/admins/projects_helper.rb
@ -1,14 +0,0 @@
-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
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -35,6 +35,12 @@ module ApplicationHelper
    course.course_modules.find_by(module_type: "graduation").try(:id)
  end

+  # 是否关注
+  # from_user_id为被关注的用户
+  def follow?(from_user_id, user_id)
+    Watcher.where(watchable_type: 'Principal', watchable_id: from_user_id, user_id: user_id).exists?
+  end
+
  # git用户
  # git用户命名规则：login+"@educoder.net"
  def git_username(email)
@ -138,12 +144,17 @@ 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("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+        File.join(relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
      else
        File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
      end
    elsif source.class.to_s == 'User'
-      source.get_letter_avatar_url
+      str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
+      File.join(relative_path, "#{source.class}", str)
+    elsif source.class.to_s == 'Subject'
+      File.join("images","educoder", "index", "subject", "subject#{rand(17)}.jpg")
+    elsif source.class.to_s == 'Shixun'
+      File.join("images","educoder", "index", "shixun", "shixun#{rand(23)}.jpg")
    end
  end

@ -438,14 +449,4 @@ 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
--- a/app/helpers/helps/faqs_helper.rb
+++ b/app/helpers/helps/faqs_helper.rb
@ -1,2 +0,0 @@
-module Helps::FaqsHelper
-end
--- a/app/helpers/log_helper.rb
+++ b/app/helpers/log_helper.rb
@ -0,0 +1,2 @@
+module LogHelper
+end
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@ -34,14 +34,15 @@ module ProjectsHelper
  end

  def json_response(project, user)
-    repo = Repository.includes(:mirror).select(:id, :mirror_url, :source_clone_url).find_by(project: project)
+    # repo = project.repository
+    repo = Repository.includes(:mirror).select(:id, :mirror_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.remote_mirror_url,
+        mirror_url: repo.mirror_url,
        first_sync: repo.first_sync?
      })
    end
@ -89,4 +90,8 @@ module ProjectsHelper
  def render_educoder_avatar_url(project_educoder)
    [Rails.application.config_for(:configuration)['educoder']['cdn_url'], project_educoder&.image_url].join('/')
  end
+
+  def render_avatar_url(owner)
+    ['images', url_to_avatar(owner)].join('/')
+  end
 end
--- a/app/helpers/sponsor_tiers_helper.rb
+++ b/app/helpers/sponsor_tiers_helper.rb
@ -0,0 +1,2 @@
+module SponsorTiersHelper
+end
--- a/app/helpers/sponsorships_helper.rb
+++ b/app/helpers/sponsorships_helper.rb
@ -0,0 +1,2 @@
+module SponsorshipsHelper
+end
--- a/app/helpers/tag_chosen_helper.rb
+++ b/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 = "project-#{project.id}/all_issue_tags/size-#{project.issue_tags.size}/#{project.issue_tags.maximum('updated_at')}"
+    cache_key = "all_issue_tags/#{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 = "project-#{project.id}/all_milestones/size-#{project.versions.size}/#{project.versions.maximum('updated_on')}"
+    cache_key = "all_milestones/#{project.versions.maximum('updated_on')}"

    Rails.cache.fetch(cache_key) do
      project.versions.select(:id, :name, :status).collect do |event|
@ -124,13 +124,14 @@ module TagChosenHelper
  end

  def render_cache_collaborators(project)
-    cache_key = "project-#{project.id}/all_collaborators/size-#{project.all_collaborators.size}/#{project.all_collaborators.maximum('updated_on')}"
+    cache_key = "all_collaborators/#{project.members.maximum('created_on')}"
+
    Rails.cache.fetch(cache_key) do
-      project.all_collaborators.order(created_on: :desc).collect do |user|
+      project.members.includes(:user).collect do |event|
        {
-          id: user&.id,
-          name: user&.show_real_name,
-          avatar_url: url_to_avatar(user),
+          id: event.user&.id,
+          name: event.user&.show_real_name,
+          avatar_url: url_to_avatar(event.user),
          is_chosen: '0'
        }
      end
@ -170,8 +171,10 @@ module TagChosenHelper
      # depended_issues_id = @depended_issues_id

    end
+    project_members = project.members_user_infos
    project_members_info = []  #指派给
-    project.all_collaborators.includes(:user_extension).each do |user|
+    project_members.includes(user: :user_extension).each do |member|
+      user = member&.user
      if user
        real_name = user.try(:show_real_name)
        user_id = user.id
--- a/app/helpers/update_helper.rb
+++ b/app/helpers/update_helper.rb
@ -0,0 +1,6 @@
+module UpdateHelper
+  def old_value_to_hash(old_value, params)
+    params = params.dup.stringify_keys
+    old_value.attributes.select { |key, value| params.key?(key) }
+  end
+end
--- a/app/helpers/wallets_helper.rb
+++ b/app/helpers/wallets_helper.rb
@ -0,0 +1,2 @@
+module WalletsHelper
+end
--- a/app/interactors/projects/add_member_interactor.rb
+++ b/app/interactors/projects/add_member_interactor.rb
@ -23,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, role_name)
+          project.add_member!(collaborator.id)
        end
        fail!(nil)
      end
@ -38,20 +38,5 @@ module Projects
      @error = error
    end

-    def role_name
-      case permission 
-      when 'read'
-        'Reporter'
-      when 'write'
-        'Developer'
-      when 'admin'
-        'Manager'
-      when 'owner'
-        'Manager'
-      else 
-        'Reporter'
-      end
-    end
-
  end
 end
--- a/app/jobs/monthly_payment_worker.rb
+++ b/app/jobs/monthly_payment_worker.rb
@ -0,0 +1,15 @@
+class MonthlyPaymentWorker
+  include Sidekiq::Worker
+  include Sidetiq::Schedulable
+
+  recurrence do
+    minutely(2)
+    # monthly.day_of_month(12) #每月的12号0点执行
+    # monthly.day_of_month(23).hour_of_day(20)      #每月的12号1点执行
+  end
+
+  def perform(*args)
+    Sponsorship.monthly_payment
+    puts Time.now, 'sponsor payment done'
+  end
+end
--- a/app/jobs/reset_platform_cache_job.rb
+++ b/app/jobs/reset_platform_cache_job.rb
@ -1,14 +0,0 @@
-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
--- a/app/jobs/reset_user_cache_job.rb
+++ b/app/jobs/reset_user_cache_job.rb
@ -1,14 +0,0 @@
-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
--- a/app/jobs/send_join_project_applied_message_job.rb
+++ b/app/jobs/send_join_project_applied_message_job.rb
@ -1,27 +0,0 @@
-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
--- a/app/jobs/send_transfer_project_applied_message_job.rb
+++ b/app/jobs/send_transfer_project_applied_message_job.rb
@ -1,47 +0,0 @@
-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
--- a/app/jobs/sync_mirrored_repository_job.rb
+++ b/app/jobs/sync_mirrored_repository_job.rb
@ -5,27 +5,7 @@ class SyncMirroredRepositoryJob < ApplicationJob
    repo = Repository.find_by(id: repo_id)
    current_user = User.find_by(id: user_id)
    return if repo.blank? || current_user.blank?
-
-    # 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)
+    result = Gitea::Repository::SyncMirroredService.new(repo.owner.login, repo.identifier, token: current_user.gitea_token).call
    repo&.mirror.set_status! if result[:status] === 200
  end
-
 end
--- a/app/libs/educoder_oauth.rb
+++ b/app/libs/educoder_oauth.rb
@ -0,0 +1,18 @@
+module EducoderOauth
+  class << self
+    attr_accessor :client_id, :client_secret, :base_url, :redirect_uri
+
+    def logger
+      @_logger ||= STDOUT
+    end
+
+    def logger=(l)
+      @_logger = l
+    end
+
+    def oauth_url
+      "#{base_url}/oauth2?call_url=/oauth/authorize?client_id=#{client_id}&redirect_uri=#{URI.encode_www_form_component(redirect_uri)}&response_type=code"
+    end
+    
+  end
+end
--- a/app/libs/educoder_oauth/service.rb
+++ b/app/libs/educoder_oauth/service.rb
@ -0,0 +1,37 @@
+require 'oauth2'
+
+module EducoderOauth::Service
+  module_function
+
+  def request(method, url, params)
+    begin 
+      Rails.logger.info("[EducoderOauth] [#{method.to_s.upcase}] #{url} || #{params}")
+
+      client = Faraday.new(url: EducoderOauth.base_url)
+      response = client.public_send(method, url, params)
+      result = JSON.parse(response.body)
+
+      Rails.logger.info("[EducoderOauth] [#{response.status}] #{result}")
+
+      result
+    rescue Exception => e
+      raise Educoder::TipException.new(e.message)
+    end
+  end
+
+  def access_token(code)
+    begin
+      Rails.logger.info("[EducoderOauth] [code] #{code} ")
+      Rails.logger.info("[EducoderOauth] [redirect_uri] #{EducoderOauth.redirect_uri} ")
+      client = OAuth2::Client.new(EducoderOauth.client_id, EducoderOauth.client_secret, site: EducoderOauth.base_url)
+      result = client.auth_code.get_token(code, redirect_uri: EducoderOauth.redirect_uri).to_hash
+      return result
+    rescue Exception => e
+      raise Educoder::TipException.new(e.message)
+    end
+  end
+
+  def user_info(access_token)
+    request(:get, '/api/users/info.json', {access_token: access_token})
+  end
+end
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@ -16,12 +16,4 @@ class ApplicationRecord < ActiveRecord::Base
  def allow_sync_to_trustie?
    Rails.env.production? && EduSetting.get('host_name') == 'https://www.educoder.net'
  end
-
-  def reset_user_cache_async_job(user)
-    ResetUserCacheJob.perform_later(user)
-  end
-
-  def reset_platform_cache_async_job
-    ResetPlatformCacheJob.perform_later
-  end
 end
--- a/app/models/applied_message.rb
+++ b/app/models/applied_message.rb
@ -17,13 +17,7 @@
 #

 class AppliedMessage < ApplicationRecord
-  self.table_name = 'forge_applied_messages'
  belongs_to :user
  belongs_to :applied, polymorphic: true
-  belongs_to :project
-  belongs_to :applied_user, class_name: 'User'
-
-  enum viewed: {waiting: 0, viewed: 1}
-  enum status: {canceled: -1, common: 0, successed: 1, failure: 2} # -1 已取消 0 正在操作 1 操作成功 2 操作失败

 end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yystopf	9314d134be	资助激励功能	2021-04-08 18:53:19 +08:00
qyzh	b524111ae6	fix structure.sql	2021-04-08 18:41:31 +08:00
qyzh	244c1b865a	merge integrated_blockchain	2021-04-08 16:19:27 +08:00
qyzh	dafdbadb6b	fix bugs	2021-04-08 16:05:40 +08:00
jasder	2b0c987558	Merge branch 'develop' into trustie_server	2021-04-07 11:35:09 +08:00
jasder	6796805b21	Merge branch 'develop' into trustie_server	2021-04-02 18:58:08 +08:00
jasder	5752f19b2f	FIX gug	2021-04-02 18:56:44 +08:00
jasder	eb52f05417	集成educoder登陆	2021-04-02 18:46:15 +08:00
vilet.yy	786629dbff	fix	2021-04-02 18:41:48 +08:00
vilet.yy	7a00541375	Merge branch 'develop' into hh_develop	2021-04-02 18:41:37 +08:00
vilet.yy	1d832a1723	fix	2021-04-02 18:38:08 +08:00
vilet.yy	80ce40e492	fix	2021-04-02 18:33:31 +08:00
vilet.yy	91f6dae56a	fix	2021-04-02 18:24:20 +08:00
vilet.yy	8c5a834b14	Merge branch 'develop' into hh_develop	2021-04-02 18:22:32 +08:00
vilet.yy	57f420848e	Merge branch 'develop' into hh_develop	2021-04-02 18:20:41 +08:00
vilet.yy	fba58800a7	fix	2021-04-02 18:08:36 +08:00
vilet.yy	c4a43c4392	add: need edit user password	2021-04-02 16:44:36 +08:00
vilet.yy	1153bd5ab6	fix: set redirect_uri	2021-04-02 09:43:18 +08:00
vilet.yy	f732b0374c	fix: ceshi	2021-04-02 09:23:11 +08:00
vilet.yy	0d97d7d4f0	add: educoder third party	2021-04-01 18:01:51 +08:00
qyzh	bf68c1c544	add daily reward	2021-03-08 20:45:15 +08:00
qyzh	6de617d898	fix bugs, add test cases	2020-12-14 22:04:25 +08:00
qyzh	5addece8d5	fix bugs	2020-12-14 17:59:01 +08:00
qyzh	ffbe4942b7	delete some interface	2020-12-11 17:01:52 +08:00
qyzh	c963a80e8c	merge origin_trustie/master to dev	2020-12-03 17:24:52 +08:00
qyzh	01f15da5ed	fix bugs	2020-12-01 14:48:19 +08:00
qyzh	cd595646d8	新增：修改赞助关系	2020-11-09 20:42:58 +08:00
qyzh	1ac5498091	完成用户log	2020-10-20 19:58:08 +08:00
qyzh	faf2302b8e	sponsor tiers增删改查	2020-09-19 09:59:05 +08:00
qyzh	5433920724	Merge branch 'dev_trustie' of https://git.trustie.net/qyzh1996/forgeplus into dev_trustie	2020-09-13 14:48:45 +08:00
qyzh	0e33b12989	before update	2020-09-13 14:48:23 +08:00
wyx	1c45b48063	update model passed_waitlist	2020-07-25 12:19:16 +08:00
wyx	80d6cbf823	update model waitlist	2020-07-25 12:18:49 +08:00
wyx	0ebcf3d7f7	update model coin_change	2020-07-25 12:17:46 +08:00
wyx	0f69255422	update model wallet	2020-07-25 12:12:34 +08:00
wyx	d480deee64	update model stopped_sponsorship	2020-07-25 11:23:57 +08:00
wyx	50bef66261	update model sponsor_tier	2020-07-25 11:22:53 +08:00
wyx	9915c10bcf	update model user	2020-07-25 11:21:44 +08:00
wyx	c546eda537	update table waitlist and passed_waitlist	2020-07-25 10:57:45 +08:00
wyx	769bf2b90e	create passedlist	2020-07-24 17:51:14 +08:00
wyx	94ad4ce56c	create waitlist	2020-07-24 17:50:25 +08:00
wyx	98176f839d	create coinchange	2020-07-24 17:49:07 +08:00
wyx	33951af37d	create table wallet	2020-07-24 17:45:29 +08:00
wyx	46b906d2ac	create stoppedsponsorship	2020-07-24 17:40:58 +08:00
wyx	0a460d1d37	create sponsor_tier	2020-07-24 17:38:31 +08:00
wyx	cb089b1bb8	create table sponsorship	2020-07-24 17:21:16 +08:00
wyx	8e2cf4ecc0	add column to users	2020-07-24 16:58:25 +08:00
qyzh	38193dff54	Merge remote-tracking branch 'origin_trustie/dev_trustie' into dev_trustie	2020-07-15 10:55:16 +08:00
qyzh	e07dddde98	before merge	2020-07-15 10:55:13 +08:00