Merge branch 'develop' into educoder

Conflicts:
	app/controllers/ecloud_controller.rb

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

@@ -1,11 +1,25 @@
 #encoding=utf-8
+# 云启训练场（EduCoder）个人版	产品编码（appId）	9200108
+# 产品名称	计费类型	套餐编码
+# 云启训练场（EduCoder）个人版	固定包月	9200108001
+#                           固定包月	9200108002
+#                           固定包月	9200108003
+# ---------------------------------------------------
+# 产品名称	计费类型	套餐编码
+# 云启训练场（EduCoder））院校版	包月+按license	9200109001
+# 包月+按license	9200109002
+
+# 云启训练场（EduCoder））院校版	产品编码（appId）	9200109
+
 require 'net/http'
 require 'digest'
 
 class EcloudController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
-  # before_filter :check_sign
+  before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
+  before_filter :save_para
+
   before_filter :user_setup
   # before_filter :require_login, only: [:authorize]
 
@@ -13,7 +27,6 @@ class EcloudController < ApplicationController
   skip_before_filter :verify_authenticity_token, only: [:ps_new, :ps_update, :bs_new, :bs_update, :ecloud_login_callback]
 
   def index
-
     render file: 'public/react-oschina/build/index.html', :layout => false
   end
 
@@ -25,28 +38,96 @@ 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
   end
 
 
-  # 企业开通
+  # 企业/个人业务开通
+  # applyno 申请单号，唯一
   # ecordercode 唯一标志一个企业的订购关系
+  # params['opttype']：操作类型。0开通；1变更；2试用转商用；4再次开通
+  # 业务列表opttype: 0新增；1注销；2修改
+  # serviceparas: 但是由于企业版是按成员收费的，所以serviceparas里面会传成员数；个人版是包月计费的，serviceparas不会传成员数
   def bs_new
     ActiveRecord::Base.transaction do
       begin
-        ecloud = Ecloud.create!(applyno: params['applyno'], ecordercode: params['ecordercode'], opttype: params['opttype'],
+        if params['opttype'] == 0 # 开通企业/个人业务
-                                trial: params['trial'], bossorderid: params['bossorderid'], custid: params['custid'], custtype: params['custtype'],
+          ecloud = Ecloud.create!(eloud_params)
-                                custcode: params['custcode'], registersource: params['registersource'], custname: params['custname'],
+          create_service(params['services'], ecloud.try(:id))
-                                userid: params['userid'], username: params['username'], useralias: params['useralias'], mobile: params['mobile'],
+          create_product_params(params['productparas'],  ecloud.try(:id)) if params['productparas'].present?
-                                email: params['email'], productcode: params['productcode'], begintime: params['begintime'],
+          # 为管理员添加一条记录
-                                endtime: params['endtime'])
+          # 开通的时候都是用户的opttype也是0
-        services = params['services'].first
+          EcloudUser.create!(custid: params['custid'], opttype: params['opttype'], userid: params['userid'],
-        EcloudService.create(opttype: services['opttype'], code: services['code'], begintime: services['begintime'],
+                             username: params['username'], useralias: params['useralias'],
-                             endtime: services['endtime'], ecloud_id: ecloud.try(:id))
+                             mobile: params['mobile'],  email: params['email'],  begintime: params['begintime'],
+                             endtime: params['endtime'])
+        elsif params['opttype'] == 2 # 试用转商用 # 变更企业/个人业务
+          # 业务列表：注销业务(注销试用的套餐)，另一个业务项的操作代码是：新增业务(开通商用的套餐)
+          # 需要通过产品服务编号和业务编码来区分哪个产品
+          ecloud = Ecloud.where(custid: params['custid'], custcode: params['custcode'], productcode: params['productcode'], trial: true).first
+
+          # 注销试用的套餐
+          ## 需要注销的套餐; 试用转商用是不会有批量操作的，所以可以使用first
+          des_service = params['services'].select{|s| s['opttype'] == 1}.first
+          esd = EcloudService.where(ecloud_id: ecloud.try(:id), code: des_service['code']).first
+          ecloud.update_attribute(:trial, params['trial'])
+          esd.update_attributes!(opttype: des_service['opttype'], begintime: des_service['begintime'], endtime: des_service['endtime'])
+
+          # 试用转商用是不会有批量操作的
+          # 新增业务
+          add_service =  params['services'].select{|s| s['opttype'] == 0}
+          create_service(add_service, ecloud.try(:id))
+          #
+
+        elsif params['opttype'] == 1 # 业务变更
+          ecloud = Ecloud.where(custid: params['custid'], custcode: params['custcode'], productcode: params['productcode']).first
+          # 套餐变更
+          # 新增业务
+          add_service = params['services'].select{|s| s['opttype'] == 0}
+          create_service(add_service, ecloud.try(:id)) if add_service.present?
+
+          # 如果有注销业务，注销业务
+          des_services = params['services'].select{|s| s['opttype'] == 1}
+          if des_services.present?
+            des_services.each do |ds|
+              esd = EcloudService.where(ecloud_id: ecloud.try(:id), code: ds['code']).first
+              esd.update_attributes!(opttype: ds['opttype'], begintime: ds['begintime'], endtime: ds['endtime'])
+            end
+          end
+
+          # 变更业务
+          edt_services = params['services'].select{|s| s['opttype'] == 2}
+          if edt_services.present?
+            edt_services.each do |es|
+              ese = EcloudService.where(ecloud_id: ecloud.try(:id), code: es['code']).first
+              ese.update_attributes!(opttype: es['opttype'], begintime: es['begintime'], endtime: es['endtime'])
+              create_serviceparas es['serviceparas'].first, ese.id
+            end
+          end
+
+
+          # ecloud = Ecloud.where(bossorderid: params['bossorderid']).first
+          # ecloud.update_attributes!(eloud_params)
+          # ecloud.ecloud_productparas.destroy
+          # ecloud.ecloud_services.destroy
+          #
+          # ecloud_id = ecloud.try(:id)
+
+        elsif params['opttype'] == 4 # 再次重复开通
+          ecloud = Ecloud.where(custid: params['custid'], custcode: params['custcode'], productcode: params['productcode']).first
+          create_service(params['services'], ecloud.try(:id))
+          create_product_params(params['productparas'],  ecloud.try(:id)) if params['productparas'].present?
+        end
+
+        #
+        # # 非试用情况下，为管理员单独创建一条账号，企业账号
+        # unless  params['trial']
+        #   EcloudUser.create!(ecloud_id: ecloud.try(:id), opttype: params['opttype'], userid: params['userid'],
+        #                      username: params['username'], useralias: params['useralias'],
+        #                      mobile: params['mobile'],  email: params['email'])
+        # end
 
         render :json => {result: true, errmsg: ""}
       rescue Exception => e
