add: projects redirect to

fix

fix

.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

CHANGELOG.md

@@ -1,32 +1,5 @@
 # Changelog
 
-## [v3.0.2](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-04-23
-
-* BUGFIXES
-  * Fix 解决部分用户头像不显示问题
-  * Fix 解决代码库模块中最左侧目录中的文件定位加载不准确的问题
-  * FIX 解决团队管理页面中项目链接错误问题
-  * Fix 解决markdown格式文件显示问题
-  * Fix 解决组织名下创建项目报错的问题
-  * Fix 解决组织名下的项目，创建issue报错的问题
-  * Fix 解决组织名下创建团队提示信息信息显示错误问题
-  * Fix 解决点击组织图片时，链接加载错误问题
-  * Fix 修复查询版本库信息安全漏洞
-  * Fix 解决修复团队成员操作访问组织仓库报403错误的问题
-  * Fix 解决owners团队成员对仓库添加成功失败的问题
-
-* ENHANCEMENTS
-  * ADD 自动生产用户头像功能
-  * ADD 创建组织支持中文名称
-  * ADD 创建团建支持中文名称
-  * ADD 组织名称统一显示中文名
-  * ADD 团队名称统一显示中文名
-  * ADD 用户头像悬浮时展示相关信息
-  * ADD 项目详情页添加实践课程链接入口
-  * ADD README文件页面添加添加目录导航功能
-  * UPDATE 升级改版底部footer信息
-  * UPDATE 升级用户操作版本库权限
-
 ## [v3.0.1](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-03-19
 
 * BUGFIXES

Gemfile

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

Gemfile.lock

@@ -162,7 +162,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)
@@ -457,7 +456,6 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   kaminari (~> 1.1, >= 1.1.1)
-  letter_avatar
   listen (>= 3.0.5, < 3.2)
   mysql2 (>= 0.4.4, < 0.6.0)
   oauth2

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. 其他说明
 通过页面注册都第一个用户为平台管理员用户
 
 ## 页面展示

app/controllers/accounts_controller.rb

@@ -6,6 +6,20 @@ class AccountsController < ApplicationController
     render json: session
   end
 
+  # 为了同步平台上未注册gitea的用户
+  def gitea_register
+    Users::SyncGiteaForm.new(sync_gitea_params).validate!
+    user = User.find_by(login: sync_gitea_params[:login])
+    return render_error("该用户已同步协作平台") if user.gitea_token.present? && user.gitea_uid.present?
+    
+    result = create_gitea_user!(user, sync_gitea_params[:login], sync_gitea_params[:email], sync_gitea_params[:password])
+    
+    result[:user] ? render_ok : render_error(result[:message])
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(-1, e.message)
+  end
+
   # 其他平台同步注册的用户
   def remote_register
     username = params[:username]&.gsub(/\s+/, "")
@@ -341,6 +355,10 @@ class AccountsController < ApplicationController
     { login: pre + code, email: email, phone: phone }
   end
 
+  def sync_gitea_params
+    params.permit(:login, :email, :password)
+  end
+
   def user_params
     params.require(:user).permit(:login, :email, :phone)
   end

app/controllers/application_controller.rb

@@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base
 	DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
 	OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"
 
-	helper_method :current_user, :base_url
+	helper_method :current_user
 
 	# 所有请求必须合法签名
 	def check_sign
@@ -770,11 +770,6 @@ class ApplicationController < ActionController::Base
 		@repository ||= load_project&.repository
 	end
 
-	def base_url
-		request.base_url
-	end
-	
-
   private
 	def object_not_found
 		uid_logger("Missing template or cant't find record, responding with 404")

app/controllers/concerns/laboratory_helper.rb

@@ -35,15 +35,15 @@ module LaboratoryHelper
     # my_projects: "/users/#{current_user.try(:login)}/projects",
     #       my_projects: "https://www.trustie.net/users/#{current_user.try(:login)}/user_projectlist",
     {
-      new_syllabuses: "https://www.trustie.net/syllabuses/new",
-      new_course: "https://www.trustie.net/courses/new",
-      edit_account: "https://www.trustie.net/my/account",
-      my_courses: "https://www.trustie.net/users/#{current_user.try(:login)}/user_courselist",
+      new_syllabuses: "https://forge.educoder.net/syllabuses/new",
+      new_course: "https://forge.educoder.net/courses/new",
+      edit_account: "https://forge.educoder.net/my/account",
+      my_courses: "https://forge.educoder.net/users/#{current_user.try(:login)}/user_courselist",
       my_projects: "/users/#{current_user.try(:login)}/projects",
-      my_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations",
-      default_url: "https://www.trustie.net/",
-      tiding_url: "https://www.trustie.net/users/#{current_user.try(:login)}/user_messages",
-      register_url: "https://www.trustie.net/login?login=false"
+      my_organ: "https://forge.educoder.net/users/#{current_user.try(:login)}/user_organizations",
+      default_url: "https://www.educoder.net/",
+      tiding_url: "https://www.educoder.net/users/#{current_user.try(:login)}/user_tidings",
+      register_url: "https://www.educoder.net/user/register"
     }
   end
 end

app/controllers/concerns/register_helper.rb

@@ -2,8 +2,6 @@ module RegisterHelper
   extend ActiveSupport::Concern
 
   def autologin_register(username, email, password, platform= 'forge')
-    result = {message: nil, user: nil}
-
     user = User.new(admin: false, login: username, mail: email, type: "User")
     user.password = password
     user.platform = platform
@@ -11,20 +9,29 @@ module RegisterHelper
     
     return unless user.valid?
 
+    create_gitea_user!(user, username, email, password)
+  end
+
+  def create_gitea_user!(forge_user, username, email, password=random_password)
+    result = {message: nil, user: nil}
+
     interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
     if interactor.success?
       gitea_user = interactor.result
       result = Gitea::User::GenerateTokenService.call(username, password)
-      user.gitea_token = result['sha1']
-      user.gitea_uid = gitea_user[:body]['id']
-      if user.save!
-        UserExtension.create!(user_id: user.id)
-        result[:user] = {id: user.id, token: user.gitea_token}
+      forge_user.gitea_token = result['sha1']
+      forge_user.gitea_uid = gitea_user[:body]['id']
+      if forge_user.save
+        UserExtension.create!(user_id: forge_user.id) unless forge_user.user_extension.blank?
+        result[:user] = {id: forge_user.id, token: forge_user.gitea_token}
       end
     else
       result[:message] = interactor.error
     end
     result
   end
-
+  
+  def random_password
+    "#{Random.rand(11111111)}"
+  end
 end

app/controllers/forks_controller.rb

@@ -5,6 +5,14 @@ class ForksController < ApplicationController
 
   def create
     @new_project = Projects::ForkService.new(current_user, @project, params[:organization]).call
+
+    # TODO: fix Educoder shixun
+    if @new_project.persisted?
+      ProjectScore.create(:project_id => @new_project.id, :score => 0) if @new_project.project_score.nil?
+
+      project_info = ProjectInfo.new(:user_id => current_user.id, :project_id => @new_project.id)
+      @project.project_infos << project_info
+    end
   end
 
   private

