FIX code review

app/models/laboratory.rb

@@ -44,7 +44,7 @@ class Laboratory < ApplicationRecord
 
   def site
     rails_env = EduSetting.get('rails_env')
-    suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.trustie.net" : '.trustie.net'
+    suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.gitlink.org.cn" : '.gitlink.org.cn'
 
     identifier ? "#{identifier}#{suffix}" : ''
   end
@@ -74,74 +74,6 @@ class Laboratory < ApplicationRecord
     RequestStore.store[:current_laboratory] ||= User.anonymous
   end
 
-  def shixuns
-    if main_site?
-      not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{Laboratory.current.id}")
-      Shixun.where.not(id: not_shixun_ids.pluck(:shixun_id))
-    elsif sync_shixun
-      laboratory_shixun_ids = laboratory_shixuns.pluck(:shixun_id)
-      school_shixun_ids = Shixun.joins("join user_extensions on shixuns.user_id=user_extensions.user_id").where(user_extensions: { school_id: school_id }).pluck(:id)
-      shixun_ids = laboratory_shixun_ids + school_shixun_ids
-      Shixun.where(id: shixun_ids.uniq)
-    else
-      Shixun.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: id })
-    end
-  end
-
-  def subjects
-    if main_site?
-      not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{Laboratory.current.id}")
-      Subject.where.not(id: not_subject_ids.pluck(:subject_id))
-    elsif sync_subject
-      laboratory_subject_ids = laboratory_subjects.pluck(:subject_id)
-      school_subject_ids = Subject.joins("join user_extensions on subjects.user_id=user_extensions.user_id").where(user_extensions: { school_id: school_id }).pluck(:id)
-      subject_ids = laboratory_subject_ids + school_subject_ids
-      Subject.where(id: subject_ids.uniq)
-    else
-      Subject.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: id })
-    end
-  end
-
-  def all_courses
-    main_site? || !sync_course ? courses : courses.or(Course.where(school_id: school_id))
-  end
-
-  def shixun_repertoires
-    where_sql = ShixunTagRepertoire.where("shixun_tag_repertoires.tag_repertoire_id = tag_repertoires.id")
-
-    # 云上实验室过滤
-    unless main_site?
-      where_sql = where_sql.joins("JOIN laboratory_shixuns ls ON ls.shixun_id = shixun_tag_repertoires.shixun_id "\
- 																	"AND ls.laboratory_id = #{id}")
-    end
-    where_sql = where_sql.select('1').to_sql
-    tags = TagRepertoire.where("EXISTS(#{where_sql})").distinct.includes(sub_repertoire: :repertoire)
-
-    tags_map = tags.group_by(&:sub_repertoire)
-    sub_reps_map = tags_map.keys.group_by(&:repertoire)
-
-    sub_reps_map.keys.sort_by(&:updated_at).reverse.map do |repertoire|
-      repertoire_hash = repertoire.as_json(only: %i[id name])
-      repertoire_hash[:sub_repertoires] =
-        sub_reps_map[repertoire].sort_by(&:updated_at).reverse.map do |sub_repertoire|
-          sub_repertoire_hash = sub_repertoire.as_json(only: %i[id name])
-          sub_repertoire_hash[:tags] = tags_map[sub_repertoire].sort_by(&:updated_at).reverse.map { |tag| tag.as_json(only: %i[id name]) }
-          sub_repertoire_hash
-        end
-      repertoire_hash
-    end
-  end
-
-  def subject_repertoires
-    exist_sql = Subject.where('subjects.repertoire_id = repertoires.id')
-
-    unless main_site?
-      exist_sql = exist_sql.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: id })
-    end
-
-    Repertoire.where("EXISTS(#{exist_sql.select('1').to_sql})").order(updated_at: :desc).distinct
-  end
-
   # 是否为主站
   def main_site?
     id == 1

app/models/token.rb

@@ -1,19 +1,19 @@
-# == Schema Information
-#
-# Table name: tokens
-#
-#  id         :integer          not null, primary key
-#  user_id    :integer          default("0"), not null
-#  action     :string(30)       default(""), not null
-#  value      :string(40)       default(""), not null
-#  created_on :datetime         not null
-#
-# Indexes
-#
-#  index_tokens_on_user_id  (user_id)
-#  tokens_value             (value) UNIQUE
-#
-
+# == Schema Information
+#
+# Table name: tokens
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          default("0"), not null
+#  action     :string(30)       default(""), not null
+#  value      :string(40)       default(""), not null
+#  created_on :datetime         not null
+#
+# Indexes
+#
+#  index_tokens_on_user_id  (user_id)
+#  tokens_value             (value) UNIQUE
+#
+
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -105,7 +105,7 @@ class Token < ActiveRecord::Base
   end
 
   def self.generate_token_value
-    Educoder::Utils.random_hex(20)
+    Gitlink::Utils.random_hex(20)
   end
 
   def self.delete_user_all_tokens(user)

app/models/user.rb

@@ -690,7 +690,7 @@ class User < Owner
   end
 
   def self.generate_salt
-    Educoder::Utils.random_hex(16)
+    Gitlink::Utils.random_hex(16)
   end
 
   # 全部已认证