Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

app/controllers/account_controller.rb

@@ -436,7 +436,15 @@ class AccountController < ApplicationController
   # 注册完/绑定邮箱 后完善资料
   def user_info
     @user = User.current
+
+    #是否是Oschina过来的
+    @is_ecoder_user = @user.ecoder_user_id.to_i>0
+
+    #是否没设置过密码
+    @is_set_password = @user.hashed_password.present?
+
     if request.get?
+
       # 如果是登录的请求进来，则需要判断登录名是否合法
       if (@user.login =~ /(^(?=.*?[a-zA-Z]).*$)/).nil? || !(@user.login =~ /[@#\$%\^&\*\.]+/).nil?
         @login_error = true
@@ -454,6 +462,22 @@ class AccountController < ApplicationController
         apply_user.update_all(:status => 2) unless apply_user.blank?
       end
 
+
+      if @is_ecoder_user && !@is_set_password
+        @user.password = params[:new_password]
+        @user.password_confirmation = params[:new_password_confirmation]
+
+        if @user.password.size<8
+          @password_len_error = true
+          render :user_info and return
+        end
+
+        if @user.password != @user.password_confirmation
+          @password_match_error = true
+          render :user_info and return
+        end
+      end
+
       @user.lastname = params[:lastname]
       @user.firstname = ""
       @user.show_realname = params[:hide_realname] ? 0 : 1
@@ -525,6 +549,7 @@ class AccountController < ApplicationController
         return
       else
         @user.login = lg
+        logger.info "save user: #{@user.errors}"
       end
     end
   end

app/controllers/ecloud_controller.rb

@@ -38,8 +38,6 @@ class EcloudController < ApplicationController
   ROOT_URl = 'http://localhost:3000'
   SERVER_URL = "https://221.176.54.92:9081/restful/services/"
 
-
-
   ## 签名
   def sign(timestamp)
     Digest::MD5.hexdigest("client_id=#{CLIENT_ID}client_key=#{CLIENT_SECRET}timestamp=#{timestamp}").upcase
@@ -232,6 +230,8 @@ class EcloudController < ApplicationController
   end
 
   def ecloud_login_callback
+
+    unless params["test"] == 'true'
       #获取code
       logger.info "oauth2 login_callback: #{params}"
 
@@ -242,29 +242,41 @@ class EcloudController < ApplicationController
 
       res = post(url)
       logger.info "oauth2 authorization resp: #{res}"
+      # {"access_token":"ae673b2d-88b4-46cc-aa74-0b031f24b76f","expires":6,"refresh_token":"7380cc67-a59c-4c21-9000-70e12a58d175","username":"15111030087@QW_er","uid":2147}
 
       body = decode(res)
-    #{"access_token":"21a80f20ff736b54aecd002b60210943","token_type":"bearer","expires_in":86400,"refresh_token":"be92e2c137a8c6dd22f0d8c4a622b3aeceb054087a95d293130f04ec60fd3e3f","scope":"user_info","created_at":1542684088}
 
       raise '登录失败' unless body["access_token"]
 
       #获取此用户信息
-
-    # res = get("https://gitee.com/api/v5/user?access_token=#{body["access_token"]}")
       res = get("#{SERVER_URL}/user/info?access_token=#{body['access_token']}&userid=#{body['uid']}")
       logger.info "oauth2 get user info: #{res}"
+      # {"userid":2147,"custid":2104,"custcode":"E0002018042810010054","custtype":2,"status":2,"username":"15111030087@QW_er","useralias":"15111030087","isadmin":true,"entprise":"04**004","departments":"","departmentnames":"","mobile":"15365386520","email":"15111030087@139.com"}
+    else
+      res = '{"userid":2147,"custid":2104,"custcode":"E0002018042810010054","custtype":2,"status":2,"username":"15111030087@QW_er","useralias":"15111030087","isadmin":true,"entprise":"04**004","departments":"","departmentnames":"","mobile":"15365386520","email":"15111030087@139.com"}'
+    end
+
 
     # 同步用户
-    # info = decode(res)
+    info = decode(res)
-    #
+
-    # user =  User.find_by_oschina_user_id(info["id"])
+    user = User.find_by_ecoder_user_id(info["userid"])
-    # unless user
+    unless user
-    #   user = User.create_with_oschina!(info)
+      #新建用户
-    # end
+      user = User.create_with_ecoder!(info)
-    #
+    end
-    # @current_user = user
+
+    self.logged_user = user
+
+    user = UserExtensions.where(:user_id => User.current.id).first
+    if user.gender.nil? || user.school_id.nil? || User.current.lastname.nil?
+      redirect_to my_account_path
+    elsif user.identity == 3 && user.school_id.nil?
+      redirect_to my_account_path
+    else
+      redirect_to User.current
+    end
 
-    render :index
   end
 
 

app/controllers/homework_common_controller.rb

@@ -671,6 +671,7 @@ class HomeworkCommonController < ApplicationController
 
   def destroy
     if @homework.destroy
+      StudentWork.where(:homework_common_id => @homework.id).destroy_all
       #更新CourseHomeworkStatistics中每个学生的未交作品数、已交作品数、迟交作品数
       # hw_count = @course.homework_commons.includes(:homework_detail_manual).where("homework_detail_manuals.comment_status > 0").count
       # homework_ids = @course.homework_commons.empty? ? "(-1)" : "(" + @course.homework_commons.map{|hw| hw.id}.join(",") + ")"
@@ -1347,7 +1348,7 @@ class HomeworkCommonController < ApplicationController
   def find_homework
     @homework = HomeworkCommon.find params[:id]
     @homework_detail_manual = @homework.homework_detail_manual
-    @homework_detail_programing = @homework.homework_detail_programing
+    # @homework_detail_programing = @homework.homework_detail_programing
     @homework_detail_group = @homework.homework_detail_group
     @course = @homework.course
   rescue

app/controllers/my_controller.rb

@@ -141,6 +141,10 @@ class MyController < ApplicationController
   # Edit user's account
   def account
     @user = params[:user_id].nil? ? User.current : User.find(params[:user_id])
+
+
+
+
     ue = @user.user_extensions
     if @user.lastname.blank? || ue.try(:identity).nil? || (ue.try(:identity) == 1 && ue.try(:student_id).blank?) || (ue.try(:identity) != 1 && ue.try(:technical_title).blank?) || ue.try(:gender).blank? || ue.try(:school_id).blank?
       redirect_to user_info_path
@@ -152,7 +156,8 @@ class MyController < ApplicationController
       applied_message = AppliedMessage.where(:id => params[:applied_message_id]).first
       applied_message.update_attribute(:viewed, true)
     end
-    # @user = User.current
+
+
     # 认证
     @trail_authentication = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization").order("created_at desc").first
     if @trail_authentication && (@trail_authentication.status == 1 || @trail_authentication.status == 2) && !@trail_authentication.noticed

app/controllers/users_controller.rb

@@ -2592,6 +2592,7 @@ class UsersController < ApplicationController
 
   def user_info
 
+
   end
 
   # 连续签到六天则每天累加10个金币

app/helpers/application_helper.rb

@@ -6793,7 +6793,9 @@ def update_myshixun_work_score myshixun
         end
 
         work.update_time = Time.now
-        work.final_score = final_score
+
+        # 为迁移的数据做特殊处理， 若分数小于当前通关分数则不更新
+        work.final_score = final_score if work.final_score.nil? || final_score > work.final_score
         score = work.final_score + work.eff_score - work.late_penalty
         work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) unless work.ultimate_score
         #logger.info("#############work_score: #{score}")

app/models/homework_common.rb

@@ -15,7 +15,7 @@ class HomeworkCommon < ActiveRecord::Base
   belongs_to :homework_bank
   has_many :homework_group_settings, :dependent => :destroy
   has_one :homework_detail_manual, :dependent => :destroy
-  has_one :homework_detail_programing, :dependent => :destroy
+  # has_one :homework_detail_programing, :dependent => :destroy
   has_one :homework_detail_group, :dependent => :destroy
   has_one :homework_commons_shixuns, :dependent => :destroy
   has_many :homework_challenge_settings, :dependent => :destroy
@@ -24,21 +24,21 @@ class HomeworkCommon < ActiveRecord::Base
   has_many :homework_review_results, :dependent => :destroy   # 学生的查重情况
 
   belongs_to :course_homework_category
-  has_many :student_work_projects, :dependent => :destroy
+  has_many :student_work_projects
-  has_many :homework_tests, :dependent => :destroy
+  # has_many :homework_tests, :dependent => :destroy
-  has_many :homework_samples, :dependent => :destroy
+  # has_many :homework_samples, :dependent => :destroy
-  has_many :student_works, :dependent => :destroy, :conditions => "student_works.is_test=0 and student_works.is_delete != 1"
+  has_many :student_works, :conditions => "student_works.is_test=0 and student_works.is_delete != 1"
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
-  has_many :apply_homeworks, :dependent => :destroy
+  has_many :apply_homeworks
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
   has_one :praise_tread_cache, as: :object, dependent: :destroy
-  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
+  # has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
   has_and_belongs_to_many :shixuns
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # 课程消息
-  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  # has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
   has_many :tidings, as: :container, dependent: :destroy
   acts_as_attachable
   acts_as_event :title => Proc.new {|o| "#{l(:label_course_homework)} ##{o.id}: #{o.name}" },
@@ -48,7 +48,7 @@ class HomeworkCommon < ActiveRecord::Base
   # after_create :act_as_activity
   after_update :update_activity
   after_save :act_as_course_activity
-  after_destroy :delete_kindeditor_assets
+  # after_destroy :delete_kindeditor_assets
   before_destroy :update_homework_bank_quotes
 
   #删除时更新题库中的引用数

app/models/student_work.rb

@@ -13,9 +13,9 @@ class StudentWork < ActiveRecord::Base
   has_many :student_works_scores, :dependent => :destroy
   has_many :challenge_work_scores, :dependent => :destroy
   belongs_to :project
-  has_many :student_work_tests, order: 'id desc'
+  # has_many :student_work_tests, order: 'id desc'
   # course's message
-  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  # has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
   has_many :attachments, :dependent => :destroy
   has_many :tidings, as: :container, dependent: :destroy
   belongs_to :myshixun

app/models/user.rb

@@ -1692,6 +1692,36 @@ class User < Principal
     end
   end
 
+  def self.create_with_ecoder!(info)
+    user = User.new
+    user.admin = false
+    user.login = "ecoder_" + info["mobile"]
+
+    user.phone = info["mobile"]
+
+    unless User.find_by_mail(info["email"])
+      user.mail = info["email"]
+    end
+    user.nickname = info["username"]
+
+
+    user.activate
+    user.last_login_on = Time.now
+
+    user.ecoder_user_id = info["userid"]
+
+    user.save!(:validate => false)
+
+
+    UserStatus.create!(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
+
+    ue = user.user_extensions ||= UserExtensions.new
+    ue.user_id = user.id
+    ue.save!
+
+    user
+  end
+
 end
 
 class AnonymousUser < User

app/services/games_service.rb

@@ -88,15 +88,28 @@ class GamesService
       # tpm_script_modified = (shixun.reset_time > myshixun.reset_time  ? true : false) # 新结构脚本是实时传送的，所以不会影响
 
       # 区分评测过未评测过，未评测过按需求取数据
+      sql =
           if max_query_index > 0
-        qurey_test_sets = TestSet.find_by_sql("SELECT o.actual_output, o.out_put, o.result, o.test_set_position, o.query_index,t.is_public,t.input, t.output, g.id as game_id, c.id as challenge_id FROM outputs o,games g ,challenges c,test_sets t where
+           "SELECT
-                                  g.id=#{game.id} and o.query_index=#{max_query_index} and g.id = o.game_id and c.id= g.challenge_id and t.challenge_id = c.id and t.position =o.test_set_position order by o.query_index
+              b.actual_output, b.out_put, b.result, a.is_public, a.input, a.output
-                                ")
+            FROM
+              (SELECT position, input, output, challenge_id, is_public FROM test_sets where challenge_id=6000) a
+            LEFT JOIN
+              (SELECT
+                 result, test_set_position, g.challenge_id, o.actual_output, o.out_put
+               FROM
+                 outputs o left join games g on g.id=o.game_id
+               WHERE
+                 game_id=#{game.id} and query_index = #{max_query_index}
+              ) b
+            ON
+              b.challenge_id  = a.challenge_id and b.test_set_position = a.position"
           else
-        qurey_test_sets = TestSet.find_by_sql("SELECT t.is_public,t.input, t.output,t.position FROM games g ,challenges c,test_sets t where
+            "SELECT t.is_public, t.input, t.output, t.position
-                                  g.id=#{game.id} and c.id= g.challenge_id and t.challenge_id = c.id
+             FROM games g ,challenges c,test_sets t
-                                ")
+             WHERE g.id=#{game.id} and c.id= g.challenge_id and t.challenge_id = c.id"
           end
+      qurey_test_sets = TestSet.find_by_sql(sql)
 
       # 测试集统计及处理
       unless qurey_test_sets.blank?

app/views/account/user_info.html.erb

@@ -39,6 +39,20 @@
               </li>
             <% end %>
 
+
+            <% if @is_ecoder_user && !@is_set_password %>
+              <li class="clearfix">
+                <label class="second-label fl"><span class="color-orange">* </span>密码：</label>
+                <input name="new_password" type="password" class="winput-240-40 fl" placeholder="请输入密码">
+                <p class="notice color-orange fl"><span id="new_password_hint" class="none"><i class="fa fa-exclamation-circle mt7 mr5 fl"></i>密码最小长度为8位</span></p>
+              </li>
+              <li class="clearfix">
+                <label class="second-label fl"><span class="color-orange">* </span>重复密码：</label>
+                <input name="new_password_confirmation" type="password" class="winput-240-40 fl" placeholder="请输入密码">
+                <p class="notice color-orange fl"><span id="new_password_confirmation_hint" class="none"><i class="fa fa-exclamation-circle mt7 mr5 fl"></i>两次密码不匹配</span></p>
+              </li>
+            <% end %>
+
             <li class="<%= @user.show_realname ? 'none' : '' %> clearfix" id="nickname_li">
               <label class="second-label fl"><span class="color-orange">* </span>昵称：</label>
               <input type="text" id="nickname" name="nickname" maxlength="20" value="<%= @user.nickname %>" class="winput-240-40 fl" placeholder="填写昵称">

app/views/common/index.html.erb

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/react/build/css/css_min_all.css"><link rel="stylesheet" href="/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.c95e49c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/react/build/js/js_min_all.js"></script><script type="text/javascript" src="/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/react/build/js/create_kindeditor.js"></script><script type="text/javascript" src="/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.ea3ca4b2.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/react/build/css/css_min_all.css"><link rel="stylesheet" href="/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.c95e49c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/react/build/js/js_min_all.js"></script><script type="text/javascript" src="/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/react/build/js/create_kindeditor.js"></script><script type="text/javascript" src="/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.8971eeae.js"></script></body></html>

app/views/layouts/_unlogin_header.html.erb

@@ -101,7 +101,7 @@
       <% when "subjects" %>
       $("#header-nav").children("li").eq(2).addClass("active");
       <% when "courses" %>
-      $header.length == 7 ? $header.eq(4).addClass("active") : $header.eq(3).addClass("active");
+      $header.length == 7 ? $header.eq(2).addClass("active") : $header.eq(3).addClass("active");
       <% when "competitions" %>
       $header.length == 7 ? $header.eq(5).addClass("active") : $header.eq(4).addClass("active");
       <% when "forums" %>

db/migrate/20190313090911_add_ecoder_user_id_to_users.rb

@@ -0,0 +1,6 @@
+class AddEcoderUserIdToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :ecoder_user_id, :integer, default: 0
+    add_index :users, :ecoder_user_id
+  end
+end

db/migrate/20190314010614_add_index_to_homework.rb

@@ -0,0 +1,8 @@
+class AddIndexToHomework < ActiveRecord::Migration
+  def change
+    add_index :homework_detail_manuals, :homework_common_id
+    add_index :homework_commons_shixuns, :homework_common_id
+    add_index :student_works_evaluation_distributions, :student_work_id
+    add_index :tidings, :container_id
+  end
+end

db/migrate/20190314080807_create_shixun_student_works.rb

@@ -0,0 +1,75 @@
+class CreateShixunStudentWorks < ActiveRecord::Migration
+  def up
+    ActiveRecord::Base.transaction do
+      begin
+        works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and (work_score is null or work_score = 0)")
+        works.update_all(:myshixun_id => 0, :work_status => 0, :work_score => nil, :final_score => nil,
+                         :cost_time => 0, :update_time => nil, :compelete_status => 0, :commit_time => nil)
+
+        shixun_works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and work_score > 0")
+        shixun_works.each do |work|
+          shixun = work.homework_common.try(:homework_commons_shixuns).try(:shixun)
+          user = work.user
+          if shixun.present? && user.present?
+            # 创建新的myshixun和games
+            # fork版本库，如果用户没有同步，则先同步用户
+            g = Gitlab.client
+            if user.gid.nil?
+              s = Trustie::Gitlab::Sync.new
+              s.sync_user(user)
+            end
+            gshixun = g.fork(shixun.gpid, user.gid)
+            shixun_tomcat = Redmine::Configuration['shixun_tomcat']
+            code = down_generate_identifier("myshixun")
+            # 一般通过默认分支是否存在来判断一个项目是否fork成功
+            if gshixun.try(:id).present?
+              commit_id = g.commits(shixun.gpid).first.try(:id)
+              # educoder 加入到myshixun中
+              myshixun_admin_gid = User.where(:login => "educoder").first.try(:gid)
+              g.add_team_member(gshixun.id, myshixun_admin_gid, 40)  # 40代表角色master
+
+              myshixun = Myshixun.create!(:shixun_id => shixun.id, :user_id => user.id, :identifier => code,
+                                          :modify_time => shixun.modify_time, :reset_time => shixun.reset_time,
+                                          :onclick_time => Time.now, :gpid => gshixun.id,
+                                          :git_url => gshixun.try(:path_with_namespace), :commit_id => commit_id)
+
+              rep_url = Base64.urlsafe_encode64(gitlab_url shixun) # 注意：educoder为默认给实训创建版本库的用户，如果换成别的用户，名字要相应的修改
+              uri = "#{shixun_tomcat}/bridge/game/openGameInstance"
+              params = {tpiID: "#{myshixun.id}", tpmGitURL:rep_url, tpiRepoName: gshixun.try(:name)}
+              logger.info("openGameInstance params is #{params}")
+              res = uri_exec uri, params
+              if (res && res['code'].to_i != 0)
+                raise("实训云平台繁忙（繁忙等级：83）")
+              end
+              # 其它创建关卡等操作
+              challenges = shixun.challenges
+              # 之所以增加user_id是为了方便统计查询性能
+              challenges.each_with_index do |challenge, index|
+                status = (index == 0 ? 0 : 3)
+                code = down_generate_identifier("game")
+                Game.create!(:challenge_id => challenge.id, :myshixun_id => myshixun.id, :status => status, :user_id => myshixun.user_id,
+                             :open_time => Time.now, :identifier => code, :modify_time => challenge.modify_time)
+              end
+              work_score = work.final_score
+              work.homework_common.homework_challenge_settings.each do |setting|
+                if work_score > 1
+                  games = myshixun.games.where(:challenge_id => setting.challenge_id).first
+                  games.update_attributes(:status => 2, :end_time => Time.now, :final_score => setting.challenge.score)
+                  work_score -= setting.score
+                end
+              end
+              work.update_column("myshixun_id", myshixun.id)
+            end
+          end
+        end
+      rescue Exception => e
+        puts ("###failed to exec shixun: current task id is #{e}")
+        g.delete_project(gshixun.id) if gshixun.try(:id).present?
+        raise ActiveRecord::Rollback
+      end
+    end
+  end
+
+  def down
+  end
+end

nano.save

@@ -1,6 +0,0 @@
-
-
-
-
-
-

public/javascripts/edu/account.js

@@ -152,7 +152,7 @@ function changeDepValue(value, data) {
 
 // 基本资料页面提交表单时，判断身份与单位是否合法
 function my_account_form_submit() {
-    if ($("#nickname").val().trim() == '') {
+    if ($("#nickname").val().trim() === "") {
         $("#nickname").focus();
         $("#nickname_hint").show();
         e.stopImmediatePropagation();
@@ -161,6 +161,8 @@ function my_account_form_submit() {
         $("#nickname_hint").hide();
     }
 
+
+
     //姓名不能为空
     if ($("#lastname").val().trim() == '') {
         $("#lastname").focus();

public/javascripts/educoder/edu_account.js

@@ -1483,7 +1483,6 @@ function my_account_form_submit() {
     if ($("input[name='lastname']").val().trim() == '') {
         $("#lastname").focus();
         $("#lastname_hint").show();
-        e.stopImmediatePropagation();
         return;
     } else {
         $("#lastname_hint").hide();
@@ -1516,16 +1515,31 @@ function my_account_form_submit() {
         if ($("#nickname").val().trim() == '') {
             $("#nickname").focus();
             $("#nickname_hint").show();
-            e.stopImmediatePropagation();
             return;
         } else {
             $("#nickname_hint").hide();
         }
     }
 
+
+    if($("input[name='new_password']").val().length<8){
+        $("#new_password").focus();
+        $("#new_password_hint").show();
+        return;
+    } else {
+        $("#new_password_hint").hide();
+    }
+
+    if($("input[name='new_password']").val() !== $("input[name='new_password_confirmation']").val() ){
+        $("#new_password_confirmation").focus();
+        $("#new_password_confirmation_hint").show();
+        return;
+    } else {
+        $("#new_password_confirmation_hint").hide();
+    }
+
     if ($("#userIdentity").val() == -1) {
         $("#identity_hint").show();
-        e.stopImmediatePropagation(); // 阻止事件冒泡
         return;
     } else{
         $("#identity_hint").hide();
@@ -1533,7 +1547,6 @@ function my_account_form_submit() {
 
     if ($("#userIdentity").val() == 0 && $("#teacher").val() == "0") {
         $("#te_technical_hint").show();
-        e.stopImmediatePropagation();
         return;
     } else{
         $("#te_technical_hint").hide();
@@ -1541,7 +1554,6 @@ function my_account_form_submit() {
 
     if ($("#userIdentity").val() == 2 && $("#profession").val() == "0") {
         $("#pro_technical_hint").show();
-        e.stopImmediatePropagation();
         return;
     } else{
         $("#pro_technical_hint").hide();
@@ -1554,7 +1566,6 @@ function my_account_form_submit() {
         } else{
             $("#student_id_hint").html('<i class="fa fa-minus-circle mt7 mr5 fl"></i>学号只能由数字和字母组成</span>').show();
         }
-        e.stopImmediatePropagation();
         return;
     } else{
         $("#student_id_hint").hide();

public/react/build/asset-manifest.json

@@ -67,8 +67,8 @@
   "./static/js/9.e77edf45.chunk.js.map": "./static/js/9.e77edf45.chunk.js.map",
   "main.css": "./static/css/main.c95e49c6.css",
   "main.css.map": "./static/css/main.c95e49c6.css.map",
-  "main.js": "./static/js/main.ea3ca4b2.js",
+  "main.js": "./static/js/main.8971eeae.js",
-  "main.js.map": "./static/js/main.ea3ca4b2.js.map",
+  "main.js.map": "./static/js/main.8971eeae.js.map",
   "static/media/ERASBD.ttf": "static/media/ERASBD.d5213044.ttf",
   "static/media/background1.png": "static/media/background1.a34df396.png",
   "static/media/background2.png": "static/media/background2.22ee659e.png",

public/react/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/css/css_min_all.css"><link rel="stylesheet" href="http://testbdweb.educoder.net/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.c95e49c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/js/js_min_all.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/js/create_kindeditor.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.ea3ca4b2.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/css/css_min_all.css"><link rel="stylesheet" href="http://testbdweb.educoder.net/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.c95e49c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/js/js_min_all.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/js/create_kindeditor.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.8971eeae.js"></script></body></html>

public/react/src/modules/page/Index.js

@@ -197,6 +197,7 @@ class Index extends Component {
 	    					
 	    					time_limit={context.time_limit}
 
+								resetTestSetsExpandedArray={context.resetTestSetsExpandedArray}
 	    					onRunCodeTestFinish={context.onRunCodeTestFinish}
 	    					onRunChooseTestFinish={context.onRunChooseTestFinish}
 	    					testSetUnlock={context.testSetUnlock}

public/react/src/modules/page/MainContentContainer.js

@@ -613,13 +613,13 @@ class MainContentContainer extends Component {
 	}
 	// 之前的task_commit方法
 	gameBuild(fileUpdateResponse, first) {
-		const { st, challenge, output_sets, onRunCodeTestFinish, showSnackbar, time_limit } = this.props
+		const { st, challenge, output_sets, onRunCodeTestFinish, resetTestSetsExpandedArray, showSnackbar, time_limit } = this.props
 		const { resubmit, content_modified } = fileUpdateResponse.data;
 		const timeOut = time_limit;
     	// http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo/game_build?first=1&resubmit=GDBEX741_1993
     	const game_build_url = `${locationPath}/game_build?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}`
     	// var timeOut = parseInt(<%= @myshixun.main_mirror.try(:time_limit) %>); // 超时参数
-
+			resetTestSetsExpandedArray()
     	axios.get(game_build_url, {
     		withCredentials: true,
     	}).then((gameBuildResponse) => {

public/react/src/modules/tpm/NewHeader.js

@@ -249,15 +249,18 @@ class NewHeader extends Component {
             activeShixuns = true;
         } else if(match.path.startsWith('/careers')){
             activeCareers = true;
-        }else if(match.path === '/ec_major_schools/:major_school_id/academic_years/:ec_year_id/requirement_vs_courses'){
+        } else if(match.path.startsWith('/ec_courses')){
             activeCourses=true;
-        }else if(match.path === '/ec_courses/:ec_course_id/ec_course_reach_setting'){
+        }else if(match.path.startsWith('/ec_major_schools')){
-                activeCourses=true;
-        }else if(match.path === '/ec_courses/:ec_course_id/competition_calculation_info'){
             activeCourses=true;
         }else{
             activeIndex = true;
         }
+        
+        
+ 
+        console.log(match.path)
+        console.log(match.path.startsWith("/ec_courses"))
         return (
         <div className="newHeader" id="nHeader">
           	<div className="educontent clearfix">
@@ -293,7 +296,7 @@ class NewHeader extends Component {
                         </li>
                         <li><a href="/competitions">竞赛</a></li>
                         <li className={`${activeForums === true ? 'active' : ''}`}><a href="/forums">问答</a></li>
-                        <li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null?'none':'block'}}><a href={ecUrl}>{ecUrl===null?'':'认证'}</a></li>
+                        <li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null||ecUrl===undefined||ecUrl===""?'none':'block'}}><a href={ecUrl}>{ecUrl===null||ecUrl===undefined||ecUrl===""?'':'认证'}</a></li>
                     </ul>
 				    <div className="posi-search" id="posi-search" style={{display: 'none'}}>
 				        <div className="search-all clearfix">