app/controllers/main_controller.rb

@@ -21,6 +21,14 @@ class MainController < ApplicationController
       uid_logger("main start is #{cookies[:_educoder_session]}")
     end
 
+    if params[:path] && params[:path].start_with?('projects/')
+      project_id = params[:path].split("/")[1]
+      project = Project.find_by_id(project_id)
+      if project.present?
+        return redirect_to("/projects/#{project.owner.login}/#{project.identifier}", status: 301)
+      end
+    end
+
     # TODO: 这块之后需要整合，者架构重新变化，统一跳转到index后再路由分发
     if params[:path] && params[:path]&.include?("h5educoderbuild") && params[:path].split("/").first == "h5educoderbuild"
       render file: 'public/h5educoderbuild/index.html', :layout => false

app/controllers/members_controller.rb

@@ -7,7 +7,16 @@ class MembersController < ApplicationController
   before_action :check_member_not_exists!, only: %i[remove change_role]
 
   def create
+    if @user.gitea_token.blank?
+      result = Gitea::User::GetService.call(@user.login)
+      if result[:status] == :error
+        # gitea不存在用户@user,直接注册
+        user_result = create_gitea_user!(@user, @user.login, @user.mail)
+        return render_error(user_result[:message]) if user_result[:message]
+      end
+    end
     interactor = Projects::AddMemberInteractor.call(@project.owner, @project, @user)
+    
     render_response(interactor)
   rescue Exception => e
     uid_logger_error(e.message)
@@ -47,7 +56,7 @@ class MembersController < ApplicationController
   end
 
   def member_exists?
-    @project.members.exists?(params[:user_id])
+    @project.member?(params[:user_id])
   end
 
   def operate!
@@ -59,6 +68,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

app/controllers/organizations/base_controller.rb

@@ -21,7 +21,7 @@ class Organizations::BaseController < ApplicationController
   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
@@ -31,4 +31,4 @@ class Organizations::BaseController < ApplicationController
   def project_mark
     params[:repo_name] || params[:id]
   end
-end
+end

app/controllers/organizations/organizations_controller.rb

@@ -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
@@ -37,10 +36,8 @@ class Organizations::OrganizationsController < Organizations::BaseController
   def update
     ActiveRecord::Base.transaction do
       login = @organization.login
-      @organization.login = organization_params[:name] if organization_params[:name].present?
-      @organization.nickname = organization_params[:nickname] if organization_params[:nickname].present?
-      @organization.save!
-      @organization.organization_extension.update_attributes!(organization_params.except(:name, :nickname))
+      @organization.update!(login: organization_params[:name]) if organization_params[:name].present?
+      @organization.organization_extension.update_attributes!(organization_params.except(:name))
       Gitea::Organization::UpdateService.call(@organization.gitea_token, login, @organization.reload)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
     end
@@ -85,7 +82,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
   def organization_params
     params.permit(:name, :description, :website, :location,
                   :repo_admin_change_team_access, :visibility,
-                  :max_repo_creation, :nickname)
+                  :max_repo_creation)
   end
 
   def password

app/controllers/organizations/teams_controller.rb

@@ -33,10 +33,7 @@ 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)
@@ -63,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

app/controllers/projects_controller.rb

@@ -16,7 +16,6 @@ class ProjectsController < ApplicationController
     menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls")
     menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops")
     menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions")
-    menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources")
     menu.append(menu_hash_by_name("activity"))
     menu.append(menu_hash_by_name("setting")) if current_user.admin? || @project.manager?(current_user)
 
@@ -45,6 +44,13 @@ class ProjectsController < ApplicationController
       Projects::CreateForm.new(project_params).validate!
       @project = Projects::CreateService.new(current_user, project_params).call
 
+      # TODO: fix Educoder shixun
+      if @project.persisted?
+        ProjectScore.create(:project_id => @project.id, :score => 0) if @project.project_score.nil?
+
+        project_info = ProjectInfo.new(:user_id => current_user.id, :project_id => @project.id)
+        @project.project_infos << project_info
+      end
     end
   rescue Exception => e
     uid_logger_error(e.message)
@@ -183,7 +189,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
 

app/controllers/pull_requests_controller.rb

@@ -140,7 +140,7 @@ class PullRequestsController < ApplicationController
   end
 
   def pr_merge
-    return render_forbidden("你没有权限操作.") unless current_user.project_manager?(@project)
+    return render_forbidden("你没有权限操作.") if @project.reporter?(current_user)
 
     if params[:do].blank?
       normal_status(-1, "请选择合并方式")

app/controllers/users_controller.rb

@@ -2,9 +2,9 @@ class UsersController < ApplicationController
   include ApplicationHelper
   include Ci::DbConnectable
 
-  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard]
-  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard]
-  before_action :require_login, only: %i[me list sync_user_info]
+  before_action :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 change_password change_email]
   before_action :connect_to_ci_db, only: [:get_user_info]
   skip_before_action :check_sign, only: [:attachment_show]
 
@@ -56,9 +56,6 @@ class UsersController < ApplicationController
     @watchers = paginate(watchers)
   end
 
-  def hovercard
-  end
-
   def update
     @user = User.find params[:id]
     @user.update!(user_params)
@@ -236,23 +233,60 @@ class UsersController < ApplicationController
     render_ok
   end
 
-  def sync_user_info
+  # TODO: For Educoder
+  def change_password
     user = User.find_by_login params[:login]
-    return render_forbidden unless user === current_user
+    return render_error("用户 #{params[:login]} 不存在.") unless user === current_user
+
+    form_params= {
+      login: params[:login],
+      email: user&.mail,
+      password: params[:password],
+      user: user
+    }
+    Gitea::User::ChangePasswordForm.new(form_params).validate!
 
     sync_params = {
-      email: params[:email],
+      email: user&.mail,
       password: params[:password]
     }
 
-    Users::UpdateInfoForm.new(sync_params.merge(login: params[:login])).validate!
+    if sync_params.present?
+      interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
+      if interactor.success?
+        user.update!(password: params[:password], is_sync_pwd: true)
+        render_ok
+      else
+        render_error(interactor.error)
+      end
+    end
+  end
 
-    interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
-    if interactor.success?
-      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_EDIT_INFO)
-      render_ok
-    else
-      render_error(interactor.error)
+  # TODO: For Educoder
+  def change_email
+    user = User.find_by_login params[:login]
+    return render_error("用户 #{rq_params[:login]} 不存在.") unless user === current_user
+
+    form_params= {
+      login: params[:login],
+      email: user&.mail,
+      user: user
+    }
+
+    Gitea::User::ChangeEmailForm.new(form_params).validate!
+
+    sync_params = {
+      email: params[:email]
+    }
+
+    if sync_params.present?
+      interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
+      if interactor.success?
+        user.update!(mail: params[:email])
+        render_ok
+      else
+        render_error(interactor.error)
+      end
     end
   end
 

app/controllers/version_releases_controller.rb

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

app/forms/gitea/user/change_email_form.rb

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

app/forms/gitea/user/change_password_form.rb