@@ -57,18 +138,32 @@ class EcloudController < ApplicationController
     end
   end
 
-  # 企业更新
+  # 企业/个人业务变更、注销
+  # 处理业务平台退订、暂停（欠费暂停，信控暂停等）、暂停后恢复应用业务
+  # 这个接口是不会新增业务的
+  # 试用退订的时候bossorderid传空字符
   def bs_update
     ActiveRecord::Base.transaction do
       begin
-        ecloud = Ecloud.where(custid: params['custid']).first
+        case params['opttype']
-        ecloud.update_attributes!(applyno: params['applyno'], ecordercode: params['ecordercode'], opttype: params['opttype'],
+          when 0 # 退订
-                                  custid: params['custid'], custcode: params['custcode'], productcode: params['productcode'],
+            opttype = 6
-                                  operatime: params['operatime'], effecttime: params['effecttime'])
+          when 1 # 暂停
-        services = params['services'].first
+            opttype = 7
-        ecloud.ecloud_service.update_attributes!(packagecode: services['packagecode'], bossorderid:  services['bossorderid'])
+          when 2 # 恢复
+            opttype = 8
+        end
+        if params['bossorderid'].present?
+          ecloud = Ecloud.where(bossorderid: params['bossorderid']).first
+          ecloud.update_attribute(:opttype, opttype)
+        else
+          # 试用退订
+          params['services'].each do |service|
+            ecloud_id = EcloudService.where(code: service['packagecode']).first.try(:ecloud_id)
+            Ecloud.find(ecloud_id).update_attribute(:opttype, opttype)
+          end
+        end
         render :json => {result: true, errmsg: ""}
-
       rescue Exception => e
         logger.error(e.message)
         render :json => {code: 500, msg: "#{e.message}"}
@@ -77,37 +172,57 @@ class EcloudController < ApplicationController
     end
   end
 
-  # 用户业务开通接口
+  # 用户业务开通与变更接口
+  # 授权statu为1，取消授权status为0
+  # user['opttype']: 操作类型0：开通；1：变更；3: 取消授权；4：暂停；5：恢复；
+
   def ps_new
-    begin
+    ActiveRecord::Base.transaction do
-      user_param = params['users'].first
+      begin
-      ecloud_user = EcloudUser.where(:custid => params['custid'], :userid => user_param['userid']).first
+        user_params = params['users']
-      if ecloud_user.present?
+        user_params.each do |user_param|
-        render :json => {code: 500, msg: "你已开通过该业务"}
+          if user_param['opttype'] == 0 # 开通
-      else
+            EcloudUser.create!(custid: params['custid'], opttype: user_param['opttype'], userid: user_param['userid'],
-        EcloudUser.create!(custid: params['custid'], opttype: user_param['opttype'], userid: user_param['userid'],
+                               username: user_param['username'], useralias: user_param['useralias'],
-                           username: user_param['username'], useralias: user_param['useralias'],
+                               mobile: user_param['mobile'],  email: user_param['email'],  begintime: user_param['begintime'].to_s,
-                           mobile: user_param['mobile'],  email: user_param['email'],  begintime: user_param['begintime'].to_s,
+                               endtime: user_param['endtime'].to_s)
-                           endtime: user_param['endtime'].to_s)
+          elsif user_param['opttype'] == 1 # 变更
+            ecloud_user = EcloudUser.where(custid: params['custid'], userid: user_param['userid']).first
+            ecloud_user.update_attributes!(opttype: user_param['opttype'],  username: user_param['username'],
+                                           useralias: user_param['useralias'], mobile: user_param['mobile'],  email: user_param['email'],
+                                           begintime: user_param['begintime'].to_s, endtime: user_param['endtime'].to_s)
+          end
+        end
+
         render :json => {success: true, errmsg: ""}
+          # end
+      rescue Exception => e
+        logger.error(e.message)
+        render :json => {code: 500, msg: "#{e.message}"}
+        raise ActiveRecord::Rollback
       end
-    rescue Exception => e
-      logger.error(e.message)
-      render :json => {code: 500, msg: "#{e.message}"}
     end
   end
 
-  # 用户业务变更、销毁接口
+  # 用户业务状态变更
+  # user['opttype']: 操作类型0：开通；1：变更；3: 取消授权；4：暂停；5：恢复；
   def ps_update
     begin
