diff --git a/app/controllers/statistics_controller.rb b/app/controllers/statistics_controller.rb
index 2de38c25b..c26719056 100644
--- a/app/controllers/statistics_controller.rb
+++ b/app/controllers/statistics_controller.rb
@@ -48,6 +48,7 @@ class StatisticsController < ApplicationController
   # POST /statistics.json
   def create
     @statistic = Statistic.new(params[:statistic])
+    @statistic.user_id = User.current.id
     @statistic.save_attachments_containers(params[:attachments], User.current, true)
     respond_to do |format|
       if @statistic.save
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c1fb7da58..1fc455bd7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2110,7 +2110,7 @@ class UsersController < ApplicationController
       exercise_users = ExerciseUser.where(:user_id => @user.id, :exercise_id => exercises.map{|ex| ex.id})
       @unfinished_test_count = exercises.count - exercise_users.count
       # 用户待完成的问卷
-      polls =  Poll.where("polls_type = 'Course' and polls_group_id in #{my_course_ids} and polls_status = 2")
+      polls =  Poll.where("polls_type = 'Course' and course_id in #{my_course_ids} and polls_status = 2")
       poll_users = PollUser.where(:user_id => @user.id, :poll_id => polls.map{|poll| poll.id})
       @unfinished_poll_count = polls.count - poll_users.count
       # 用户待匿评的作品
diff --git a/app/models/statistic.rb b/app/models/statistic.rb
index e375f3230..136944c09 100644
--- a/app/models/statistic.rb
+++ b/app/models/statistic.rb
@@ -1,4 +1,8 @@
 class Statistic < ActiveRecord::Base
-  attr_accessible :description, :name, :status, :user_id
+  attr_accessible :description, :name, :status, :user_id, :main_category_id, :sub_category_id
   acts_as_attachable
+
+  def creator
+    User.find self.user_id
+  end
 end