@@ -0,0 +1,22 @@
+class Gitea::User::ChangePasswordForm
+  include ActiveModel::Model
+
+  attr_accessor :user
+  attr_accessor :email, :login, :password
+
+  validates :email, presence: true, format: { with: CustomRegexp::EMAIL }
+  validates :login, presence: true
+  validates :password, presence: true
+
+  # validate :check_old_password
+
+  def check_old_password
+     return if user.check_password?(old_password.to_s)
+
+     errors.add(:old_password, :password_error)
+  end
+
+  # def check_user!
+  #   user === current_user
+  # end
+end

app/forms/organizations/create_form.rb

@@ -1,8 +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, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
-
-end

app/forms/organizations/create_team_form.rb

@@ -1,8 +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, :authorize, presence: true
-  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
-
-end

app/forms/users/sync_gitea_form.rb

@@ -0,0 +1,19 @@
+class Users::SyncGiteaForm 
+  include ActiveModel::Model
+  
+  attr_accessor :login, :password, :email, :user
+
+  validates :login, :password, :email, presence: true
+
+  validate :check_user, :check_password
+
+  def check_user 
+    Rails.logger.info " ............ #{login}"
+    @user = User.find_by(login: login)
+    raise '用户不存在.' unless user.present?
+  end
+
+  def check_password 
+    raise '用户密码错误.' unless user.check_password?(password)
+  end
+end

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
 

app/helpers/projects_helper.rb

@@ -90,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

app/helpers/repositories_helper.rb

@@ -1,6 +1,7 @@
 module RepositoriesHelper
   def render_permission(user, project)
     return "Admin" if user&.admin?
+    return "Owner" if user === project.owner
     project.get_premission(user)
   end
 

app/models/concerns/watchable.rb

@@ -6,7 +6,6 @@ module Watchable
     has_many :watcher_users, through: :watchers, source: :user, validate: false
 
     scope :watched_by, -> (user_id) { includes(:watchers).where(watchers: { user_id: user_id }) }
-    scope :following, -> (user_id) { watched_by(user_id) }
   end
 
   def watched?(watchable)
@@ -22,24 +21,6 @@ module Watchable
     obj.destroy! if obj.present?
   end
 
-  # 我正在关注的、我追随的
-  def following
-    User.following(self.id)
-  end
-
-  def following_count
-    following.size
-  end
-
-  # 关注我的、我的粉丝、我的追随者
-  def followers
-    watcher_users
-  end
-
-  def followers_count
-    followers.size
-  end
-
   module ClassMethods
   end
 end

app/models/organization.rb

@@ -80,8 +80,8 @@ class Organization < Owner
 
   scope :with_visibility, ->(visibility) { joins(:organization_extension).where(organization_extensions: {visibility: visibility}) if visibility.present? }
 
-  def self.build(name, nickname, gitea_token=nil)
-    self.create!(login: name, nickname: nickname, gitea_token: gitea_token)
+  def self.build(name, gitea_token=nil)
+    self.create!(login: name, gitea_token: gitea_token)
   end
 
   def can_create_project?(user_id)
@@ -115,9 +115,7 @@ class Organization < Owner
   end
 
   def real_name
-    name = lastname + firstname
-    name = name.blank? ? (nickname.blank? ? login : nickname) : name
-    name.gsub(/\s+/, '').strip    #6.11 -hs
+    login
   end
 
   def show_real_name

app/models/project.rb

@@ -1,74 +1,73 @@
-# == Schema Information
-#
-# Table name: projects
-#
-#  id                     :integer          not null, primary key
-#  name                   :string(255)      default(""), not null
-#  description            :text(4294967295)
-#  homepage               :string(255)      default("")
-#  is_public              :boolean          default("1"), not null
-#  parent_id              :integer
-#  created_on             :datetime
-#  updated_on             :datetime
-#  identifier             :string(255)
-#  status                 :integer          default("1"), not null
-#  lft                    :integer
-#  rgt                    :integer
-#  inherit_members        :boolean          default("0"), not null
-#  project_type           :integer          default("0")
-#  hidden_repo            :boolean          default("0"), not null
-#  attachmenttype         :integer          default("1")
-#  user_id                :integer
-#  dts_test               :integer          default("0")
-#  enterprise_name        :string(255)
-#  organization_id        :integer
-#  project_new_type       :integer
-#  gpid                   :integer
-#  forked_from_project_id :integer
-#  forked_count           :integer          default("0")
-#  publish_resource       :integer          default("0")
-#  visits                 :integer          default("0")
-#  hot                    :integer          default("0")
-#  invite_code            :string(255)
-#  qrcode                 :string(255)
-#  qrcode_expiretime      :integer          default("0")
-#  script                 :text(65535)
-#  training_status        :integer          default("0")
-#  rep_identifier         :string(255)
-#  project_category_id    :integer
-#  project_language_id    :integer
-#  praises_count          :integer          default("0")
-#  watchers_count         :integer          default("0")
-#  issues_count           :integer          default("0")
-#  pull_requests_count    :integer          default("0")
-#  language               :string(255)
-#  versions_count         :integer          default("0")
-#  issue_tags_count       :integer          default("0")
-#  closed_issues_count    :integer          default("0")
-#  open_devops            :boolean          default("0")
-#  gitea_webhook_id       :integer
-#  open_devops_count      :integer          default("0")
-#  recommend              :boolean          default("0")
-#  platform               :integer          default("0")
-#  license_id             :integer
-#  ignore_id              :integer
-#  default_branch         :string(255)      default("master")
-#  website                :string(255)
-#  lesson_url             :string(255)
-#
-# Indexes
-#
-#  index_projects_on_forked_from_project_id  (forked_from_project_id)
-#  index_projects_on_identifier              (identifier)
-#  index_projects_on_is_public               (is_public)
-#  index_projects_on_lft                     (lft)
-#  index_projects_on_name                    (name)
-#  index_projects_on_platform                (platform)
-#  index_projects_on_project_type            (project_type)
-#  index_projects_on_recommend               (recommend)
-#  index_projects_on_rgt                     (rgt)
-#  index_projects_on_status                  (status)
-#  index_projects_on_updated_on              (updated_on)
+# == Schema Information
+#
+# Table name: projects
+#
+#  id                     :integer          not null, primary key
+#  name                   :string(255)      default(""), not null
+#  description            :text(4294967295)
+#  homepage               :string(255)      default("")
+#  is_public              :boolean          default("1"), not null
+#  parent_id              :integer
+#  created_on             :datetime
+#  updated_on             :datetime
+#  identifier             :string(255)
+#  status                 :integer          default("1"), not null
+#  lft                    :integer
+#  rgt                    :integer
+#  inherit_members        :boolean          default("0"), not null
+#  project_type           :integer          default("0")
+#  hidden_repo            :boolean          default("0"), not null
+#  attachmenttype         :integer          default("1")
+#  user_id                :integer
+#  dts_test               :integer          default("0")
+#  enterprise_name        :string(255)
+#  organization_id        :integer
+#  project_new_type       :integer
+#  gpid                   :integer
+#  forked_from_project_id :integer
+#  forked_count           :integer          default("0")
+#  publish_resource       :integer          default("0")
+#  visits                 :integer          default("0")
+#  hot                    :integer          default("0")
+#  invite_code            :string(255)
+#  qrcode                 :string(255)
+#  qrcode_expiretime      :integer          default("0")
+#  script                 :text(65535)
+#  training_status        :integer          default("0")
+#  rep_identifier         :string(255)
+#  project_category_id    :integer
+#  project_language_id    :integer
+#  license_id             :integer
+#  ignore_id              :integer
+#  praises_count          :integer          default("0")
+#  watchers_count         :integer          default("0")
+#  issues_count           :integer          default("0")
+#  pull_requests_count    :integer          default("0")
+#  language               :string(255)
+#  versions_count         :integer          default("0")
+#  issue_tags_count       :integer          default("0")
+#  closed_issues_count    :integer          default("0")
+#  open_devops            :boolean          default("0")
+#  gitea_webhook_id       :integer
+#  open_devops_count      :integer          default("0")
+#  recommend              :boolean          default("0")
+#  platform               :integer          default("0")
+#  default_branch         :string(255)      default("master")
+#  website                :string(255)
+#
+# Indexes
+#
+#  index_projects_on_forked_from_project_id  (forked_from_project_id)
+#  index_projects_on_identifier              (identifier)
+#  index_projects_on_is_public               (is_public)
+#  index_projects_on_lft                     (lft)
+#  index_projects_on_name                    (name)
+#  index_projects_on_platform                (platform)
+#  index_projects_on_project_type            (project_type)
+#  index_projects_on_recommend               (recommend)
+#  index_projects_on_rgt                     (rgt)
+#  index_projects_on_status                  (status)
+#  index_projects_on_updated_on              (updated_on)
 #
 
 class Project < ApplicationRecord