-      user_param = params['users'].first
+      user_params = params['users']
-      ecloud_user = EcloudUser.where(:custid => params['custid'], :userid => user_param['userid']).first
+      user_params.each do |user_param|
-      if ecloud_user.present?
+        case user_param['opttype']
-        ecloud_user.update_attributes(opttype: user_param['opttype'])
+          when 0 # 取消授权
-        render :json => {success: true, errmsg: ""}
+            opttype = 3
-      else
+          when 1 # 暂停
-        render :json => {code: 404, msg: "企业ID不存在"}
+            opttype = 4
+          when 2 # 恢复
+            opttype = 5
+        end
+        ecloud_user = EcloudUser.where(custid: params['custid'], userid: user_param['userid']).first
+        ecloud_user.update_attributes!(opttype: opttype, operatime: params['operatime'], effecttime: params['effecttime'])
       end
+
+      render :json => {success: true, errmsg: ""}
     rescue Exception => e
       logger.error(e.message)
       render :json => {code: 500, msg: "#{e.message}"}
@@ -115,67 +230,83 @@ class EcloudController < ApplicationController
   end
 
   def ecloud_login_callback
-    #获取code
-    logger.info "oauth2 login_callback: #{params}"
 
-    raise "没有code" unless params[:code]
+    unless params["test"] == 'true'
+      #获取code
+      logger.info "oauth2 login_callback: #{params}"
 
-    url = "#{SERVER_URL}/oauth2/authorization?grant_type=authorization_code" +
+      raise "没有code" unless params[:code]
-        "&client_id=#{CLIENT_ID}&scope=&redirect_uri=&code=#{params[:code]}"
 
-    res = post(url)
+      url = "#{SERVER_URL}/oauth2/authorization?grant_type=authorization_code" +
-    logger.info "oauth2 authorization resp: #{res}"
+          "&client_id=#{CLIENT_ID}&scope=&redirect_uri=&code=#{params[:code]}"
 
-    body = decode(res)
+      res = post(url)
-    #{"access_token":"21a80f20ff736b54aecd002b60210943","token_type":"bearer","expires_in":86400,"refresh_token":"be92e2c137a8c6dd22f0d8c4a622b3aeceb054087a95d293130f04ec60fd3e3f","scope":"user_info","created_at":1542684088}
+      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}
 
-    raise '登录失败' unless body["access_token"]
+      body = decode(res)
 
-    #获取此用户信息
+      raise '登录失败' unless 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
 
-    # 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}"
 
     # 同步用户
-    # 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
 
 
   private
   def get(url)
     uri = URI(url)
-    res = Net::HTTP.start(uri.host, uri.port, use_ssl: url.start_with?('https')) do |http|
-      req = Net::HTTP::Get.new(uri)
-      #req['Content-Type'] = 'application/json'
-      # The body needs to be a JSON string, use whatever you know to parse Hash to JSON
-      #req.body = {a: 1}.to_json
-      http.request(req)
-    end
 
-    res.body
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = url.start_with?('https')
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    request = Net::HTTP::Get.new(uri.request_uri)
+    request['Content-Type'] = 'application/json'
+    request['Accept'] = 'application/json'
+    response = http.request(request)
+
+    response.body
   end
 
   def post(url)
     uri = URI(url)
-    res = Net::HTTP.start(uri.host, uri.port, use_ssl: url.start_with?('https')) do |http|
-      req = Net::HTTP::Post.new(uri)
-      #req['Content-Type'] = 'application/json'
-      # The body needs to be a JSON string, use whatever you know to parse Hash to JSON
-      #req.body = {a: 1}.to_json
-      http.request(req)
-    end
 
-    res.body
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = url.start_with?('https')
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    request = Net::HTTP::Post.new(uri.request_uri)
+    request['Content-Type'] = 'application/json'
+    request['Accept'] = 'application/json'
+    response = http.request(request)
+
+    response.body
   end
 
   def decode(s)
@@ -187,12 +318,49 @@ class EcloudController < ApplicationController
   end
 
   private
+  def eloud_params
+    return {applyno: params['applyno'], ecordercode: params['ecordercode'], opttype: params['opttype'],
+            trial: params['trial'], bossorderid: params['bossorderid'], custid: params['custid'], custtype: params['custtype'],
+            custcode: params['custcode'], registersource: params['registersource'], custname: params['custname'],
+            userid: params['userid'], username: params['username'], useralias: params['useralias'], mobile: params['mobile'],
+            email: params['email'], productcode: params['productcode'], begintime: params['begintime'],
+            endtime: params['endtime']}
+  end
+
+  # 新增套餐
+  def create_service services, ecloud_id
+    services.each do |service|
+      ese = EcloudService.create!(opttype: service['opttype'], code: service['code'], begintime: service['begintime'],
+                                  endtime: service['endtime'], ecloud_id: ecloud_id)
+      if service['serviceparas'].present?
+        create_serviceparas(service['serviceparas'].first, ese.id)
+      end
+    end
+  end
+
+  def create_serviceparas params_serviceparas, ese_id
+    if params_serviceparas.present?
+      EcloudServieceServicepara.create(key: params_serviceparas['key'], value: params_serviceparas['value'], ecloud_service_id: ese_id)
+    end
+  end
+
+  def create_product_params params, ecloud_id
+    params.each do |p|
+      EcloudProductpara.create(key: p['key'], value: p['value'], ecloud_id: ecloud_id)
+    end
+  end
+
   def check_sign
     sign = sign(params['timestamp'])
     if sign != params['sign']
       render :json => {code: 501, msg: "sign的值错误"}
       return
     end