diff --git a/app/views/statistics/_form.html.erb b/app/views/statistics/_form.html.erb
index f26aed35b..3c5b11c3f 100644
--- a/app/views/statistics/_form.html.erb
+++ b/app/views/statistics/_form.html.erb
@@ -85,7 +85,6 @@
     }
     //  获取子类别
     function getSubCategory(id){
-        alert(id);
         $.ajax({
             url: '<%= get_sub_category_statistics_path %>',
             type: 'get',
diff --git a/app/views/statistics/_sub_categories_list.html.erb b/app/views/statistics/_sub_categories_list.html.erb
new file mode 100644
index 000000000..50506cd54
--- /dev/null
+++ b/app/views/statistics/_sub_categories_list.html.erb
@@ -0,0 +1,4 @@
+<span class="active">不限</span>
+<% @sub_categories.each do |mc| %>
+    <span><a><%= mc.name %></a></span>
+<% end %>
\ No newline at end of file
diff --git a/app/views/statistics/get_sub_category.js.erb b/app/views/statistics/get_sub_category.js.erb
index 9e99b073e..4f9eb6ec4 100644
--- a/app/views/statistics/get_sub_category.js.erb
+++ b/app/views/statistics/get_sub_category.js.erb
@@ -1,5 +1,7 @@
 <% if @sub_categories.blank? %>
-$("#statistic_sub_category_id").hide();
+    $("#statistic_sub_category_id").hide();
+<% elsif params[:come_from] == "statistics_index" %>
+    $("#sub_categories_list").html('<%= j(render :partial => "sub_categories_list") %>');
 <% else %>
-$("#statistic_sub_category_id").html('<%= escape_javascript( render :partial => 'statistics/sub_category') %>');
+    $("#statistic_sub_category_id").html('<%= escape_javascript( render :partial => 'statistics/sub_category') %>');
 <% end %>
diff --git a/app/views/statistics/index.html.erb b/app/views/statistics/index.html.erb
index d2cff8adf..11ccb2299 100644
--- a/app/views/statistics/index.html.erb
+++ b/app/views/statistics/index.html.erb
@@ -5,17 +5,14 @@
     <div class="fl data_line">
       <span class="active">不限</span>
       <% @main_categories.each do |mc| %>
-          <span><%= mc.name %></span>
+          <span onclick="get_sub_categories(<%= mc.id %>);"><%= mc.name %></span>
       <% end %>
     </div>
   </div>
   <div class="data_half cl">
     <span class="fl data_name">子类型</span>
-    <div class="fl data_line">
-      <span class="active">不限</span>
-      <% @sub_categories.each do |mc| %>
-          <span><%= mc.name %></span>
-      <% end %>
+    <div class="fl data_line" id="sub_categories_list">
+      <%= render :partial => "sub_categories_list" %>
     </div>
   </div>
   <div class="data_half cl">
@@ -37,35 +34,37 @@
   <span class="fl f14 mt5 ml2">共<span class="c-blue">122</span>个检索结果</span>
   <%= link_to '+&nbsp;发布'.html_safe, new_statistic_path ,:class=>"fr send_statistic mr2" %>
 </div>
-<div class="data_list">
-    <div class="data_list_item cl pr">
-      <img src="https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=2138460373,2431522454&fm=58" width="50"class="fl">
-      <div class="homepagePostSetting" style="top: 10px;right: 12px">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li>编辑</li>
-              <li>删除</li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-      <div class="fl data_itemMain">
-        <span class="f16 mr10">数据名称1</span><span class="list_tag">标签1</span><span class="list_tag">标签2</span>
-        <p class="f13 mt5 mb5 data_detail">数据名称1的介绍数据名称1的介绍数据名称1的介绍数据名称1的介绍数据名称1的介绍数据名称1的介绍数据名称1的介绍数据名称1的介绍数据名称1的介绍数据名称1的介绍数据名称1的介绍</p>
-        <div class="f13 mt7">
-          <p class="mb5 c_grey"><a href="javascript:void(0)" class="mr10 attachment_file">附件1.docx</a>96KB</p>
-          <p class="mb5 c_grey"><a href="javascript:void(0)" class="mr10 attachment_file">附件1.docx</a>96KB</p>
-        </div>
-        <div class="data_info mt7 c_grey">
-          <span>蔡世</span>
-          <span>2018-02-06 15:51</span>
-          <span>开发数据</span>
-          <span>代码数据</span>
-        </div>
-      </div>
-    </div>
 
+<div class="data_list">
+
+  <% @statistics.each do |statistic| %>
+      <div class="data_list_item cl pr">
+        <img src="<%= url_to_avatar(statistic.creator) %>" width="50" class="fl">
+        <div class="homepagePostSetting" style="top: 10px;right: 12px">
+          <ul>
+            <li class="homepagePostSettingIcon">
+              <ul class="homepagePostSettiongText">
+                <li><%= link_to '编辑', edit_statistic_path(statistic) %></li>
+                <li><%= link_to '删除', statistic, method: :delete, data: { confirm: 'Are you sure?' } %></li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+        <div class="fl data_itemMain">
+          <span class="f16 mr10"> <%= link_to "#{statistic.name}", statistic %> </span>
+          <p class="f13 mt5 mb5 data_detail"><%= statistic.description %></p>
+          <div class="f13 mt7">
+            <%= render :partial => 'attachments',:locals => {:attachments => statistic.try(:attachments)} %>
+          </div>
+          <div class="data_info mt7 c_grey">
+            <span><%= statistic.creator.show_name %></span>
+            <span><%= statistic.created_at %></span>
+            <span>开发数据</span>
+            <span>代码数据</span>
+          </div>
+        </div>
+      </div>
+  <% end %>
   <div class="data_list_item cl pr">
     <img src="https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=2138460373,2431522454&fm=58" width="50"class="fl">
     <div class="homepagePostSetting" style="top: 10px;right: 12px">
@@ -93,6 +92,7 @@
       </div>
     </div>
   </div>
+
 </div>
 <table>
   <tr>
@@ -120,9 +120,14 @@
 
 <br />
 
-
-
 <script>
+    function get_sub_categories(id){
+        $.ajax({
+            url: "<%= get_sub_category_statistics_path(:come_from => "statistics_index") %>",
+            data: {main_category_id: id},
+            dataType: "script"
+        })
+    }
   function clear_search(){
       $("#search_input").val('').focus();
   }
diff --git a/db/schema.rb b/db/schema.rb
index cb4e0fd84..11d616f42 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -84,6 +84,34 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.integer "role",       :default => 0
   end
 
+  create_table "apply_actions", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "reason"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "dealer_id"
+    t.datetime "created_at",                                     :null => false
+    t.datetime "updated_at",                                     :null => false
+    t.integer  "status",         :limit => 1, :default => 0
+    t.text     "apply_reason"
+    t.boolean  "certification",               :default => false
+  end
+
+  create_table "apply_add_departments", :force => true do |t|
+    t.string   "name"
+    t.integer  "department_id"
+    t.integer  "school_id"
+    t.text     "remarks"
+    t.integer  "user_id"
+    t.integer  "status"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
+  add_index "apply_add_departments", ["department_id"], :name => "index_apply_add_departments_on_department_id"
+  add_index "apply_add_departments", ["school_id"], :name => "index_apply_add_departments_on_school_id"
+  add_index "apply_add_departments", ["user_id"], :name => "index_apply_add_departments_on_user_id"
+
   create_table "apply_add_schools", :force => true do |t|
     t.string   "name"
     t.string   "province"
@@ -129,6 +157,20 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.integer  "apply_user_id"
   end
 
+  create_table "apply_user_authentications", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "status"
+    t.integer  "auth_type"
+    t.string   "remarks"
+    t.integer  "dealer"
+    t.datetime "deal_time"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.boolean  "is_delete",  :default => false
+  end
+
+  add_index "apply_user_authentications", ["user_id"], :name => "index_apply_user_authentications_on_user_id"
+
   create_table "article_homepages", :force => true do |t|
     t.string   "title"
     t.text     "content"
@@ -180,23 +222,24 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
 
   create_table "attachments", :force => true do |t|
     t.integer  "container_id"
-    t.string   "container_type", :limit => 30
-    t.string   "filename",                     :default => "", :null => false
-    t.string   "disk_filename",                :default => "", :null => false
-    t.integer  "filesize",                     :default => 0,  :null => false
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => "", :null => false
-    t.integer  "downloads",                    :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
+    t.string   "container_type",   :limit => 30
+    t.string   "filename",                       :default => "", :null => false
+    t.string   "disk_filename",                  :default => "", :null => false
+    t.integer  "filesize",                       :default => 0,  :null => false
+    t.string   "content_type",                   :default => ""
+    t.string   "digest",           :limit => 40, :default => "", :null => false
+    t.integer  "downloads",                      :default => 0,  :null => false
+    t.integer  "author_id",                      :default => 0,  :null => false
     t.datetime "created_on"
     t.text     "description"
     t.string   "disk_directory"
-    t.integer  "attachtype",                   :default => 1
-    t.integer  "is_public",                    :default => 1
+    t.integer  "attachtype",                     :default => 1
+    t.integer  "is_public",                      :default => 1
     t.integer  "copy_from"
     t.integer  "quotes"
-    t.integer  "is_publish",                   :default => 1
+    t.integer  "is_publish",                     :default => 1
     t.datetime "publish_time"
+    t.integer  "resource_bank_id"
   end
 
   add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
@@ -228,6 +271,16 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
 
   add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
 
+  create_table "authentications", :force => true do |t|
+    t.integer "level",       :limit => 1
+    t.text    "permissions"
+  end
+
+  create_table "authentications_users", :force => true do |t|
+    t.integer "user_id"
+    t.integer "authentication_id"
+  end
+
   create_table "biding_projects", :force => true do |t|
     t.integer  "project_id"
     t.integer  "bid_id"
@@ -274,6 +327,7 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
     t.integer  "root_id"
+    t.integer  "visits",          :default => 0
   end
 
   add_index "blog_comments", ["root_id"], :name => "index_blog_comments_on_root_id"
@@ -329,6 +383,68 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.datetime "updated_at",       :null => false
   end
 
+  create_table "challenge_chooses", :force => true do |t|
+    t.text     "subject"
+    t.integer  "challenge_id"
+    t.string   "standard_answer"
+    t.text     "answer"
+    t.integer  "score"
+    t.integer  "difficult"
+    t.integer  "category"
+    t.integer  "position",        :default => 1
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  create_table "challenge_questions", :force => true do |t|
+    t.text     "option_name"
+    t.integer  "challenge_choose_id"
+    t.boolean  "right_key"
+    t.integer  "position",            :limit => 1
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+  end
+
+  create_table "challenge_samples", :force => true do |t|
+    t.string   "input"
+    t.string   "output"
+    t.integer  "challenge_id"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.integer  "game_id"
+  end
+
+  create_table "challenge_tags", :force => true do |t|
+    t.string   "name"
+    t.integer  "challenge_id"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.integer  "challenge_choose_id"
+  end
+
+  create_table "challenges", :force => true do |t|
+    t.integer  "shixun_id"
+    t.string   "subject"
+    t.text     "description"
+    t.integer  "user_id"
+    t.integer  "status",          :limit => 1,          :default => 0
+    t.integer  "position",        :limit => 1,          :default => 1
+    t.datetime "created_at",                                             :null => false
+    t.datetime "updated_at",                                             :null => false
+    t.text     "ready_knowledge", :limit => 2147483647
+    t.text     "task_pass",       :limit => 2147483647
+    t.text     "answer",          :limit => 2147483647
+    t.integer  "score",                                 :default => 100
+    t.integer  "visits",                                :default => 0
+    t.string   "path"
+    t.integer  "evaluation_way",                        :default => 0
+    t.integer  "difficulty",                            :default => 1
+    t.text     "pipeline_script"
+    t.string   "exec_path"
+    t.integer  "code_line"
+    t.integer  "st",              :limit => 1,          :default => 0
+  end
+
   create_table "changes", :force => true do |t|
     t.integer "changeset_id",                               :null => false
     t.string  "action",        :limit => 1, :default => "", :null => false
@@ -375,6 +491,15 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
 
   add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
 
+  create_table "choose_outputs", :force => true do |t|
+    t.integer  "challenge_choose_id"
+    t.integer  "user_id"
+    t.string   "answer"
+    t.boolean  "correct"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
   create_table "code_review_assignments", :force => true do |t|
     t.integer "issue_id"
     t.integer "change_id"
@@ -680,7 +805,12 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   end
 
   create_table "course_lists", :force => true do |t|
-    t.string "name"
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "user_id"
+    t.boolean  "is_admin",               :default => true
+    t.boolean  "support_shixuns_search", :default => false
   end
 
   create_table "course_messages", :force => true do |t|
@@ -700,6 +830,15 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   add_index "course_messages", ["course_message_type"], :name => "index_course_messages_on_course_message_type"
   add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
 
+  create_table "course_modules", :force => true do |t|
+    t.integer  "course_id"
+    t.string   "module_type"
+    t.integer  "position"
+    t.integer  "hidden"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
   create_table "course_statuses", :force => true do |t|
     t.integer  "changesets_count"
     t.integer  "watchers_count"
@@ -717,8 +856,8 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.string   "code"
     t.integer  "time"
     t.string   "extra"
-    t.datetime "created_at",                                    :null => false
-    t.datetime "updated_at",                                    :null => false
+    t.datetime "created_at",                                         :null => false
+    t.datetime "updated_at",                                         :null => false
     t.string   "location"
     t.string   "term"
     t.string   "string"
@@ -728,28 +867,34 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.string   "class_period"
     t.integer  "school_id"
     t.text     "description"
-    t.integer  "status",                         :default => 1
-    t.integer  "attachmenttype",                 :default => 2
+    t.integer  "status",                          :default => 1
+    t.integer  "attachmenttype",                  :default => 2
     t.integer  "lft"
     t.integer  "rgt"
-    t.integer  "is_public",         :limit => 1, :default => 1
-    t.integer  "inherit_members",   :limit => 1, :default => 1
-    t.integer  "open_student",                   :default => 0
-    t.integer  "outline",                        :default => 0
-    t.integer  "publish_resource",               :default => 0
-    t.integer  "is_delete",                      :default => 0
+    t.integer  "is_public",          :limit => 1, :default => 1
+    t.integer  "inherit_members",    :limit => 1, :default => 1
+    t.integer  "open_student",                    :default => 0
+    t.integer  "outline",                         :default => 0
+    t.integer  "publish_resource",                :default => 0
+    t.integer  "is_delete",                       :default => 0
     t.integer  "end_time"
     t.string   "end_term"
-    t.integer  "is_excellent",                   :default => 0
-    t.integer  "excellent_option",               :default => 0
-    t.integer  "is_copy",                        :default => 0
-    t.integer  "visits",                         :default => 0
+    t.integer  "is_excellent",                    :default => 0
+    t.integer  "excellent_option",                :default => 0
+    t.integer  "is_copy",                         :default => 0
+    t.integer  "visits",                          :default => 0
     t.integer  "syllabus_id"
     t.string   "invite_code"
     t.string   "qrcode"
-    t.integer  "qrcode_expiretime",              :default => 0
-    t.integer  "invite_code_halt",  :limit => 1, :default => 0
-    t.integer  "os_allow",                       :default => 0
+    t.integer  "qrcode_expiretime",               :default => 0
+    t.integer  "invite_code_halt",   :limit => 1, :default => 0
+    t.integer  "os_allow",                        :default => 0
+    t.float    "credit"
+    t.boolean  "is_end",                          :default => false
+    t.date     "end_date"
+    t.boolean  "choose_group_allow",              :default => false
+    t.boolean  "homepage_show",                   :default => false
+    t.integer  "course_list_id"
   end
 
   add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
@@ -839,6 +984,16 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.datetime "updated_at"
   end
 
+  create_table "departments", :force => true do |t|
+    t.string   "name"
+    t.integer  "school_id"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.boolean  "is_auth",    :default => false
+  end
+
+  add_index "departments", ["school_id"], :name => "index_departments_on_school_id"
+
   create_table "discipline_categories", :force => true do |t|
     t.integer "major_level"
     t.string  "name"
@@ -851,6 +1006,22 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "discusses", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "dis_type"
+    t.integer  "dis_id"
+    t.text     "content"
+    t.integer  "parent_id"
+    t.integer  "root_id"
+    t.integer  "praise_count"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.integer  "challenge_id"
+    t.integer  "reward"
+  end
+
+  add_index "discusses", ["user_id"], :name => "index_discusses_on_user_id"
+
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -915,6 +1086,22 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "evaluate_records", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "shixun_id"
+    t.integer  "game_id"
+    t.integer  "consume_time"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.float    "file_update"
+    t.float    "git_pull"
+    t.float    "create_pod"
+    t.float    "pod_execute"
+    t.float    "student_work"
+    t.float    "test_cases"
+    t.float    "retry"
+  end
+
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -925,6 +1112,54 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.integer  "score",                :default => -1
   end
 
+  create_table "exercise_bank_choices", :force => true do |t|
+    t.integer  "exercise_bank_question_id"
+    t.text     "choice_text"
+    t.integer  "choice_position"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  add_index "exercise_bank_choices", ["exercise_bank_question_id"], :name => "index_exercise_bank_choices_on_exercise_bank_question_id"
+
+  create_table "exercise_bank_questions", :force => true do |t|
+    t.text     "question_title"
+    t.integer  "question_type"
+    t.integer  "question_number"
+    t.integer  "question_score"
+    t.integer  "exercise_bank_id"
+    t.integer  "max_choices"
+    t.integer  "min_choices"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  add_index "exercise_bank_questions", ["exercise_bank_id"], :name => "index_exercise_bank_questions_on_exercise_bank_id"
+
+  create_table "exercise_bank_standard_answers", :force => true do |t|
+    t.integer  "exercise_bank_question_id"
+    t.integer  "exercise_bank_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "exercise_banks", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "user_id"
+    t.boolean  "is_public"
+    t.integer  "quotes"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "course_list_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  add_index "exercise_banks", ["course_list_id"], :name => "index_exercise_banks_on_course_list_id"
+  add_index "exercise_banks", ["user_id"], :name => "index_exercise_banks_on_user_id"
+
   create_table "exercise_choices", :force => true do |t|
     t.integer  "exercise_question_id"
     t.text     "choice_text"
@@ -972,15 +1207,35 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.integer  "exercise_status"
     t.integer  "user_id"
     t.integer  "time"
-    t.datetime "created_at",                          :null => false
-    t.datetime "updated_at",                          :null => false
+    t.datetime "created_at",                              :null => false
+    t.datetime "updated_at",                              :null => false
     t.datetime "publish_time"
     t.datetime "end_time"
     t.integer  "show_result"
     t.integer  "question_random",      :default => 0
     t.integer  "choice_random",        :default => 0
+    t.boolean  "is_public",            :default => false
+    t.boolean  "score_open",           :default => true
+    t.boolean  "answer_open",          :default => true
+    t.integer  "exercise_bank_id"
   end
 
+  create_table "experiences", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "score"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "first_level_disciplines", :force => true do |t|
+    t.integer "discipline_category_id"
+    t.string  "name"
+  end
+
+  add_index "first_level_disciplines", ["discipline_category_id"], :name => "index_first_level_disciplines_on_discipline_category_id"
+
   create_table "first_pages", :force => true do |t|
     t.string   "web_title"
     t.string   "title"
@@ -1045,6 +1300,58 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.datetime "created_at"
   end
 
+  create_table "game_codes", :force => true do |t|
+    t.integer  "game_id"
+    t.text     "original_code", :limit => 2147483647
+    t.text     "new_code",      :limit => 2147483647
+    t.string   "path"
+    t.datetime "created_at",                          :null => false
+    t.datetime "updated_at",                          :null => false
+    t.text     "current_code",  :limit => 2147483647
+  end
+
+  create_table "game_outputs", :force => true do |t|
+    t.integer  "code"
+    t.integer  "game_id"
+    t.text     "msg"
+    t.text     "out_put"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "games", :force => true do |t|
+    t.integer  "myshixun_id"
+    t.integer  "user_id"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
+    t.integer  "status",              :default => 0
+    t.integer  "final_score",         :default => 0
+    t.integer  "challenge_id"
+    t.datetime "open_time"
+    t.string   "identifier"
+    t.boolean  "answer_open",         :default => false
+    t.datetime "end_time"
+    t.integer  "retry_status",        :default => 0
+    t.string   "resubmit_identifier"
+  end
+
+  create_table "gitlab_urls", :force => true do |t|
+    t.integer  "myshixun_id"
+    t.string   "url"
+    t.string   "myshixun_identifier"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
+  create_table "grades", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "score"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
   create_table "groups_users", :id => false, :force => true do |t|
     t.integer "group_id", :null => false
     t.integer "user_id",  :null => false
@@ -1078,6 +1385,26 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
 
   add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
 
+  create_table "homework_bank_samples", :force => true do |t|
+    t.text     "input"
+    t.text     "output"
+    t.integer  "homework_bank_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  add_index "homework_bank_samples", ["homework_bank_id"], :name => "index_homework_bank_samples_on_homework_bank_id"
+
+  create_table "homework_bank_shixuns", :force => true do |t|
+    t.integer  "homework_bank_id"
+    t.integer  "shixun_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  add_index "homework_bank_shixuns", ["homework_bank_id"], :name => "index_homework_bank_shixuns_on_homework_bank_id"
+  add_index "homework_bank_shixuns", ["shixun_id"], :name => "index_homework_bank_shixuns_on_shixun_id"
+
   create_table "homework_bank_tests", :force => true do |t|
     t.text     "input"
     t.text     "output"
@@ -1092,17 +1419,23 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.string   "name"
     t.text     "description"
     t.integer  "homework_type"
-    t.integer  "quotes",                                    :default => 0
+    t.integer  "quotes",                                          :default => 0
     t.boolean  "is_public"
     t.string   "language"
-    t.text     "standard_code",       :limit => 2147483647
+    t.text     "standard_code",             :limit => 2147483647
     t.integer  "min_num"
     t.integer  "max_num"
     t.boolean  "base_on_project"
     t.string   "applicable_syllabus"
     t.integer  "homework_common_id"
-    t.datetime "created_at",                                               :null => false
-    t.datetime "updated_at",                                               :null => false
+    t.datetime "created_at",                                                     :null => false
+    t.datetime "updated_at",                                                     :null => false
+    t.text     "reference_answer"
+    t.integer  "syllabus_id"
+    t.text     "major_level"
+    t.text     "discipline_category_id"
+    t.text     "first_level_discipline_id"
+    t.integer  "course_list_id"
   end
 
   create_table "homework_commons", :force => true do |t|
@@ -1125,10 +1458,25 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.integer  "anonymous_appeal",  :default => 0
     t.integer  "homework_bank_id"
     t.boolean  "is_update",         :default => false
+    t.boolean  "is_public",         :default => false
+    t.text     "reference_answer"
+    t.boolean  "answer_public",     :default => true
+    t.datetime "archive_time"
+    t.boolean  "allow_late",        :default => true
+    t.datetime "late_time"
+    t.boolean  "work_public",       :default => true
+    t.text     "explanation"
   end
 
   add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
 
+  create_table "homework_commons_shixuns", :force => true do |t|
+    t.integer  "shixun_id"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
   create_table "homework_detail_groups", :force => true do |t|
     t.integer  "homework_common_id"
     t.integer  "min_num"
@@ -1143,18 +1491,21 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   create_table "homework_detail_manuals", :force => true do |t|
     t.float    "ta_proportion"
     t.integer  "comment_status"
-    t.date     "evaluation_start"
-    t.date     "evaluation_end"
+    t.datetime "evaluation_start"
+    t.datetime "evaluation_end"
     t.integer  "evaluation_num"
-    t.integer  "absence_penalty",    :default => 1
+    t.integer  "absence_penalty",        :default => 1
     t.integer  "homework_common_id"
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.integer  "no_anon_penalty",    :default => 1
-    t.integer  "appeal_penalty",     :default => 0
-    t.integer  "ta_mode",            :default => 1
-    t.float    "te_proportion",      :default => 1.0
-    t.boolean  "final_mode",         :default => false
+    t.datetime "created_at",                                :null => false
+    t.datetime "updated_at",                                :null => false
+    t.integer  "no_anon_penalty",        :default => 1
+    t.integer  "appeal_penalty",         :default => 0
+    t.integer  "ta_mode",                :default => 1
+    t.float    "te_proportion",          :default => 1.0
+    t.boolean  "final_mode",             :default => false
+    t.datetime "appeal_time"
+    t.boolean  "answer_open_evaluation", :default => false
+    t.boolean  "shixun_evaluation",      :default => false
   end
 
   create_table "homework_detail_programings", :force => true do |t|
@@ -1182,6 +1533,15 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
   add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
 
+  create_table "homework_reference_answers", :force => true do |t|
+    t.text     "answer"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "homework_reference_answers", ["homework_common_id"], :name => "index_homework_reference_answers_on_homework_common_id"
+
   create_table "homework_samples", :force => true do |t|
     t.text     "input"
     t.text     "output"
@@ -1209,6 +1569,29 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "ii", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "author_login"
+    t.string   "rep_identifier"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sonar_version",  :default => 0
+    t.string   "path"
+    t.string   "branch"
+    t.string   "language"
+    t.string   "sonar_name"
+  end
+
+  create_table "import_students", :force => true do |t|
+    t.string   "name"
+    t.string   "student_number"
+    t.integer  "course_id"
+    t.integer  "school_id"
+    t.integer  "status",         :default => 0
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+  end
+
   create_table "innodb_monitor", :id => false, :force => true do |t|
     t.integer "a"
   end
@@ -1388,16 +1771,25 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   add_index "major_courses", ["major_id"], :name => "index_major_courses_on_major_id"
 
   create_table "majors", :force => true do |t|
-    t.string  "major_code"
-    t.string  "name"
-    t.integer "first_level_discipline_id"
-    t.integer "discipline_category_id"
-    t.integer "major_level"
+    t.string   "major_code"
+    t.string   "name"
+    t.integer  "first_level_discipline_id"
+    t.integer  "discipline_category_id"
+    t.integer  "major_level"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "support_shixuns",           :default => false
   end
 
   add_index "majors", ["discipline_category_id"], :name => "index_majors_on_discipline_category_id"
   add_index "majors", ["first_level_discipline_id"], :name => "index_majors_on_first_level_discipline_id"
 
+  create_table "mark_downs", :force => true do |t|
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",                     :null => false
     t.integer "role_id",                       :null => false
@@ -1437,19 +1829,20 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at"
 
   create_table "memos", :force => true do |t|
-    t.integer  "forum_id",                         :null => false
+    t.integer  "forum_id",                                               :null => false
     t.integer  "parent_id"
-    t.string   "subject",                          :null => false
-    t.text     "content",                          :null => false
-    t.integer  "author_id",                        :null => false
-    t.integer  "replies_count", :default => 0
+    t.string   "subject",                                                :null => false
+    t.text     "content",       :limit => 2147483647,                    :null => false
+    t.integer  "author_id",                                              :null => false
+    t.integer  "replies_count",                       :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",          :default => false
-    t.boolean  "sticky",        :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "viewed_count",  :default => 0
+    t.boolean  "lock",                                :default => false
+    t.boolean  "sticky",                              :default => false
+    t.datetime "created_at",                                             :null => false
+    t.datetime "updated_at",                                             :null => false
+    t.integer  "viewed_count",                        :default => 0
     t.integer  "root_id"
+    t.integer  "reward"
   end
 
   add_index "memos", ["root_id"], :name => "index_memos_on_root_id"
@@ -1466,21 +1859,22 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
 
   create_table "messages", :force => true do |t|
-    t.integer  "board_id",                         :null => false
+    t.integer  "board_id",                                               :null => false
     t.integer  "parent_id"
-    t.string   "subject",       :default => "",    :null => false
-    t.text     "content"
+    t.string   "subject",                             :default => "",    :null => false
+    t.text     "content",       :limit => 2147483647
     t.integer  "author_id"
-    t.integer  "replies_count", :default => 0,     :null => false
+    t.integer  "replies_count",                       :default => 0,     :null => false
     t.integer  "last_reply_id"
-    t.datetime "created_on",                       :null => false
-    t.datetime "updated_on",                       :null => false
-    t.boolean  "locked",        :default => false
-    t.integer  "sticky",        :default => 0
+    t.datetime "created_on",                                             :null => false
+    t.datetime "updated_on",                                             :null => false
+    t.boolean  "locked",                              :default => false
+    t.integer  "sticky",                              :default => 0
     t.integer  "reply_id"
     t.integer  "quotes"
-    t.integer  "status",        :default => 0
+    t.integer  "status",                              :default => 0
     t.integer  "root_id"
+    t.integer  "visits",                              :default => 0
   end
 
   add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
@@ -1490,6 +1884,97 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
   add_index "messages", ["root_id"], :name => "index_messages_on_root_id"
 
+  create_table "mirror_repositories", :force => true do |t|
+    t.string   "mirrorID"
+    t.string   "name"
+    t.string   "main_type"
+    t.string   "tag"
+    t.text     "description"
+    t.integer  "status"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "mirror_repository_types", :force => true do |t|
+    t.integer  "mirror_type_id"
+    t.integer  "mirror_repository_id"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  add_index "mirror_repository_types", ["mirror_repository_id"], :name => "index_mirror_repository_types_on_mirror_repository_id"
+  add_index "mirror_repository_types", ["mirror_type_id"], :name => "index_mirror_repository_types_on_mirror_type_id"
+
+  create_table "mirror_types", :force => true do |t|
+    t.string   "name"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "mirror_update_records", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "mirror_repository_id"
+    t.string   "oldName"
+    t.string   "newName"
+    t.string   "oldType"
+    t.string   "newType"
+    t.text     "oldTag"
+    t.text     "newTag"
+    t.text     "oldDescription"
+    t.text     "newDescription"
+    t.integer  "oldStatus"
+    t.integer  "newStatus"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  add_index "mirror_update_records", ["mirror_repository_id"], :name => "index_mirror_update_records_on_mirror_repository_id"
+  add_index "mirror_update_records", ["user_id"], :name => "index_mirror_update_records_on_user_id"
+
+  create_table "mul_tests", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.string   "action"
+    t.integer  "time"
+    t.integer  "status",         :default => 0
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.string   "language"
+    t.integer  "num"
+    t.string   "indentifier"
+    t.string   "name"
+    t.integer  "shixun_id"
+  end
+
+  create_table "myshixun_members", :force => true do |t|
+    t.integer  "myshixun_id"
+    t.integer  "user_id"
+    t.integer  "role"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "myshixuns", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "shixun_id"
+    t.boolean  "is_public",   :default => true
+    t.integer  "user_id"
+    t.integer  "gpid"
+    t.integer  "visits",      :default => 0
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",      :default => 0
+    t.string   "identifier"
+    t.string   "commit_id"
+    t.datetime "modify_time"
+    t.datetime "reset_time"
+    t.boolean  "system_tip",  :default => false
+  end
+
+  add_index "myshixuns", ["user_id", "shixun_id"], :name => "index_myshixuns_on_user_id_and_shixun_id", :unique => true
+
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1685,6 +2170,21 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.integer  "allow_teacher",        :default => 0
   end
 
+  create_table "outputs", :force => true do |t|
+    t.integer  "code"
+    t.integer  "game_id"
+    t.text     "msg"
+    t.text     "out_put",           :limit => 2147483647
+    t.datetime "created_at",                                             :null => false
+    t.datetime "updated_at",                                             :null => false
+    t.integer  "test_set_position"
+    t.text     "actual_output"
+    t.boolean  "result"
+    t.boolean  "is_public"
+    t.integer  "query_index",                             :default => 1
+    t.integer  "compile_success",                         :default => 1
+  end
+
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1715,8 +2215,11 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   create_table "poll_users", :force => true do |t|
     t.integer  "user_id"
     t.integer  "poll_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
+    t.integer  "commit_status", :default => 0
+    t.datetime "start_at"
+    t.datetime "end_at"
   end
 
   create_table "poll_votes", :force => true do |t|
@@ -1731,17 +2234,21 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   create_table "polls", :force => true do |t|
     t.string   "polls_name"
     t.string   "polls_type"
-    t.integer  "polls_group_id"
+    t.integer  "course_id"
     t.integer  "polls_status"
     t.integer  "user_id"
-    t.datetime "published_at"
-    t.datetime "closed_at"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
+    t.datetime "publish_time"
+    t.datetime "end_time"
+    t.datetime "created_at",                           :null => false
+    t.datetime "updated_at",                           :null => false
     t.text     "polls_description"
     t.integer  "show_result",       :default => 1
+    t.integer  "exercise_bank_id"
+    t.boolean  "is_public",         :default => false
   end
 
+  add_index "polls", ["course_id"], :name => "index_polls_on_course_id"
+
   create_table "praise_tread_caches", :force => true do |t|
     t.integer  "object_id",   :null => false
     t.string   "object_type"
@@ -1902,6 +2409,29 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
   add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
 
+  create_table "question_banks", :force => true do |t|
+    t.text     "name"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "quotes"
+    t.integer  "user_id"
+    t.boolean  "is_public"
+    t.integer  "course_list_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "reference_materials", :force => true do |t|
+    t.string   "book"
+    t.string   "editor"
+    t.string   "press"
+    t.integer  "syllabus_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "reference_materials", ["syllabus_id"], :name => "index_reference_materials_on_syllabus_id"
+
   create_table "relative_memo_to_open_source_projects", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -1956,10 +2486,38 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.string  "identifier"
     t.boolean "is_default",                  :default => false
     t.boolean "hidden",                      :default => false
+    t.integer "shixun_id"
+    t.integer "myshixun_id"
   end
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "resource_banks", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "attachment_id"
+    t.string   "filename"
+    t.string   "disk_filename"
+    t.integer  "filesize"
+    t.string   "digest"
+    t.integer  "downloads"
+    t.integer  "user_id"
+    t.text     "description"
+    t.string   "disk_directory"
+    t.boolean  "is_public"
+    t.integer  "copy_from"
+    t.integer  "quotes"
+    t.string   "applicable_syllabus"
+    t.integer  "major_level"
+    t.integer  "discipline_category_id"
+    t.integer  "first_level_discipline_id"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.string   "content_type"
+  end
+
+  add_index "resource_banks", ["course_id"], :name => "index_resource_banks_on_course_id"
+  add_index "resource_banks", ["user_id"], :name => "index_resource_banks_on_user_id"
+
   create_table "rich_rich_files", :force => true do |t|
     t.datetime "created_at",                                 :null => false
     t.datetime "updated_at",                                 :null => false
@@ -1985,11 +2543,15 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   create_table "schools", :force => true do |t|
     t.string   "name"
     t.string   "province"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
+    t.datetime "created_at",                          :null => false
+    t.datetime "updated_at",                          :null => false
     t.string   "logo_link"
     t.string   "pinyin"
-    t.integer  "school_type", :default => 0
+    t.integer  "school_type",      :default => 0
+    t.string   "city"
+    t.string   "address"
+    t.boolean  "auto_users_trial", :default => false
+    t.string   "shool_code"
   end
 
   create_table "secdomains", :force => true do |t|
@@ -2060,6 +2622,76 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "shixun_major_courses", :force => true do |t|
+    t.integer  "shixun_id"
+    t.integer  "course_list_id"
+    t.integer  "major_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  add_index "shixun_major_courses", ["major_id"], :name => "index_shixun_major_courses_on_major_id"
+  add_index "shixun_major_courses", ["shixun_id"], :name => "index_shixun_major_courses_on_shixun_id"
+
+  create_table "shixun_members", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "shixun_id"
+    t.integer  "role"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "shixun_modifies", :force => true do |t|
+    t.integer  "shixun_id"
+    t.integer  "myshixun_id"
+    t.integer  "status",      :limit => 1, :default => 0
+    t.datetime "created_at",                              :null => false
+    t.datetime "updated_at",                              :null => false
+  end
+
+  create_table "shixun_ports", :force => true do |t|
+    t.integer  "shixun_id"
+    t.integer  "port"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "shixun_tags", :force => true do |t|
+    t.string   "name"
+    t.integer  "challenge_id"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "shixuns", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.text     "script"
+    t.boolean  "is_public",                            :default => true
+    t.integer  "user_id"
+    t.integer  "gpid"
+    t.integer  "visits",                               :default => 0
+    t.datetime "created_at",                                              :null => false
+    t.datetime "updated_at",                                              :null => false
+    t.integer  "changeset_num"
+    t.integer  "status",                               :default => 0
+    t.string   "language"
+    t.boolean  "authentication",                       :default => false
+    t.string   "identifier"
+    t.integer  "myshixun_count",                       :default => 0
+    t.text     "propaedeutics",  :limit => 2147483647
+    t.boolean  "webssh",                               :default => false
+    t.integer  "trainee",                              :default => 1
+    t.integer  "major_id"
+    t.boolean  "homepage_show",                        :default => false
+    t.boolean  "hidden",                               :default => false
+    t.integer  "fork_from"
+    t.boolean  "can_copy",                             :default => false
+    t.datetime "modify_time"
+    t.datetime "reset_time"
+    t.datetime "publish_time"
+  end
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -2100,6 +2732,32 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
 
   add_index "ssos", ["user_id"], :name => "index_ssos_on_user_id"
 
+  create_table "stage_shixuns", :force => true do |t|
+    t.integer  "subject_id"
+    t.integer  "stage_id"
+    t.integer  "shixun_id"
+    t.integer  "position"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "stage_shixuns", ["shixun_id"], :name => "index_stage_shixuns_on_shixun_id"
+  add_index "stage_shixuns", ["stage_id"], :name => "index_stage_shixuns_on_stage_id"
+  add_index "stage_shixuns", ["subject_id"], :name => "index_stage_shixuns_on_subject_id"
+
+  create_table "stages", :force => true do |t|
+    t.integer  "subject_id"
+    t.string   "name"
+    t.text     "description"
+    t.integer  "user_id"
+    t.integer  "position"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "stages", ["subject_id"], :name => "index_stages_on_subject_id"
+  add_index "stages", ["user_id"], :name => "index_stages_on_user_id"
+
   create_table "statistics", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -2162,9 +2820,14 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.integer  "is_delete",                                     :default => 0
     t.integer  "appeal_penalty",                                :default => 0
     t.boolean  "re_commit",                                     :default => false
+    t.text     "late_reason"
+    t.integer  "group_id",                                      :default => 0
+    t.integer  "myshixun_id"
+    t.datetime "update_time"
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
+  add_index "student_works", ["myshixun_id"], :name => "myshixun_id"
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
     t.integer  "student_work_id"
@@ -2246,6 +2909,25 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "subjects", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "user_id"
+    t.integer  "visits"
+    t.integer  "status"
+    t.integer  "course_list_id"
+    t.integer  "major_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.boolean  "hidden",         :default => false
+    t.text     "learning_notes"
+    t.string   "introduction"
+  end
+
+  add_index "subjects", ["course_list_id"], :name => "index_subjects_on_course_list_id"
+  add_index "subjects", ["major_id"], :name => "index_subjects_on_major_id"
+  add_index "subjects", ["user_id"], :name => "index_subjects_on_user_id"
+
   create_table "syllabus_members", :force => true do |t|
     t.integer  "rank"
     t.integer  "syllabus_id"
@@ -2258,12 +2940,23 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   add_index "syllabus_members", ["syllabus_id"], :name => "index_syllabus_members_on_syllabus_id"
   add_index "syllabus_members", ["user_id"], :name => "index_syllabus_members_on_user_id"
 
+  create_table "syllabus_update_records", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "syllabus_id"
+    t.integer  "property"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "syllabus_update_records", ["syllabus_id"], :name => "index_syllabus_update_records_on_syllabus_id"
+  add_index "syllabus_update_records", ["user_id"], :name => "index_syllabus_update_records_on_user_id"
+
   create_table "syllabuses", :force => true do |t|
     t.string   "title"
     t.text     "description"
     t.integer  "user_id"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
+    t.datetime "created_at",                               :null => false
+    t.datetime "updated_at",                               :null => false
     t.string   "eng_name"
     t.integer  "syllabus_type"
     t.integer  "credit"
@@ -2272,8 +2965,12 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.integer  "practice_hours"
     t.string   "applicable_major"
     t.string   "pre_course"
-    t.integer  "visits",           :default => 0
-    t.integer  "des_status",       :default => 0
+    t.integer  "visits",                    :default => 0
+    t.integer  "des_status",                :default => 0
+    t.integer  "major_level"
+    t.integer  "discipline_category_id"
+    t.integer  "first_level_discipline_id"
+    t.integer  "major_id"
   end
 
   add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
@@ -2315,6 +3012,34 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.string   "extra"
   end
 
+  create_table "test_sets", :force => true do |t|
+    t.string   "input"
+    t.text     "output"
+    t.integer  "challenge_id"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+    t.integer  "game_id"
+    t.string   "actual_output"
+    t.boolean  "is_public",     :default => true
+    t.boolean  "result",        :default => true
+    t.integer  "position"
+  end
+
+  create_table "tidings", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "trigger_user_id"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "parent_container_id"
+    t.string   "parent_container_type"
+    t.integer  "belong_container_id"
+    t.string   "belong_container_type"
+    t.integer  "status"
+    t.boolean  "viewed"
+    t.datetime "created_at",            :null => false
+    t.datetime "updated_at",            :null => false
+  end
+
   create_table "time_entries", :force => true do |t|
     t.integer  "project_id",  :null => false
     t.integer  "user_id",     :null => false
@@ -2406,6 +3131,7 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.string   "location_city"
     t.integer  "school_id"
     t.string   "description",        :default => ""
+    t.integer  "department_id"
   end
 
   add_index "user_extensions", ["user_id"], :name => "index_user_extensions_on_user_id"
@@ -2508,32 +3234,56 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
   end
 
   create_table "users", :force => true do |t|
-    t.string   "login",                           :default => "",    :null => false
-    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
-    t.string   "firstname",         :limit => 30, :default => "",    :null => false
-    t.string   "lastname",                        :default => "",    :null => false
-    t.string   "mail",              :limit => 60, :default => "",    :null => false
-    t.boolean  "admin",                           :default => false, :null => false
-    t.integer  "status",                          :default => 1,     :null => false
+    t.string   "login",                                    :default => "",    :null => false
+    t.string   "hashed_password",            :limit => 40, :default => "",    :null => false
+    t.string   "firstname",                  :limit => 30, :default => "",    :null => false
+    t.string   "lastname",                                 :default => "",    :null => false
+    t.string   "mail",                       :limit => 60, :default => "",    :null => false
+    t.boolean  "admin",                                    :default => false, :null => false
+    t.integer  "status",                                   :default => 1,     :null => false
     t.datetime "last_login_on"
-    t.string   "language",          :limit => 5,  :default => ""
+    t.string   "language",                   :limit => 5,  :default => ""
     t.integer  "auth_source_id"
     t.datetime "created_on"
     t.datetime "updated_on"
     t.string   "type"
     t.string   "identity_url"
-    t.string   "mail_notification",               :default => "",    :null => false
-    t.string   "salt",              :limit => 64
+    t.string   "mail_notification",                        :default => "",    :null => false
+    t.string   "salt",                       :limit => 64
     t.integer  "gid"
-    t.integer  "visits",                          :default => 0
-    t.integer  "excellent_teacher",               :default => 0
-    t.integer  "excellent_student",               :default => 0
+    t.integer  "visits",                                   :default => 0
+    t.integer  "excellent_teacher",                        :default => 0
+    t.integer  "excellent_student",                        :default => 0
+    t.string   "phone"
+    t.boolean  "authentication",                           :default => false
+    t.integer  "grade"
+    t.integer  "experience",                               :default => 0
+    t.string   "nickname"
+    t.boolean  "show_realname",                            :default => true
+    t.boolean  "professional_certification",               :default => false
+    t.string   "ID_number"
+    t.integer  "certification",                            :default => 0
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
+  create_table "users_authentications", :force => true do |t|
+    t.integer "user_id"
+    t.integer "authentication_id"
+  end
+
+  create_table "verification_codes", :force => true do |t|
+    t.string   "code"
+    t.integer  "code_type"
+    t.integer  "status"
+    t.string   "phone"
+    t.string   "email"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2586,6 +3336,14 @@ ActiveRecord::Schema.define(:version => 20180207065530) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "websshes", :force => true do |t|
+    t.integer  "myshixun_id"
+    t.string   "host"
+    t.integer  "port"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"