@@ -99,6 +98,7 @@ class Project < ApplicationRecord
   has_one :project_educoder, dependent: :destroy
 
   has_one :project_score, dependent: :destroy
+  has_many :project_infos, :dependent => :destroy
   has_one :repository, dependent: :destroy
   has_many :pull_requests, dependent: :destroy
   has_many :issue_tags, -> { order("issue_tags.created_at DESC") }, dependent: :destroy
@@ -158,7 +158,6 @@ class Project < ApplicationRecord
 
   #创建项目管理员
   def check_project_members
-    return if owner.is_a?(Organization)
     unless members.present? && members.exists?(user_id: self.user_id)
       member_params = {
         user_id: self.user_id,
@@ -240,12 +239,10 @@ class Project < ApplicationRecord
   end
 
   def get_premission user
-    return "Owner" if owner?(user)
-    return "Manager" if manager?(user)
-    return "Developer" if develper?(user)
-    return "Reporter" if reporter?(user)
+    permission = "Reporter"
+    member = members.find_by(user: user)
 
-    return ""
+    member&.roles&.last&.name || permission
   end
 
   def fork_project

app/models/project_info.rb

@@ -0,0 +1,8 @@
+class ProjectInfo < ActiveRecord::Base
+
+  belongs_to :project
+  belongs_to :user
+  validates_presence_of :project_id, :user_id
+  validates_uniqueness_of :project_id, :scope => :user_id
+
+end

app/models/project_unit.rb

@@ -16,7 +16,7 @@
 class ProjectUnit < ApplicationRecord
   belongs_to :project
 
-  enum unit_type: {code: 1, issues: 2, pulls: 3, devops: 4, versions: 5, resources: 6}
+  enum unit_type: {code: 1, issues: 2, pulls: 3, devops: 4, versions: 5}
 
   validates :unit_type, uniqueness: { scope: :project_id}
 

app/models/team.rb

@@ -14,7 +14,6 @@
 #  gtid                   :integer
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
-#  nickname               :string(255)
 #
 # Indexes
 #

app/models/user.rb

@@ -68,7 +68,6 @@ class User < Owner
   include Likeable
   include BaseModel
   include Droneable
-  include User::Avatar
   # include Searchable::Dependents::User
 
   # devops step
@@ -137,6 +136,10 @@ class User < Owner
 
   has_many :attachments,foreign_key: :author_id, :dependent => :destroy
 
+  # 关注
+  # has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注
+  # has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户
+
   has_one :ci_cloud_account, class_name: 'Ci::CloudAccount', dependent: :destroy
 
   # 认证
@@ -188,10 +191,6 @@ class User < Owner
   validate :validate_sensitive_string
   validate :validate_password_length
 
-  def name
-    login
-  end
-  
   # 删除自动登录的token，一旦退出下次会提示需要登录
   def delete_autologin_token(value)
     Token.where(:user_id => id, :action => 'autologin', :value => value).delete_all
@@ -206,7 +205,7 @@ class User < Owner
   end
 
   def project_manager?(project)
-    project.manager?(self) || self.admin?
+    project.managers.exists?(user: self) || self.admin?
   end
 
   # 学号

app/models/user/avatar.rb

@@ -1,43 +0,0 @@
-require 'letter_avatar/has_avatar'
-require 'chinese_pinyin'
-
-class User
-  module Avatar
-    extend ActiveSupport::Concern
-    include LetterAvatar::HasAvatar
-
-    def username
-      self.lastname.blank? ? self.login :  Pinyin.t(self.lastname)
-    end
-
-    def get_letter_avatar_url(size = :lg)
-      avatar_path(self.username, size).split('public/')&.last
-    end
-
-    def self.get_letter_avatar_url(name)
-      return "" if name.blank?
-      avatar = LetterAvatar.generate Pinyin.t(name), 120
-      avatar.split('public/')&.last
-    end
-    
-    def avatar_path(username, size)
-      LetterAvatar.generate username, avatar_size(size)
-    end
-    
-    # 返回头像尺寸
-    # xs: 22px
-    # sm: 32px
-    # md: 48px
-    # lg: 120px
-    def avatar_size(size)
-      case size
-      when :xs then 22
-      when :sm then 32
-      when :md then 48
-      when :lg then 120
-      else size
-      end
-    end
-
-  end
-end

app/models/version.rb

@@ -24,7 +24,7 @@
 #
 
 class Version < ApplicationRecord
-  belongs_to :project, counter_cache: true
+  belongs_to :project, counter_cache: true, optional: true
   has_many :issues, class_name: "Issue", foreign_key: "fixed_version_id"
   belongs_to :user, optional: true
 

app/services/gitea/user/get_service.rb

@@ -0,0 +1,33 @@
+class Gitea::User::GetService < Gitea::ClientService
+  attr_reader :username
+  # params:
+  # username*	string # required
+  def initialize(username)
+    @username = username
+  end
+
+  def call
+    response = get(url, params)
+
+    status, message, body = render_response(response)
+    json_format(status, message, body)
+  end
+
+  private
+  def url
+    "/users/#{username}"
+  end
+
+  def params
+    {username: username}
+  end
+  
+
+  def json_format(status, message, body)
+    case status
+    when 200 then success(body)
+    else
+      error(message, status)
+    end
+  end
+end

app/services/organizations/create_service.rb

@@ -47,7 +47,7 @@ class Organizations::CreateService < ApplicationService
   end
 
   def create_org_and_extension
-    @organization = Organization.build(params[:name], params[:nickname], user.gitea_token)
+    @organization = Organization.build(params[:name], user.gitea_token)
     org_extension = OrganizationExtension.build(organization.id, description, website,
                                                 location, repo_admin_change_team_access,
                                                 visibility, max_repo_creation)

app/services/organizations/teams/update_service.rb

@@ -27,7 +27,7 @@ class Organizations::Teams::UpdateService < ApplicationService
     if team.authorize == "owner"
       update_params = params.slice(:description)
     else
-      update_params = params.slice(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project)
+      update_params = params.slice(:name, :description, :authorize, :includes_all_project, :can_create_org_project)
     end
     update_params
   end

app/services/projects/fork_service.rb

@@ -24,8 +24,6 @@ class Projects::ForkService < ApplicationService
       new_repository.identifier = @project.identifier
       new_repository.save!
 
-      ProjectUnit.init_types(clone_project.id)
-
       result = Gitea::Repository::ForkService.new(@project.owner, @target_owner, @project.identifier, @organization).call
 
       @project.update_column('forked_count', @project&.forked_count.to_i + 1)

app/views/admins/laboratories/shared/_laboratory_item.html.erb

@@ -9,11 +9,11 @@
   <% end %>
 </td>
 <td>
-  <% if school && school.identifier.present? %>
-    <%= link_to school.identifier.to_s, statistics_college_path(school.identifier), target: '_blank' %>
-  <% else %>
+  <%# if school && school.identifier.present? %>
+    <%#= link_to school.identifier.to_s, statistics_college_path(school.identifier), target: '_blank' %>
+  <%# else %>
     --
-  <% end %>
+  <%# end %>
 </td>
 <td class="member-container">
   <div class="laboratory-user">

app/views/organizations/organizations/_detail.json.jbuilder

@@ -1,6 +1,5 @@
 json.id organization.id
 json.name organization.login
-json.nickname organization.nickname.blank? ? organization.name : organization.nickname
 json.description organization.description
 json.website organization.website
 json.location organization.location

app/views/organizations/team_projects/_detail.json.jbuilder

@@ -1,7 +1,6 @@
 json.id team_project.id
 json.project do
-  json.owner_login team_project&.project&.owner&.login
-  json.owner_name team_project&.project&.owner&.real_name
+  json.owner_name team_project&.project&.owner&.login
   json.owner_image_url url_to_avatar(team_project&.project&.owner)
   json.name team_project&.project&.name
   json.identifier team_project&.project&.identifier

app/views/organizations/teams/_detail.json.jbuilder

@@ -1,6 +1,5 @@
 json.id team.id
 json.name team.name
-json.nickname team.nickname.blank? ? team.name : team.nickname
 json.description team.description
 json.authorize team.authorize
 json.includes_all_project team.includes_all_project

app/views/projects/_project_detail.json.jbuilder

@@ -26,7 +26,7 @@ json.author do
     json.name user.try(:show_real_name)
     json.type user&.type
     json.login user.login
-    json.image_url url_to_avatar(user)
+    json.image_url render_avatar_url(user)
   end
 end
 

app/views/projects/index.json.jbuilder

@@ -25,10 +25,9 @@ json.projects @projects do |project|
       json.image_url render_educoder_avatar_url(project.project_educoder)
     else
       user = project.owner
-      json.type user.type
       json.name user.try(:show_real_name)
       json.login user.login
-      json.image_url url_to_avatar(user)
+      json.image_url render_avatar_url(user)
     end
   end
 

app/views/projects/update.json.jbuilder

@@ -5,5 +5,4 @@ json.description @project.description
 json.project_category_id @project.project_category_id
 json.project_language_id @project.project_language_id
 json.is_public @project.is_public
-json.website @project.website
-json.lesson_url @project.lesson_url
+json.website @project.website

app/views/pull_requests/_commit.json.jbuilder

@@ -1,11 +1,11 @@
 json.author do
-  author = User.find_by(mail: commit['Author']['Email'])
-  json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] }
+  author = User.find_by(login: commit['Author']['Name'])
+  json.partial! 'repositories/commit_author', locals: { user: author }
 end
 
 json.committer do