+  end
 
+  def save_para
+    EcloudLog.create(url: request.url, para_value: params, applyno: params['applyno'], custid: params['custid'],
+                     custcode: params['custcode'], userid: params['userid'], username: params['username'])
   end
+
 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/managements_controller.rb

@@ -1796,7 +1796,7 @@ end
     @school_id = params[:school_id]
 
     if params[:school_id] && params[:school_id] != ''
-      @courses = Course.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("ue.school_id = #{params[:school_id]}")
+      @courses = @courses.joins("join user_extensions ue on courses.tea_id = ue.user_id").where("ue.school_id = #{params[:school_id]}")
     end
 
     if params[:homepage_show]
@@ -1819,7 +1819,7 @@ end
         user_id = User.where("concat(lastname, firstname) like '%#{@search}%'")
         @courses = @courses.joins("join users u on courses.tea_id = u.id").where("concat(u.lastname, u.firstname) like '%#{@search}%'")
       end
-    else
+    elsif "dep_name" == @keyword
       school = School.where("name like '%#{@search}%'").map(&:id)
       @courses = @courses.where(:school_id => school)
       # @courses= @courses.where("name like '%#{@search}%'")

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

@@ -33,6 +33,28 @@ module ApplicationHelper
   extend Forwardable
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
 
+  # 课堂相关controller
+  def course_controller
+    ["courses", "homework_common", "student_work", "exercise", "poll", "boards", "messages", "graduation_topics", "graduation_tasks",
+    "graduation_works", "files"]
+  end
+
+  # 实训课程相关controller
+  def subjects_controller
+    ["subjects", "stages"]
+  end
+
+  # 实训路径相关controller
+  def shixuns_controller
+    ["shixuns", "challenges", "myshixuns", "games"]
+  end
+
+  # 工程认证相关controller
+  def ecs_controller
+    ["ecs", "ec_courses", "ec_course_evaluations", "ec_course_supports", "ec_course_targets", "ec_graduation_requirements",
+     "ec_major_schools", "ec_majors", "ec_years"]
+  end
+
   def exercise_bank_json_data exercises
     exercises.map do |exercise|
       exercise_path = exercise_bank_path(exercise)
@@ -6793,7 +6815,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/helpers/subjects_helper.rb

@@ -15,6 +15,8 @@ module SubjectsHelper
                      '<span class="fr color-grey-9">已发布</span>'
                    when 3
                      '<span class="fr color-grey-9">已关闭</span>'
+                   else
+                     ""
                  end
                else
                  if shixun_status != 2
@@ -23,6 +25,8 @@ module SubjectsHelper
                        '<span class="fr color-grey-c">暂未公开</span>'
                      when 3
                        '<span class="fr color-grey-9">已关闭</span>'
+                     else
+                       ""
                    end
                  else
                    ""

app/models/ecloud.rb

@@ -1,7 +1,11 @@
+#encoding=utf-8
 class Ecloud < ActiveRecord::Base
   attr_accessible :applyno, :begintime, :bossorderid, :custcode, :custid, :custname, :custtype, :ecordercode, :endtime,
                   :mobile, :opttype, :productcode, :registersource, :string, :trial, :useralias, :userid, :username, :email,
                   :effecttime, :operatime
+
+  has_many :ecloud_services, :dependent => :destroy # 业务列表
+  has_many :ecloud_productparas, :dependent => :destroy # 开通参数列表
+
   has_one :ecloud_user
-  has_one :ecloud_service
 end

app/models/ecloud_log.rb

@@ -0,0 +1,3 @@
+class EcloudLog < ActiveRecord::Base
+
+end

app/models/ecloud_productpara.rb

@@ -0,0 +1,4 @@
+class EcloudProductpara < ActiveRecord::Base
+  attr_accessible :key, :value, :ecloud_id
+  belongs_to :ecloud
+end

app/models/ecloud_service.rb

@@ -1,3 +1,5 @@
 class EcloudService < ActiveRecord::Base
   attr_accessible :begintime, :code, :endtime, :opttype, :ecloud_id, :packagecode, :bossorderid
+  belongs_to :ecloud
+  has_many :ecloud_serviece_serviceparas
 end

app/models/ecloud_serviece_servicepara.rb

@@ -0,0 +1,4 @@
+class EcloudServieceServicepara < ActiveRecord::Base
+  attr_accessible :key, :value, :ecloud_service_id
+  belongs_to :ecloud_service
+end

app/models/ecloud_user.rb

@@ -1,3 +1,3 @@
 class EcloudUser < ActiveRecord::Base
-  attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid
+  has_many :ecloud_user_paras
 end

app/models/ecloud_user_para.rb

@@ -0,0 +1,3 @@
+class EcloudUserPara < ActiveRecord::Base
+  belongs_to :ecloud_user
+end

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
 
   #删除时更新题库中的引用数
@@ -188,9 +188,9 @@ class HomeworkCommon < ActiveRecord::Base
     # end
   end
 
-  def is_program_homework?
+  # def is_program_homework?
-    self.homework_type == 2 && self.homework_detail_programing
+  #   self.homework_type == 2 && self.homework_detail_programing
-  end
+  # end
 
   def is_group_homework?
     self.homework_type == 3 && self.homework_detail_group
@@ -225,6 +225,6 @@ class HomeworkCommon < ActiveRecord::Base
     end
   end
 