-  author = User.find_by(mail: commit['Committer']['Email'])
-  json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] }
+  author = User.find_by(login: commit['Committer']['Name'])
+  json.partial! 'repositories/commit_author', locals: { user: author }
 end
 json.timestamp render_unix_time(commit['Committer']['When'])
 json.time_from_now time_from_now(commit['Committer']['When'])

app/views/repositories/_commit_author.json.jbuilder

@@ -7,5 +7,5 @@ else
   json.id nil
   json.login name 
   json.name name 
-  json.image_url User::Avatar.get_letter_avatar_url(name)
+  json.image_url File.join("avatars/User","b")
 end

app/views/repositories/commits.json.jbuilder

@@ -5,15 +5,12 @@ else
   json.total_count @hash_commit[:total_count]
   json.commits do
     json.array! @hash_commit[:body] do |commit|
+      json.commit1 commit
       commiter = commit['committer']
-
-      forge_user = 
-        if commiter.present? 
-          User.simple_select.find_by(mail: commiter['email'])
-        else
-          User.simple_select.find_by(mail: commit['commit']['committer']['email'])
-        end
-        
+      if commiter.present? 
+        commit_user_id = commiter['id']
+        forge_user = User.simple_select.find_by(gitea_uid: commit_user_id)
+      end
       json.sha commit['sha']
       json.message commit['commit']['message']
       json.timestamp render_unix_time(commit['commit']['author']['date'])
@@ -26,7 +23,7 @@ else
           json.login commit['commit']['author']['name']
           json.type nil
           json.name commit['commit']['author']['name']
-          json.image_url User::Avatar.get_letter_avatar_url(commit['commit']['author']['name'])
+          json.image_url File.join("avatars/User","b")
         end
       end
     end

app/views/repositories/detail.json.jbuilder

@@ -1,6 +1,5 @@
 json.content @project.content
 json.website @project.website
-json.lesson_url @project.lesson_url
 if @result[:readme].blank?
   json.readme nil
 else

app/views/repositories/edit.json.jbuilder

@@ -6,5 +6,4 @@ json.project_category_id @project.project_category_id
 json.project_language_id @project.project_language_id
 json.private !@project.is_public
 json.website @project.website
-json.project_units @project.project_units.pluck(:unit_type)
-json.lesson_url @project.lesson_url
+json.project_units @project.project_units.pluck(:unit_type)

app/views/users/courses/index.json.jbuilder

@@ -0,0 +1,3 @@
+
+json.count @count
+json.courses @courses, partial: 'users/courses/shared/course', as: :course

app/views/users/courses/shared/_course.json.jbuilder

@@ -0,0 +1,18 @@
+json.id course.id
+json.name course.name
+# json.members_count course.members_count
+json.members_count course.course_members_count
+# json.homework_commons_count course.homework_commons_count
+json.homework_commons_count get_tasks_count course
+json.attachments_count course.attachments.count
+json.visits course.visits
+json.school course.school&.name
+
+json.first_category_url module_url(course.course_modules.where(hidden: 0).order(position: :desc).first, course)
+
+json.is_public course.is_public
+json.can_visited observed_logged_user? || course.can_visited?
+
+json.teacher do
+  json.partial! 'users/shared/real_user', user: course.teacher
+end

app/views/users/get_user_info.json.jbuilder

@@ -5,11 +5,13 @@ json.user_id @user.id
 json.image_url url_to_avatar(@user)
 json.admin @user.admin?
 json.is_teacher @user.user_extension&.teacher?
+json.has_gitea_user @user.gitea_token.present? && @user.gitea_uid.present?
+json.is_sync_pwd @user.is_sync_pwd
 json.user_identity @user.identity
 json.tidding_count 0
 json.user_phone_binded @user.phone.present?
 # json.phone @user.phone
-# json.email @user.mail
+json.email @user.mail
 json.profile_completed @user.profile_completed?
 json.professional_certification @user.professional_certification
 json.devops_step @user.devops_step

app/views/users/hovercard.json.jbuilder

@@ -1,20 +0,0 @@
-json.id @user.id
-json.login @user.login
-json.name @user.full_name
-json.location @user.location
-json.image_url url_to_avatar(@user)
-json.url "#{request.base_url }/users/#{@user.login}"
-json.followers_count @user.followers_count
-json.followers_url "#{base_url}/users/#{@user.login}/fan_users"
-json.following_count @user.following_count
-json.following_url "#{base_url}/users/#{@user.login}/watchers"
-json.projects_count @user.projects_count
-json.projects_url "#{base_url}/users/#{@user.login}"
-json.projects_count @user.projects_count
-json.is_watch current_user&.watched?(@user)
-json.organizations @user.organizations do |organization|
-  json.login organization.login
-  json.name organization.real_name
-  json.image_url url_to_avatar(organization)
-  json.url "#{base_url}/organize/#{organization.login}"
-end

app/views/users/shixuns/index.json.jbuilder

@@ -0,0 +1,3 @@
+
+json.count @count
+json.shixuns @shixuns, partial: 'users/shixuns/shared/shixun', as: :shixun, locals: { user: observed_user }

app/views/users/shixuns/shared/_shixun.json.jbuilder

@@ -0,0 +1,10 @@
+json.id shixun.id
+json.identifier shixun.identifier
+json.tag shixun.first_tag_repertoire&.name
+json.image_url url_to_avatar(shixun)
+json.name shixun.name
+json.status shixun.status
+json.human_status shixun.human_status
+json.challenges_count shixun.challenges_count
+json.finished_challenges_count @finished_challenges_count_map&.fetch(shixun.id, 0) || shixun.finished_challenges_count(user)
+json.is_jupyter shixun.is_jupyter

app/views/users/videos/_video.json.jbuilder

@@ -0,0 +1,6 @@
+json.extract! video, :id, :title, :cover_url, :file_url, :play_url, :vv, :user_id
+
+json.play_duration video.video_play_duration
+json.published_at video.display_published_at
+json.created_at video.display_created_at
+json.updated_at video.display_updated_at

app/views/users/videos/index.json.jbuilder

@@ -0,0 +1,2 @@
+json.count @count
+json.videos @videos, partial: 'video', as: :video

app/views/users/videos/review.json.jbuilder

@@ -0,0 +1,7 @@
+json.count @count
+json.videos do
+  json.array! @videos.each do |video|
+    json.partial! 'video', video: video
+    json.file_url nil
+  end
+end

app/views/users/videos/update.json.jbuilder

@@ -0,0 +1 @@
+json.partial! 'video', video: current_video

app/views/version_releases/index.json.jbuilder

@@ -17,8 +17,8 @@ json.releases do
         json.tarball_url re["tarball_url"]
         json.zipball_url re["zipball_url"]
         json.draft re["draft"] ? "草稿" : (re["prerelease"] ? "预发行" : "稳定")
-        json.created_at format_time(version.created_at.to_s.to_time)
-        json.published_at format_time(version.created_at.to_s.to_time)
+        json.created_at format_time(re["created_at"].to_s.to_time)
+        json.published_at format_time(re["published_at"].to_s.to_time)
         json.user_name user.present? ? user.try(:show_real_name) : ""
         json.image_url user.present? ? url_to_avatar(user) : ""
       else
@@ -33,8 +33,8 @@ json.releases do
           json.tarball_url re["tarball_url"]
           json.zipball_url re["zipball_url"]
           json.draft re["draft"] ? "草稿" : (re["prerelease"] ? "预发行" : "稳定")
-          json.created_at format_time(version.created_at.to_s.to_time)
-          json.published_at format_time(version.created_at.to_s.to_time)
+          json.created_at format_time(re["created_at"].to_s.to_time)
+          json.published_at format_time(re["published_at"].to_s.to_time)
           json.user_name user.present? ? user.try(:show_real_name) : ""
           json.image_url user.present? ? url_to_avatar(user) : ""
         end

app/views/weapps/code_sessions/create.json.jbuilder

@@ -0,0 +1,3 @@
+json.user do
+  json.partial! 'weapps/shared/user', locals: { user: current_user }
+end

app/views/weapps/courses/basic_info.json.jbuilder

@@ -0,0 +1,8 @@
+json.course do
+  json.(@course, :id, :name)
+  json.code_halt @course.invite_code_halt == 1
+  json.invite_code @course.invite_code_halt == 0 ? @course.generate_invite_code : ""
+  json.teacher_name @course.teacher.real_name
+  json.teacher_img url_to_avatar(@course.teacher)
+  json.teacher_school @course.school.try(:name)
+end

app/views/weapps/courses/course_activities.json.jbuilder

@@ -0,0 +1,12 @@
+json.activities @activities do |activity|
+  json.(activity, :course_act_id, :course_act_type)
+  json.author do
+    user = activity.user
+    json.name user.real_name
+    json.login user.login
+    json.img url_to_avatar(user)
+  end
+  json.created_at activity.created_at.strftime('%m-%d %H:%M:')
+  json.container_name activity.container_name
+  json.container_type activity.course_act_type == "HomeworkCommon" ? activity.course_act&.homework_type : ""
+end

app/views/weapps/courses/edit.json.jbuilder

@@ -0,0 +1,2 @@
+json.(@course, :id, :name, :credit, :end_date)
+json.course_list_name @course.course_list&.name

app/views/weapps/courses/shixun_homework_category.json.jbuilder

@@ -0,0 +1,3 @@
+json.categories @categories.each do |category|
+  json.(category, :id, :name)
+end

app/views/weapps/courses/show.json.jbuilder

@@ -0,0 +1,4 @@
+json.(@course, :id, :name, :course_members_count, :credit, :invite_code_halt)
+json.teachers_count @course.teachers.count
+json.students_count @course.students.count
+json.course_identity @current_user.course_identity(@course)

app/views/weapps/courses/students.json.jbuilder

@@ -0,0 +1,7 @@
+json.students student_list @students, @course.excellent, @user_course_identity
+json.students_count @students_count
+if @course_group
+  json.course_group do
+    json.(@course_group, :id, :name, :invite_code, :course_members_count)
+  end
+end