-  delegate :language_name, :language, :to => :homework_detail_programing
+  # delegate :language_name, :language, :to => :homework_detail_programing
 
 end

app/models/myshixun.rb

@@ -64,7 +64,7 @@ class Myshixun < ActiveRecord::Base
     time = 0
     self.games.each do |game|
       if game.status == 2
-        time += (game.end_time.to_i - game.open_time.to_i) > 0 ? (game.end_time.to_i - game.open_time.to_i) : 0
+        time += game.cost_time.to_i
       end
     end
     time

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
@@ -24,7 +24,7 @@ class StudentWork < ActiveRecord::Base
   scope :all_commit, lambda{where("work_status != 0")}
 
   before_destroy :delete_praise
-  before_save :set_program_score, :set_src
+  before_save :set_program_score
 
   after_save :update_avg_sum_score
   # after_create :act_as_message
@@ -34,25 +34,26 @@ class StudentWork < ActiveRecord::Base
     PraiseTread.where("praise_tread_object_id = #{self.id} AND praise_tread_object_type = 'StudentWork'").destroy_all
   end
 
-  def last_test
+  # def last_test
-    student_work_tests.order('id desc').first
+  #   student_work_tests.order('id desc').first
-  end
+  # end
 
   private
   def set_program_score
-    if self.homework_common.is_program_homework?       #编程作业，学生提交作品后计算系统得分
+    # if self.homework_common.is_program_homework?       #编程作业，学生提交作品后计算系统得分
-      #根据最后一次测试计算得分
+    #   #根据最后一次测试计算得分
-      unless last_test
+    #   unless last_test
-        self.system_score = 0
+    #     self.system_score = 0
-      else
+    #   else
-        self.system_score = last_test.test_score self.homework_common.homework_tests.size
+    #     self.system_score = last_test.test_score self.homework_common.homework_tests.size
-      end
+    #   end
-    end
+    # end
     set_final_score self.homework_common,self
   end
-  def set_src
+
-    self.description = last_test.src if last_test
+  # def set_src
-  end
+  #   self.description = last_test.src if last_test
+  # end
 
   #成绩计算
   def set_final_score homework,student_work
@@ -217,8 +218,8 @@ class StudentWork < ActiveRecord::Base
 
   # status == 0 : delay
   def act_as_message
-    if self.work_status != 0 && self.created_at > self.homework_common.end_time
+    # if self.work_status != 0 && self.created_at > self.homework_common.end_time
-      self.course_messages << CourseMessage.new(:user_id => self.user_id, :course_id => self.homework_common.course_id, :viewed => false, :status => false)
+    #   self.course_messages << CourseMessage.new(:user_id => self.user_id, :course_id => self.homework_common.course_id, :viewed => false, :status => false)
-    end
+    # end
   end
 end

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) # 新结构脚本是实时传送的，所以不会影响
 
       # 区分评测过未评测过，未评测过按需求取数据
-      if max_query_index > 0
+      sql =
-        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
+          if max_query_index > 0
-                                  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
+           "SELECT
-                                ")
+              b.actual_output, b.out_put, b.result, a.is_public, a.input, a.output
-      else
+            FROM
-        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 position, input, output, challenge_id, is_public FROM test_sets where challenge_id=#{game_challenge.id}) a
-                                  g.id=#{game.id} and c.id= g.challenge_id and t.challenge_id = c.id
+            LEFT JOIN
-                                ")
+              (SELECT
-      end
+                 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
+            "SELECT t.is_public, t.input, t.output, t.position
+             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.80b6ec5e.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.a9947884.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.80b6ec5e.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.b4ee5e8a.js"></script></body></html>

app/views/layouts/_logined_header.html.erb

@@ -2,10 +2,10 @@
   <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %>
   <div class="head-nav pr">
     <ul id="header-nav">
-      <li class="<%= params[:action] == "index" && params[:controller] == "subjects" ? " active" : "" %>"><%= link_to "实训课程", subjects_path %></li>
+      <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实训课程", subjects_path %></li>
-      <li class="<%= params[:action] == "index" && params[:controller] == "courses" ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
+      <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
       <!-- 精选实训 -->
-      <li class="pr<%= params[:action] == "index" && params[:controller] == "shixuns" ? " active" : "" %>"><%= link_to "开发社区", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
+      <li class="pr<%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "开发社区", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
       
       <% careers = Career.published.order("created_at asc") %>
       <% if careers.present? %>
@@ -18,10 +18,10 @@
           </ul>
         </li>
       <% end %>
-      <li class="<%= params[:action] == "index" && params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
+      <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
-      <li class="<%= params[:action] == "index" && params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
+      <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
       <% if User.current.ec_school.present? %>
-        <li class="<%= params[:controller] == "ecs" ? " active" : "" %>" id="ec_banner">
+        <li class="<%= ecs_controller.include?(params[:controller]) ? " active" : "" %>" id="ec_banner">
           <%= link_to "认证", department_ecs_path(:school_id => User.current.ec_school) %>
         </li>
       <% end %>

app/views/layouts/_unlogin_header.html.erb

@@ -91,22 +91,19 @@
         document.getElementById('nHeader').style.left=sl+'px';
     }
   $(function () {
-      <% if params[:action] == "index" %>
       var $header = $("#header-nav").children("li");
-      <% case params[:controller] %>
+      <% if params[:controller] == "welcome" %>
-      <% when "welcome" %>
       $("#header-nav").children("li").eq(0).addClass("active");
-      <% when "shixuns" %>
+      <% elsif subjects_controller.include?(params[:controller]) %>
       $("#header-nav").children("li").eq(1).addClass("active");
-      <% when "subjects" %>
+      <% elsif course_controller.include?(params[:controller]) %>
       $("#header-nav").children("li").eq(2).addClass("active");
-      <% when "courses" %>
+      <% elsif shixuns_controller.include?(params[:controller]) %>
-      $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" %>
+      <% elsif params[:controller] == "competitions" %>
       $header.length == 7 ? $header.eq(5).addClass("active") : $header.eq(4).addClass("active");
-      <% when "forums" %>
+      <% elsif params[:controller] ==  "forums" %>
       $header.length == 7 ? $header.eq(6).addClass("active") : $header.eq(5).addClass("active");
       <% end %>
-      <% end %>
   })
 </script>