app/views/weapps/courses/teachers.json.jbuilder

@@ -0,0 +1,3 @@
+json.teacher_list teacher_list(@teacher_list, @user_course_identity)
+json.teacher_list_size @teacher_list_size
+json.apply_size @applications_size

app/views/weapps/homes/show.json.jbuilder

@@ -0,0 +1,30 @@
+json.carousels do
+  json.array! @carousels do |carousel|
+    json.extract! carousel, :id, :link, :position
+
+    json.path carousel.link
+    json.image_url Util::FileManage.source_disk_file_url(carousel)
+  end
+end
+
+if @advert.present?
+  json.advert do
+    json.extract! @advert, :id, :link
+    json.image_url Util::FileManage.source_disk_file_url(@advert)
+  end
+else
+  json.advert nil
+end
+
+json.course_count @course_count
+json.courses @courses.each do |course|
+  json.(course, :id, :name, :visits, :course_members_count, :is_end, :invite_code_halt)
+  json.creator course.teacher.real_name
+  json.avatar_url url_to_avatar(course.teacher)
+  json.invite_code course.invite_code_halt == 0 ? course.generate_invite_code : ""
+  json.school course.school&.name
+  course_member = @category == "study" ? course.students.where(user_id: @user.id).first : course.teachers.where(user_id: @user.id).first
+  json.sticky course_member.sticky
+  json.course_identity current_user.course_identity(course)
+end
+

app/views/weapps/registers/create.json.jbuilder

@@ -0,0 +1,4 @@
+json.status 0
+json.user do
+  json.partial! 'weapps/shared/user', locals: { user: @user }
+end

app/views/weapps/searchs/index.json.jbuilder

@@ -0,0 +1,14 @@
+json.count @results.total_count
+json.results do
+  json.array! @results.with_highlights(multiple: true) do |obj, highlights|
+    json.merge! obj.to_searchable_json
+    json.type obj.class.name.downcase
+
+    json.title highlights.delete(:name)&.join('...') || obj.searchable_title
+    json.cover url_to_avatar(obj)
+
+    if obj.is_a?(Course)
+      json.author_avatar_url url_to_avatar(obj.teacher)
+    end
+  end
+end

app/views/weapps/sessions/create.json.jbuilder

@@ -0,0 +1,3 @@
+json.user do
+  json.partial! 'weapps/shared/user', locals: { user: current_user }
+end

app/views/weapps/shared/_user.json.jbuilder

@@ -0,0 +1,15 @@
+json.username user.full_name
+json.real_name user.real_name
+json.login user.login
+json.user_id user.id
+json.image_url url_to_avatar(user)
+json.admin user.admin?
+json.business user.business?
+json.is_teacher user.user_extension&.teacher?
+json.user_identity user.identity
+json.identity user.user_extension&.identity
+json.tidding_count 0
+json.user_phone_binded user.phone.present?
+json.phone user.phone
+json.profile_completed user.profile_completed?
+json.professional_certification user.professional_certification

app/views/weapps/unbind_accounts/show.json.jbuilder

@@ -0,0 +1 @@
+json.user_account @user.phone.present? ? @user.phone : (@user.mail.present? ? @user.mail : @user.login)

config/initializers/letter_avatar.rb

@@ -1,9 +0,0 @@
-LetterAvatar.setup do |config|
-  config.fill_color        = 'rgba(255, 255, 255, 1)' # default is 'rgba(255, 255, 255, 0.65)'
-  config.cache_base_path   = 'public/system/lets'     # default is 'public/system'
-  config.colors_palette    = :iwanthue                # default is :google
-  # config.weight            = 500                      # default is 300
-  config.annotate_position = '-0+10'                  # default is -0+5
-  # config.letters_count     = 2                        # default is 1
-  config.pointsize         = 300
-end

config/locales/forms/change_password_form.zh-CN.yml

@@ -0,0 +1,17 @@
+'zh-CN':
+  activemodel:
+    attributes:
+      gitea/user/change_password_form:
+        user: ''
+        email: 邮箱
+        login: 用户名
+        old_password: 旧密码
+        password: 新密码
+    errors:
+      models:
+        gitea/user/change_password_form:
+          attributes:
+            old_password:
+              password_error: 错误
+            user:
+              not_exist: 不存在

config/routes.rb

@@ -185,6 +185,7 @@ Rails.application.routes.draw do
         get :logout
         get :get_verification_code
         get :valid_email_and_phone
+        post :gitea_register
         post :remote_register
         post :remote_update
         post :remote_login
@@ -198,7 +199,6 @@ Rails.application.routes.draw do
         get :projects
         get :watch_users
         get :fan_users
-        get :hovercard
       end
       collection do
         post :following
@@ -219,7 +219,8 @@ Rails.application.routes.draw do
         post :sync_salt
         get :trustie_projects
         get :trustie_related_projects
-        post :sync_user_info
+        post :change_password
+        post :change_email
 
         scope '/ci', module: :ci do
           scope do

db/migrate/20191212110933_add_platform_to_users.rb

@@ -1,5 +1,5 @@
 class AddPlatformToUsers < ActiveRecord::Migration[5.2]
   def change
-    # add_column :users, :platform, :string, default: 0
+    add_column :users, :platform, :string, default: 0
   end
 end

db/migrate/20191213091840_add_gitea_token_to_users.rb

@@ -1,5 +1,5 @@
 class AddGiteaTokenToUsers < ActiveRecord::Migration[5.2]
   def change
-    # add_column :users, :gitea_token, :string
+    add_column :users, :gitea_token, :string
   end
 end

db/migrate/20191218024615_add_project_category_id_and_project_language_id_to_projects.rb

@@ -1,6 +1,6 @@
 class AddProjectCategoryIdAndProjectLanguageIdToProjects < ActiveRecord::Migration[5.2]
   def change
-    # add_column :projects, :project_category_id, :integer
-    # add_column :projects, :project_language_id, :integer
+    add_column :projects, :project_category_id, :integer
+    add_column :projects, :project_language_id, :integer
   end
 end

db/migrate/20191220092618_add_user_ref_to_repository.rb

@@ -1,7 +1,7 @@
 class AddUserRefToRepository < ActiveRecord::Migration[5.2]
   def change
-    # add_column :repositories, :user_id, :integer
-    # add_index :repositories, :user_id
+    add_column :repositories, :user_id, :integer
+    add_index :repositories, :user_id
 
     Project.joins(:repository).find_each do |project|
       project&.repository&.update_column(:user_id, project&.user_id) unless project&.repository.blank?

db/migrate/20191223031855_add_gitea_uid_to_users.rb

@@ -1,5 +1,5 @@
 class AddGiteaUidToUsers < ActiveRecord::Migration[5.2]
   def change
-    # add_column :users, :gitea_uid, :integer
+    add_column :users, :gitea_uid, :integer
   end
 end

db/migrate/20191223063139_add_mirror_url_to_repositories.rb

@@ -1,5 +1,5 @@
 class AddMirrorUrlToRepositories < ActiveRecord::Migration[5.2]
   def change
-    # add_column :repositories, :mirror_url, :string
+    add_column :repositories, :mirror_url, :string
   end
 end

db/migrate/20191224064403_create_issue_tags.rb

@@ -1,14 +1,14 @@
 class CreateIssueTags < ActiveRecord::Migration[5.2]
   def change
-    # create_table :issue_tags do |t|
-    #   t.string :title
-    #   t.string :description
-    #   t.string :color
-    #   t.integer :user_id
-    #   t.integer :project_id
-    #   t.integer :issues_count,default: 0
-    #   t.timestamps
-    # end
-    # add_index :issue_tags, [:user_id, :title,:project_id]
+    create_table :issue_tags do |t|
+      t.string :title
+      t.string :description
+      t.string :color
+      t.integer :user_id
+      t.integer :project_id
+      t.integer :issues_count,default: 0
+      t.timestamps
+    end
+    add_index :issue_tags, [:user_id, :title,:project_id]
   end
 end

db/migrate/20191225125634_add_praises_count_to_projects.rb

@@ -1,5 +1,5 @@
 class AddPraisesCountToProjects < ActiveRecord::Migration[5.2]
   def change
-    # add_column :projects, :praises_count, :integer, :default => 0
+    add_column :projects, :praises_count, :integer, :default => 0
   end
 end

db/migrate/20191227084951_add_issues_type_and_token.rb

@@ -1,8 +1,8 @@
 class AddIssuesTypeAndToken < ActiveRecord::Migration[5.2]
   def change
-    # add_column :issues, :issue_type, :string
-    # add_column :issues, :token, :string
-    # add_column :issues, :issue_tag_ids, :string
+    add_column :issues, :issue_type, :string
+    add_column :issues, :token, :string
+    add_column :issues, :issue_tag_ids, :string
 
   end
 end

db/migrate/20191227105755_rename_issue_tag_title.rb

@@ -1,5 +1,5 @@
 class RenameIssueTagTitle < ActiveRecord::Migration[5.2]
   def change
-    # rename_column :issue_tags, :title, :name
+    rename_column :issue_tags, :title, :name
   end
 end

db/migrate/20191227140150_create_issue_tags_relates.rb

@@ -1,10 +1,10 @@
 class CreateIssueTagsRelates < ActiveRecord::Migration[5.2]
   def change
-    # create_table :issue_tags_relates do |t|
-    #   t.integer :issue_id
-    #   t.integer :issue_tag_id
-    #   t.timestamps
-    # end
-    # add_index :issue_tags_relates, [:issue_id, :issue_tag_id]
+    create_table :issue_tags_relates do |t|
+      t.integer :issue_id
+      t.integer :issue_tag_id
+      t.timestamps
+    end
+    add_index :issue_tags_relates, [:issue_id, :issue_tag_id]
   end
 end

db/migrate/20191227162744_rename_issues_issue_tag_ids.rb

@@ -1,5 +1,5 @@
 class RenameIssuesIssueTagIds < ActiveRecord::Migration[5.2]
   def change
-    # rename_column :issues, :issue_tag_ids, :issue_tags_value
+    rename_column :issues, :issue_tag_ids, :issue_tags_value
   end
 end

db/migrate/20200103062707_create_issue_times.rb

@@ -1,13 +1,13 @@
 class CreateIssueTimes < ActiveRecord::Migration[5.2]
   def change
-    # create_table :issue_times do |t|
-    #   t.integer :issue_id
-    #   t.integer :user_id
-    #   t.datetime :start_time
-    #   t.datetime :end_time
-    #   t.string :cost_time
-    #   t.timestamps
-    # end
-    # add_index :issue_times, [:issue_id, :user_id]
+    create_table :issue_times do |t|
+      t.integer :issue_id
+      t.integer :user_id
+      t.datetime :start_time
+      t.datetime :end_time
+      t.string :cost_time
+      t.timestamps
+    end
+    add_index :issue_times, [:issue_id, :user_id]
   end
 end

db/migrate/20200103113839_add_is_lock_to_issue.rb

@@ -1,5 +1,5 @@
 class AddIsLockToIssue < ActiveRecord::Migration[5.2]
   def change
-    # add_column :issues, :is_lock, :boolean, default: false
+    add_column :issues, :is_lock, :boolean, default: false
   end
 end

db/migrate/20200106022235_add_watchers_count_to_projects.rb

@@ -1,5 +1,5 @@
 class AddWatchersCountToProjects < ActiveRecord::Migration[5.2]
   def change
-    # add_column :projects, :watchers_count, :integer, :default => 0
+    add_column :projects, :watchers_count, :integer, :default => 0
   end
 end

db/migrate/20200106082806_create_version_releases.rb

@@ -1,18 +1,18 @@
 class CreateVersionReleases < ActiveRecord::Migration[5.2]
   def change
-    # create_table :version_releases do |t|
-    #   t.integer :user_id
-    #   t.string :name
-    #   t.text :body
-    #   t.string :tag_name
-    #   t.string :target_commitish
-    #   t.boolean :draft, default: false
-    #   t.boolean :prerelease, default: false
-    #   t.string :tarball_url
-    #   t.string :zipball_url
-    #   t.string :url
-    #   t.string :version_gid
-    #   t.timestamps
-    # end
+    create_table :version_releases do |t|
+      t.integer :user_id
+      t.string :name
+      t.text :body
+      t.string :tag_name
+      t.string :target_commitish
+      t.boolean :draft, default: false
+      t.boolean :prerelease, default: false
+      t.string :tarball_url
+      t.string :zipball_url
+      t.string :url
+      t.string :version_gid
+      t.timestamps
+    end
   end
 end

db/migrate/20200106093141_add_project_id_to_version_release.rb

@@ -1,6 +1,6 @@
 class AddProjectIdToVersionRelease < ActiveRecord::Migration[5.2]
   def change
-    # add_column :version_releases, :repository_id, :integer
-    # add_index :version_releases, [:repository_id]
+    add_column :version_releases, :repository_id, :integer
+    add_index :version_releases, [:repository_id]
   end
 end

db/migrate/20200108015358_add_column_to_issue_tags.rb

@@ -1,6 +1,6 @@
 class AddColumnToIssueTags < ActiveRecord::Migration[5.2]
   def change
-    # add_column :issue_tags, :gid, :integer
-    # add_column :issue_tags, :gitea_url, :string
+    add_column :issue_tags, :gid, :integer
+    add_column :issue_tags, :gitea_url, :string
   end
 end

db/migrate/20200108025756_add_column_to_pull_requests.rb

@@ -1,8 +1,8 @@
 class AddColumnToPullRequests < ActiveRecord::Migration[5.2]
   def change
-    # add_column :pull_requests, :version_id, :integer
-    # add_column :pull_requests, :body, :text
-    # add_column :pull_requests, :from_ref, :string
-    # add_column :pull_requests, :to_ref, :string
+    add_column :pull_requests, :version_id, :integer
+    add_column :pull_requests, :body, :text
+    add_column :pull_requests, :from_ref, :string
+    add_column :pull_requests, :to_ref, :string
   end
 end