app/views/student_work/_echart_of_shixun_skills.html.erb

@@ -12,7 +12,7 @@
     option = {
         grid: {
             left: '3%',
-            right: '7%',
+            right: '9%',
             bottom: '3%',
             containLabel: true
         },

app/views/student_work/_shixun_work_show.html.erb

@@ -55,7 +55,7 @@
             <tr>
               <td>第<%= index + 1 %>关</td>
               <td class="<%= game.status == 2 && game.end_time > @homework.end_time ? 'color-red' : '' %>"><%= game.status == 2 ? format_time(game.end_time) : '- -' %></td>
-              <td><%= game.status == 2 ? game_spend_time(game.end_time.to_i - game.open_time.to_i) : '- -' %></td>
+              <td><%= game.consumes_time %></td>
               <td><%= game.status == 2 ? (game.final_score < 0 ? 0 : cha.score) : '- -' %></td>
             </tr>
           <% end %>

app/views/subjects/_paths_list.html.erb

@@ -70,22 +70,7 @@
   </div>
 <% end %>
 <script>
-    /* -------------- 简介Md -------------------- */
+
-    var shixunPro = editormd.markdownToHTML("shixuns_propaedeutics", {
-        htmlDecode: "style,script,iframe",  // you can filter tags decode
-        taskList: true,
-        tex: true,  // 默认不解析
-        flowChart: true,  // 默认不解析
-        sequenceDiagram: true // 默认不解析
-    });
-    /* -------------- 简介Md -------------------- */
-    var shixunPro = editormd.markdownToHTML("subject_learning_notes", {
-        htmlDecode: "style,script,iframe",  // you can filter tags decode
-        taskList: true,
-        tex: true,  // 默认不解析
-        flowChart: true,  // 默认不解析
-        sequenceDiagram: true // 默认不解析
-    });
     var flag = true;
 
     $(function() {

app/views/subjects/show.html.erb

@@ -109,6 +109,23 @@
   <% end %>
 </div>
 <script>
+
+    /* -------------- 简介Md -------------------- */
+    var shixunPro = editormd.markdownToHTML("shixuns_propaedeutics", {
+        htmlDecode: "style,script,iframe",  // you can filter tags decode
+        taskList: true,
+        tex: true,  // 默认不解析
+        flowChart: true,  // 默认不解析
+        sequenceDiagram: true // 默认不解析
+    });
+    /* -------------- 课程须知MD -------------------- */
+    var shixunPro = editormd.markdownToHTML("subject_learning_notes", {
+        htmlDecode: "style,script,iframe",  // you can filter tags decode
+        taskList: true,
+        tex: true,  // 默认不解析
+        flowChart: true,  // 默认不解析
+        sequenceDiagram: true // 默认不解析
+    });
     //点击新建阶段
     $(".click_add").click(function(){
         if($("#new_stage_form").length == 1){

app/views/welcome/index.html.erb

@@ -51,23 +51,12 @@
       </div>
     </div>
   </div>
-  <!--精选实训-->
-  <div class="clearfix pt20 educontent pr pb20">
-    <div class="edu-txt-center">
-      <p class="color-dark edu-txt-center font-24" style="line-height: 30px">精选实训</p>
-      <p class="color-grey-cd font-12">SELECTED TRAINING</p>
-    </div>
-    <a href="<%= shixuns_path %>" class="moreitem">更多<i class="fa fa-angle-right ml5"></i></a>
-    <div class="square-list clearfix">
-      <%= render :partial => "shixuns/shixun_item", :locals => {:shixuns => @shixuns} %>
-    </div>
-  </div>
 
   <!--实训路径-->
   <div class="clearfix pt20 educontent pr pb20 mb60">
     <div class="edu-txt-center">
       <p class="color-dark edu-txt-center font-24" style="line-height: 30px">实训课程</p>
-      <p class="color-grey-cd font-12">TRAINING PATH</p>
+      <p class="color-grey-cd font-12">TRAINING COURSE</p>
     </div>
     <a href="<%= subjects_path() %>" class="moreitem">更多<i class="fa fa-angle-right ml5"></i></a>
     <div class="square-list clearfix">
@@ -77,6 +66,20 @@
     <!--<a href="https://www.educoder.net/paths/4" target="_blank"><img src="/images/educoder/guagngao.png" width="100%"/></a>-->
   </div>
 
+  <!--精选实训 改为 开发社区-->
+  <div class="clearfix pt20 educontent pr pb20">
+    <div class="edu-txt-center">
+      <p class="color-dark edu-txt-center font-24" style="line-height: 30px">开发社区</p>
+      <p class="color-grey-cd font-12">DEVELOPMENT COMMUNITY</p>
+    </div>
+    <a href="<%= shixuns_path %>" class="moreitem">更多<i class="fa fa-angle-right ml5"></i></a>
+    <div class="square-list clearfix">
+      <%= render :partial => "shixuns/shixun_item", :locals => {:shixuns => @shixuns} %>
+    </div>
+  </div>
+
+  
+
   <!--导师排行榜-->
   <div class="pt60 pb60 mb30 mentor-ranking">
     <div class="educontent">

db/migrate/20190313005345_add_score_for_pass_games.rb

@@ -0,0 +1,39 @@
+class AddScoreForPassGames < ActiveRecord::Migration
+  def up
+    games = Game.where("final_score = 0 and status = 2 and answer_open = 0 and end_time > '2019-03-08 00:00:00'").includes(:challenge)
+    puts "game_count: #{games.count}"
+    games.find_each do |game|
+      puts "#{game.id}"
+      challenge =  game.challenge
+      # 选择题和实践题的分数
+      score = challenge.choose_score
+      user = game.user
+      game.update_column(:final_score, score)
+      # 奖励金币和提供记录
+      grade = Grade.where(:user_id => user.id, :container_id => game.id, :container_type => "Game").first
+      if grade.nil?
+        Grade.create!(:user_id => user.id,
+                      :container_id => game.id,
+                      :container_type => "Game",
+                      :score => score,
+                      :created_at => game.end_time,
+                      :updated_at => game.end_time)
+        user.update_column(:grade, (score + user.grade.to_i))
+      end
+      # 经验奖励
+      experience = Experience.where(:user_id => user.id, :container_id => game.id, :container_type => "Game").first
+      if experience.nil?
+        Experience.create!(:user_id => user.id,
+                           :container_id => game.id,
+                           :container_type => "Game",
+                           :score => score,
+                           :created_at => game.end_time,
+                           :updated_at => game.end_time)
+        user.update_column(:experience, (score + user.experience.to_i))
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20190313025622_remove_index_from_ecloud.rb

@@ -0,0 +1,5 @@
+class RemoveIndexFromEcloud < ActiveRecord::Migration
+  def change
+    remove_index :eclouds, :name => 'ecorder_cust_code'
+  end
+end

db/migrate/20190313055953_add_ecloud_id_to_ecloud_user.rb

@@ -0,0 +1,5 @@
+class AddEcloudIdToEcloudUser < ActiveRecord::Migration
+  def change
+    add_column :ecloud_users, :ecloud_id, :integer
+  end
+end

db/migrate/20190313062414_add_status_to_ecloud_user.rb

@@ -0,0 +1,5 @@
+class AddStatusToEcloudUser < ActiveRecord::Migration
+  def change
+    add_column :ecloud_users, :status, :integer, :limit => 1
+  end
+end

db/migrate/20190313090326_create_ecloud_productpara.rb

@@ -0,0 +1,11 @@
+class CreateEcloudProductpara < ActiveRecord::Migration
+  def change
+    create_table :ecloud_productparas do |t|
+      t.string :key
+      t.string :value
+      t.integer :ecloud_id
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190313090416_create_ecloud_serviece_servicepara.rb

@@ -0,0 +1,11 @@
+class CreateEcloudServieceServicepara < ActiveRecord::Migration
+  def change
+    create_table :ecloud_serviece_serviceparas do |t|
+      t.string :key
+      t.string :value
+      t.integer :ecloud_service_id
+
+      t.timestamps
+    end
+  end
+end

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/20190313115011_create_ecloud_logs.rb

@@ -0,0 +1,13 @@
+class CreateEcloudLogs < ActiveRecord::Migration
+  def change
+    create_table :ecloud_logs do |t|
+      t.string :url
+      t.string :applyno
+      t.integer :custid
+      t.string :custcode
+      t.string :para_value
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190313120249_change_clo.rb

@@ -0,0 +1,16 @@
+class ChangeClo < ActiveRecord::Migration
+  def up
+    change_column :eclouds, :begintime, :bigint, :limit => 20
+    change_column :eclouds, :endtime, :bigint, :limit => 20
+    change_column :eclouds, :operatime, :bigint, :limit => 20
+    change_column :eclouds, :effecttime, :bigint, :limit => 20
+    change_column :ecloud_services, :endtime, :bigint, :limit => 20
+    change_column :ecloud_services, :begintime, :bigint, :limit => 20
+    change_column :ecloud_users, :begintime, :bigint, :limit => 20
+    change_column :ecloud_users, :endtime, :bigint, :limit => 20
+    change_column :ecloud_logs, :para_value, :longtext
+  end
+
+  def down
+  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/20190314021743_add_productcode_to_ucloud_service.rb

@@ -0,0 +1,5 @@
+class AddProductcodeToUcloudService < ActiveRecord::Migration
+  def change
+    add_column :ecloud_services, :productcode, :string
+  end
+end

db/migrate/20190314065338_add_userid_to_ecloud_log.rb

@@ -0,0 +1,6 @@
+class AddUseridToEcloudLog < ActiveRecord::Migration
+  def change
+    add_column :ecloud_logs, :userid, :integer
+    add_column :ecloud_logs, :username, :string
+  end
+end

db/migrate/20190314070159_create_ecloud_user_paras.rb

@@ -0,0 +1,11 @@
+class CreateEcloudUserParas < ActiveRecord::Migration
+  def change
+    create_table :ecloud_user_paras do |t|
+      t.string :key
+      t.string :value
+      t.integer :ecloud_user_id
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190314073723_add_operatime_to_ecloud_users.rb

@@ -0,0 +1,6 @@
+class AddOperatimeToEcloudUsers < ActiveRecord::Migration
+  def change
+    add_column :ecloud_users, :operatime, :bigint
+    add_column :ecloud_users, :effecttime, :bigint
+  end
+end

db/migrate/20190314080802_create_shixun_student_works.rb

@@ -0,0 +1,93 @@
+class CreateShixunStudentWorks < ActiveRecord::Migration
+  DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
+
+  def down_generate_identifier type
+    if type == "game"
+      code = DCODES.sample(12).join
+      return down_generate_identifier(type) if Game.where(identifier: code).present?
+    elsif type == "myshixun"
+      code = DCODES.sample(10).join
+      return down_generate_identifier(type) if Myshixun.where(identifier: code).present?
+    end
+    code
+  end
+
+  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)
+
+              url = "#{Redmine::Configuration['gitlab_address_ip']}/#{g.project(shixun.try(:gpid)).try(:path_with_namespace)}.git"
+
+              rep_url = Base64.urlsafe_encode64(url) # 注意：educoder为默认给实训创建版本库的用户，如果换成别的用户，名字要相应的修改
+              uri = "#{shixun_tomcat}/bridge/game/openGameInstance"
+              params = {tpiID: "#{myshixun.id}", tpmGitURL:rep_url, tpiRepoName: gshixun.try(:name)}
+              logger.info("openGameInstance params is #{params}")
+              uri = URI.parse(URI.encode(uri.strip))
+              res = Net::HTTP.post_form(uri, params).body
+              res = JSON.parse(res)
+              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/react/build/asset-manifest.json

@@ -7,8 +7,8 @@
   "./static/js/10.943803f2.chunk.js.map": "./static/js/10.943803f2.chunk.js.map",
   "./static/js/11.c1a78f08.chunk.js": "./static/js/11.c1a78f08.chunk.js",
   "./static/js/11.c1a78f08.chunk.js.map": "./static/js/11.c1a78f08.chunk.js.map",
-  "./static/js/12.db6c3c0e.chunk.js": "./static/js/12.db6c3c0e.chunk.js",
+  "./static/js/12.fd69873b.chunk.js": "./static/js/12.fd69873b.chunk.js",
-  "./static/js/12.db6c3c0e.chunk.js.map": "./static/js/12.db6c3c0e.chunk.js.map",
+  "./static/js/12.fd69873b.chunk.js.map": "./static/js/12.fd69873b.chunk.js.map",
   "./static/js/13.d7c70bf4.chunk.js": "./static/js/13.d7c70bf4.chunk.js",
   "./static/js/13.d7c70bf4.chunk.js.map": "./static/js/13.d7c70bf4.chunk.js.map",
   "./static/js/14.af9b2fb8.chunk.js": "./static/js/14.af9b2fb8.chunk.js",
@@ -17,8 +17,8 @@
   "./static/js/15.05fc7db4.chunk.js.map": "./static/js/15.05fc7db4.chunk.js.map",
   "./static/js/16.efbbac6a.chunk.js": "./static/js/16.efbbac6a.chunk.js",
   "./static/js/16.efbbac6a.chunk.js.map": "./static/js/16.efbbac6a.chunk.js.map",
-  "./static/js/17.45b7dec5.chunk.js": "./static/js/17.45b7dec5.chunk.js",
+  "./static/js/17.17bd092d.chunk.js": "./static/js/17.17bd092d.chunk.js",
-  "./static/js/17.45b7dec5.chunk.js.map": "./static/js/17.45b7dec5.chunk.js.map",
+  "./static/js/17.17bd092d.chunk.js.map": "./static/js/17.17bd092d.chunk.js.map",
   "./static/js/18.24d189e1.chunk.js": "./static/js/18.24d189e1.chunk.js",
   "./static/js/18.24d189e1.chunk.js.map": "./static/js/18.24d189e1.chunk.js.map",
   "./static/js/19.cadd2a48.chunk.js": "./static/js/19.cadd2a48.chunk.js",
@@ -67,8 +67,8 @@
   "./static/js/9.2971266e.chunk.js.map": "./static/js/9.2971266e.chunk.js.map",
   "main.css": "./static/css/main.80b6ec5e.css",
   "main.css.map": "./static/css/main.80b6ec5e.css.map",
-  "main.js": "./static/js/main.a9947884.js",
+  "main.js": "./static/js/main.b4ee5e8a.js",
-  "main.js.map": "./static/js/main.a9947884.js.map",
+  "main.js.map": "./static/js/main.b4ee5e8a.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.80b6ec5e.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.a9947884.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.80b6ec5e.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.b4ee5e8a.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;
+            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;
+            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">

spec/factories/ecloud_logs.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :ecloud_log do
+    url "MyString"
+params ""
+  end
+
+end

spec/factories/ecloud_productparas.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :ecloud_productpara, :class => 'EcloudProductparas' do
+    key "MyString"
+value "MyString"
+  end
+
+end

spec/factories/ecloud_serviece_serviceparas.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :ecloud_serviece_servicepara, :class => 'EcloudServieceServicepara' do
+    key "MyString"
+value "MyString"
+  end
+
+end

spec/factories/ecloud_user_paras.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :ecloud_user_para do
+    key "MyString"
+value "MyString"
+  end
+
+end

spec/models/ecloud_log_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe EcloudLog, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/ecloud_productparas_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe EcloudProductparas, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/ecloud_serviece_servicepara_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe EcloudServieceServicepara, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/ecloud_user_para_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe EcloudUserPara, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end