Merge branch 'educoder' into develop

app/controllers/application_controller.rb

@@ -362,6 +362,13 @@ class ApplicationController < ActionController::Base
     true
   end
 
+  # 运营人员
+  def require_business
+    unless (User.current.business? || User.current.admin?)
+      render_403
+    end
+  end
+
   def deny_access
     User.current.logged? ? render_403 : require_login
   end

app/controllers/courses_controller.rb

@@ -1635,7 +1635,7 @@ class CoursesController < ApplicationController
 
     @course_modules = @course.course_modules.where(:hidden => 0)
     course_module_type = @course_modules.map(&:module_type)
-    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? || User.current.business?
     if User.current.member_of_course?(@course) && !@is_teacher
       member = @course.members.where(:user_id => User.current.id).first
       if member.try(:course_group_id).to_i == 0

app/controllers/managements_controller.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 class ManagementsController < ApplicationController
-  before_filter :require_admin
+  before_filter :require_business
   layout 'base_management'
   include ManagementsHelper
   include SortHelper
@@ -63,7 +63,6 @@ class ManagementsController < ApplicationController
   # 工程认证视频导入模板
   def ec_template
     @template = EcTemplate.where(nil)
-
   end
 
   def add_template
@@ -3350,7 +3349,7 @@ end
         end
 
     @users = User.where(:id => user_id).where("#{sql}").includes(:apply_actions, user_extensions: [:department, :school]).order("last_login_on desc")
-    @xls_users = @users.reorder("created_on desc").limit(1000) #导出excel用户
+    @xls_users = @users.reorder("created_on desc").limit(3000) #导出excel用户
     @page = (params['page'] || 1).to_i
     @users_count = @users.count
     @limit = 20
@@ -4181,7 +4180,7 @@ end
     sheet1 = book.create_worksheet :name => "course"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
-    sheet1.row(0).concat(["ID","课堂名称","成员","资源","普通作业","	实训作业","试卷","私有","状态","创建者单位","创建者","动态时间"])
+    sheet1.row(0).concat(["ID","课堂名称","成员","资源","普通作业","	实训作业","试卷","私有","状态","创建者单位","创建者","动态时间","创建时间"])
     count_row = 1
     courses.each do |course|
       school = course.teacher.try(:user_extensions).try(:school).try(:name).blank? ? "--" : course.teacher.school_name
@@ -4198,6 +4197,7 @@ end
       sheet1[count_row,9] = school
       sheet1[count_row,10] = teacher_name
       sheet1[count_row,11] = format_time(course.updatetime)
+      sheet1[count_row,12] = format_time(course.created_at)
       count_row += 1
     end
     book.write xls_report

app/controllers/shixuns_controller.rb

@@ -12,6 +12,7 @@ class ShixunsController < ApplicationController
   before_filter :view_allow, :only => [:collaborators, :propaedeutics, :shixun_discuss, :ranking_list]
   before_filter :require_manager, :only => [ :settings, :add_script, :publish, :collaborators_delete, :shixun_members_added, :add_collaborators, :update, :destroy]
   before_filter :validation_email, :only => [:new]
+  before_filter :require_admin, :only => [:destroy]
   # 移动云ToC模式权限控制
   # before_filter :ecloud_auth, :except => [:show, :index]
 

app/controllers/users_controller.rb

@@ -274,7 +274,7 @@ class UsersController < ApplicationController
 
   # 私信
   def private_messages
-    if User.current == @user || User.current.admin?
+    if User.current == @user || User.current.admin? || User.current.business?
       @onclick_time = User.current.onclick_time.onclick_time
       User.current.onclick_time.update_attribute(:onclick_time, Time.now)
       @messages = PrivateMessage.find_by_sql("SELECT ui.* FROM (SELECT * FROM private_messages WHERE STATUS != 2 AND user_id = #{@user.id} ORDER BY id DESC) ui GROUP BY ui.target_id ORDER BY ui.send_time DESC")

app/controllers/welcome_controller.rb

@@ -30,6 +30,17 @@ class WelcomeController < ApplicationController
   require 'simple_xlsx_reader'
 
   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 local_init
+    LocalShixun.delete_all
+    LocalMirrorRepository.delete_all
+    LocalShixunTagRepertoire.delete_all
+    LocalChallenge.delete_all
+    LocalTestSet.delete_all
+    LocalChallengeTag.delete_all
+    render :json => {status: 0, message: "success"}
+  end
+
+
   def shixun_to_local
     identifiers = params[:identifiers].split(",")
     shixuns = Shixun.where(identifier: identifiers)
@@ -62,7 +73,7 @@ class WelcomeController < ApplicationController
             if shixun.challenges.present?
               shixun.challenges.each do |challenge|
                 new_challenge = LocalChallenge.new
-                new_challenge.attributes = challenge.attributes.dup.except("id","shixun_id","user_id")
+                new_challenge.attributes = challenge.attributes.dup.except("id","shixun_id","user_id", "test_set_score")
                 new_challenge.local_shixun_id = local_shixun.id
                 new_challenge.save!
                 # 评测题，选择题暂时不考虑
@@ -98,6 +109,7 @@ class WelcomeController < ApplicationController
 
   def local_to_shixun
     ActiveRecord::Base.transaction do
+      shixun_list = []
       LocalShixun.find_each do |local_shixun|
         identifier = generate_identifier
         shixun = Shixun.create!(name: local_shixun.name, description: local_shixun.description, user_id: User.current.id,
@@ -141,7 +153,7 @@ class WelcomeController < ApplicationController
         if local_challenges.present?
           local_challenges.each do |local_challenge|
             new_challenge = Challenge.new
-            new_challenge.attributes = local_challenge.attributes.dup.except("id","local_shixun_id","user_id")
+            new_challenge.attributes = local_challenge.attributes.dup.except("id","local_shixun_id","user_id", "test_set_score")
             new_challenge.user_id = User.current.id
             new_challenge.shixun_id = shixun.id
             new_challenge.save!
@@ -166,8 +178,9 @@ class WelcomeController < ApplicationController
             end
           end
         end
-        render :json => {status: 0, message: "success", identifier: shixun.identifier}
+        shixun_list << shixun.identifier
       end
+      render :json => {status: 0, message: "success", identifier: shixun_list}
     end
   end
 
@@ -205,7 +218,7 @@ class WelcomeController < ApplicationController
     @tea_users = User.where(homepage_teacher: 1).includes(:user_extensions).limit(10).order("experience desc")
     @stu_users = User.includes(:user_extensions).where(user_extensions: {identity: 1}).limit(10).order("experience desc")
 
-    render :layout => 'educoder'
+    render :layout => 'base_local'
   end
 
   # 自动导入用户

app/helpers/application_helper.rb

@@ -3995,7 +3995,7 @@ module ApplicationHelper
 
   # Returns the javascript tags that are included in the html layout head
   def javascript_heads
-    tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min', 'baiduTemplate')
+    tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3',  'jquery.colorbox-min', 'baiduTemplate')
     unless User.current.pref.warn_on_leaving_unsaved == '0'
       tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
     end
@@ -4009,6 +4009,15 @@ module ApplicationHelper
     tags
   end
 
+  # 临时本地版
+  def javascript_heads_local
+    tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3',  'jquery.colorbox-min')
+    unless User.current.pref.warn_on_leaving_unsaved == '0'
+      tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
+    end
+    tags
+  end
+
   def hubspot_head
     tags = javascript_include_tag('hubspot/messenger.min', 'hubspot/messenger-theme-future')
     tags << stylesheet_link_tag('hubspot/messenger', 'hubspot/messenger-theme-future', 'hubspot/messenger-theme-flat')

app/models/open_source_project.rb

@@ -121,13 +121,6 @@ class OpenSourceProject < ActiveRecord::Base
     ApplyProjectMaster.delete_all "apply_type = '#{self.class}' AND apply_id = #{self.id} AND user_id = #{user.id}"
   end
 
-  def admin?(user)
-    if user.admin? or ApplyProjectMaster.find(:all, :conditions => ["user_id = ? and apply_type = 'OpenSourceProject' and apply_id = ? and status = ?", user.id, self.id, 2]).present?
-    return true
-    else
-    return false
-    end
-  end
 
   def reset_counters!
     self.class.reset_counters!(id)

app/services/games_service.rb

@@ -17,7 +17,7 @@ class GamesService
 
     myshixun = Myshixun.min.find(game.myshixun_id)
     shixun = Shixun.min.find(myshixun.shixun_id)
-    unless (myshixun.user_id == current_user.id || current_user.admin? || current_user.id == shixun.try(:user_id) || current_user.is_certification_teacher)
+    unless (myshixun.user_id == current_user.id || current_user.admin? || current_user.business? || current_user.id == shixun.try(:user_id) || current_user.is_certification_teacher)
       return{:status => 403}
     end
     game_challenge = Challenge.min.find(game.challenge_id)

app/views/account/login.html.erb

@@ -73,15 +73,6 @@
               <% end %>
             </div>
           </div>
-          <!--第三方账号登录-->
-          <!--<div class="mt10 edu-txt-center">
-            <p class="color-grey-9">第三方账号登录</p>
-            <div class="mt15">
-              <a href="javascript:void(0)" class="margin15"><img src="/images/educoder/weixin.png" class="radius"/></a>
-              <a href="javascript:void(0)" class="margin15"><img src="/images/educoder/QQ.png" class="radius"/></a>
-              <a href="javascript:void(0)" class="margin15"><img src="/images/educoder/weibo.png" class="radius"/></a>
-            </div>
-          </div>-->
         </div>
       </div>
       <%= render :partial => "account/copyright_info" %>

app/views/layouts/_logined_header.html.erb

@@ -6,25 +6,8 @@
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></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? %>
-        <li class="fl edu-menu-panel headIcon careershover <%= params[:action] == "index" && params[:controller] == "careers" ? " active" : "" %>" style="cursor: auto;">
-          <p>职业路径</p>
-          <ul class="edu-menu-list edu-menu-listnew" style="top:60px">
-            <% careers.each do |career| %>
-              <li><a href="<%= introduction_career_path(career) %>"><%= career.name %></a></li>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
       <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
-      <% if User.current.ec_school.present? %>
-        <li class="<%= ecs_controller.include?(params[:controller]) ? " active" : "" %>" id="ec_banner">
-          <%= link_to "认证", department_ecs_path(:school_id => User.current.ec_school) %>
-        </li>
-      <% end %>
     </ul>
     <div class="posi-search" id="posi-search" style="display: none">
       <div class="search-all clearfix">
@@ -45,25 +28,27 @@
       </div>
     </div>
   </div>
-  <div class="fr edu-menu-panel ml15" style="height:60px;">
+  <% if User.current.logged? %>
-    <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius mt13", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fl" %>
+    <div class="fr edu-menu-panel ml15" style="height:60px;">
-    <ul class="edu-menu-list" style="top:60px;">
+      <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius mt13", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fl" %>
-      <span class="bor-bottom-greyE currentName task-hide"><%= User.current.show_name %></span>
+      <ul class="edu-menu-list" style="top:60px;">
-      <li><%= link_to '我的课堂', user_path(User.current) %></li>
+        <span class="bor-bottom-greyE currentName task-hide"><%= User.current.show_name %></span>
-      <li><%= link_to '我的实训', user_path(User.current, :type => 'a_shixun') %></li>
+        <li><%= link_to '我的课堂', user_path(User.current) %></li>
-      <li><%= link_to '我的实训课程', user_path(User.current, :type => 'a_path') %></li>
+        <li><%= link_to '我的实训', user_path(User.current, :type => 'a_shixun') %></li>
-      <% if User.current.partner.present? %>
+        <li><%= link_to '我的实训课程', user_path(User.current, :type => 'a_path') %></li>
-        <li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li>
+        <li><%= link_to '我的项目', user_path(User.current, :type => 'a_project') %></li>
-      <% end %>
+        <li><%= link_to '账号管理', my_account_path %></li>
-      <li><%= link_to '我的项目', user_path(User.current, :type => 'a_project') %></li>
+        <li class="bor-top-greyE"><%= link_to '退出', signout_path %></li>
+      </ul>
+    </div>
+  <% else %>
+    <span class="font-15 fr mt15 ml15">
+      <%= link_to '登录', signin_path, :class => "mr5 color-white" %>
+      <em class="vertical-line"></em>
+      <%= link_to '注册', user_join_path, :class => "ml5 color-white" %>
+    </span>
+  <% end %>
 
-      <% if User.current.department_members.count > 0 %>
-        <li><%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %></li>
-      <% end %>
-      <li><%= link_to '账号管理', my_account_path %></li>
-      <li class="bor-top-greyE"><%= link_to '退出', signout_path %></li>
-    </ul>
-  </div>
   <div class="fr head-right">
     <a href="javascript:void(0)" id="search-open" class="fl headIcon pointer">
       <i class="iconfont icon-sousuo color-white"></i>
@@ -81,28 +66,12 @@
           <li><%= link_to '新建项目', new_project_path() %></li>
         </ul>
         <ul class="fl with50 edu-txt-center">
-            <li><%= link_to "加入课堂", join_private_courses_courses_path, :remote => true %></li>
+          <li><%= link_to "加入课堂", join_private_courses_courses_path, :remote => true %></li>
-            <li><%= link_to "加入项目", applied_join_project_path, :remote => true %></li>
+          <li><%= link_to "加入项目", applied_join_project_path, :remote => true %></li>
         </ul>
       </div>
     </div>
 
-
-    <div class="fl edu-menu-panel headIcon">
-      <a href="<%= user_tidings_user_path(User.current) %>">
-        <i class="iconfont icon-xiaoxilingdang color-white"></i>
-      </a>
-      <!--新消息提醒-->
-      <% new_tidings_count = User.current.tidings.where("created_at > '#{User.current.onclick_time.onclick_time}'").count %>
-      <% new_pri_message_count = User.current.private_messages.where("created_at > '#{User.current.onclick_time.onclick_time}'").count %>
-      <% count = new_tidings_count + new_pri_message_count %>
-      <% if count > 0 %>
-        <a href="<%= user_tidings_user_path(User.current) %>"><span class="newslight"><%= count > 99 ? "99+" : count %></span>  </a>
-          <div class="edu-menu-list edu-txt-center" style="width:220px;top:60px">
-            <a class="font-14 padding10" style="line-height: 35px;" href="<%= user_tidings_user_path(User.current) %>">您有<span class="color-orange"><%= count %></span>条新消息，点击查看</a>
-          </div>
-      <% end %>
-    </div>
   </div>
 </div>
 
@@ -128,11 +97,11 @@
 
         <% notice = SystemUpdateNotice.last %>
         <% if @noticed_update || ((User.current.certification == 1 || params[:controller] != "welcome") && notice.present? && notice.end_time > Time.now && notice.start_time >= (Time.now - 21600) && User.current.user_system_notices.where(:notice_type => notice.notice_type).count == 0) %>
-          var htmlvalue = "<%= escape_javascript(render :partial => 'account/user_update_notice', :locals => {:notice => notice})%>";
+        var htmlvalue = "<%= escape_javascript(render :partial => 'account/user_update_notice', :locals => {:notice => notice})%>";
-          pop_box_new(htmlvalue, 500, 380);
+        pop_box_new(htmlvalue, 500, 380);
-          <% UserSystemNotice.create(:user_id => User.current.id, :notice_type => notice.notice_type) %>
+        <% UserSystemNotice.create(:user_id => User.current.id, :notice_type => notice.notice_type) %>
         <%# elsif notice.present? && notice.end_time < Time.now %>
-          <%# notice.destroy %>
+        <%# notice.destroy %>
         <% end %>
     });
 

app/views/layouts/_unlogin_header.html.erb

@@ -8,17 +8,6 @@
 
       <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? %>
-        <li class="fl edu-menu-panel headIcon careershover <%= params[:action] == "index" && params[:controller] == "careers" ? " active" : "" %>" style="cursor: auto;">
-          <p>职业路径</p>
-          <ul class="edu-menu-list edu-menu-listnew" style="top:60px">
-            <% careers.each do |career| %>
-              <li><a href="<%= introduction_career_path(career) %>"><%= career.name %></a></li>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
       <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->

app/views/layouts/base_edu_user.html.erb

@@ -7,43 +7,23 @@
   <meta name="keywords" content="智能课堂，实训项目" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/font-awesome','educoder/edu-main','educoder/edu-all','educoder/magic-check.css','/assets/iconfont/iconfont.css', :media => 'all' %>  <%= javascript_heads %>
+  <%= stylesheet_link_tag 'css/font-awesome','educoder/edu-main','educoder/edu-all','/assets/iconfont/iconfont.css', :media => 'all' %>
-  <%= javascript_include_tag 'edu/application', 'educoder/edu_application','educoder/edu_account',"educoder/edu_user" %>
-  <%= yield :header_tags -%>
-  <!-- MathJax的配置 -->
-  <script type="text/javascript"
-          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-  </script>
-  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
-  <script type="text/x-mathjax-config">
-    MathJax.Hub.Config({
-
-    showMathMenu: false,
-    showMathMenuMSIE: false,
-      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
-    });
-  </script>
 </head>
 <body onload="prettyPrint();">
-<div class="newContainer">    <!-- 页面全部内容 -->
+<div class="newContainer">
-  <div class="newHeader" id="nHeader">     <!-- 头部 -->
+  <div class="newHeader" id="nHeader">
-    <% if User.current.logged? %>
+    <%= render :partial => 'layouts/logined_header' %>
-        <%= render :partial => 'layouts/logined_header' %>
-    <% else%>
-        <%= render :partial => 'layouts/unlogin_header' %>
-    <% end%>
     <div class="cl"></div>
   </div>
-  <div class="newMain clearfix"> <!-- 主提部分 -->
+  <div class="newMain clearfix">
     <div id="Container">
       <%= yield %>
     </div>
     <div class="cl"></div>
-    <!-------------------侧边提示区域-------------------------->
+
     <%= render :partial => 'users/returnTop_btn' %>
   </div>
-  <!----------------------左侧导航栏 ------------------------->
+
-  <%#= render :partial => 'layouts/public_left_info' %>
   <%= render :partial => 'layouts/footer' %>
   <div class="cl"></div>
   <div id="ajax-modal" style="display:none;"></div>
@@ -55,4 +35,6 @@
   </div>
 </div>
 </body>
+<%= javascript_heads_local %>
+<%= javascript_include_tag 'edu/application', 'educoder/edu_application',"educoder/edu_user" %>
 </html>

app/views/layouts/base_local.html.erb

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="高校智能课堂与综合实训平台" />
+  <meta name="keywords" content="智能课堂，实训项目" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_edu_index_heads %>
+  <%= stylesheet_link_tag 'educoder/edu-main', 'educoder/edu-all', 'educoder/magic-check'  %>
+
+</head>
+
+<div class="newContainer">
+  <div class="newHeader" id="nHeader">
+    <%= render 'layouts/logined_header' %>
+  </div>
+  <div class="newMain clearfix">
+    <%= yield %>
+  </div>
+  <%= render :partial => 'layouts/footer' %>
+</div>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+
+</body>
+<%= javascript_include_tag 'educoder/edu_application','educoder/jquery.raty' %>
+</html>
+

app/views/layouts/login.html.erb

@@ -7,23 +7,9 @@
   <meta name="keywords" content="智能课堂，实训项目" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','educoder/edu-main','educoder/edu-all', 'css/font-awesome','educoder/magic-check.css' %>
+  <%= stylesheet_link_tag 'educoder/edu-main','educoder/edu-all' %>
-  <%#= javascript_heads %>
+  <%= javascript_include_tag 'jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'educoder/edu_application', 'educoder/edu_account'  %>
-  <%= javascript_include_tag 'jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'jquery.colorbox-min', 'edu/application', 'educoder/edu_application','educoder/edu_account','educoder/avatars' %>
-  <%#= stylesheet_link_tag 'css/edu-showpage','css/edu-index', 'css/font-awesome', 'css/edu-common', 'css/edu-login', 'css/edu-public', 'css/edu-popup' %>
-  <%#= javascript_include_tag  'edu/application', "bigdata" %>
-  <!-- MathJax的配置 -->
-  <script type="text/javascript"
-          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-  </script>
-  <script type="text/x-mathjax-config">
-    MathJax.Hub.Config({
 
-    showMathMenu: false,
-    showMathMenuMSIE: false,
-      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
-    });
-  </script>
 </head>
 <body>
     <div class="newContainer">

config/routes.rb

@@ -286,6 +286,7 @@ RedmineApp::Application.routes.draw do ## oauth相关
   get 'welcome/ccf' => 'welcome#ccf'
   get 'welcome/shixun_to_local' => 'welcome#shixun_to_local'
   get 'welcome/local_to_shixun' => 'welcome#local_to_shixun'
+  get 'welcome/local_init' => 'welcome#local_init'
 
   # get 'competitions/home' => 'competitions#home'
   # get 'competitions/hn' => 'competitions#index'

db/migrate/20190426020414_add_business_to_user.rb

@@ -0,0 +1,5 @@
+class AddBusinessToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :business, :boolean, :default => false
+  end
+end

lib/tasks/users.rake

@@ -89,7 +89,7 @@ task :add_test_users => :environment do
   (1..1000).each do |i|
 
     no = sprintf("%04d", i)
-    phone = "1560731#{no}"
+    phone = "5160731#{no}"
 
     us = UsersService.new
     user = us.register phone: phone, password: 'edu12345678'
@@ -109,7 +109,7 @@ task :add_test_users => :environment do
         lastname: lastname,
         nickname: '',
         sex: 0,
-        mail: "educoder#{no}@qq.com",
+        mail: "00educoder#{no}@qq.com",
         identity: 1,
         te_technical_title: 0,
         pro_technical_title: 0,

public/javascripts/educoder/edu_application.js

@@ -15,18 +15,6 @@ $(function(){
         var searchText = result[1]
         $('#search-input').val(searchText)
     }
-    // 未报名用户登录时弹框
-    // console.log(Cookies.get('enroll_status'));
-    // if(Cookies.get('enroll_status') == 0){
-    //     Cookies.remove('enroll_status');
-    //     var html='<div class="CompetitionEnrollBox">'+
-    //         '<div class="pr with40">'+
-    //         '<img src="/images/educoder/competition/boxEnroll.png" width="100%"/>'+
-    //         '<a href="javascript:void(0)" class="CloseBox" onclick="CloseBox();"><i class="iconfont icon-roundclose color-grey-c"></i></a>'+
-    //         '<a href="https://www.educoder.net/competitions/gcc-dev-2018/enroll" class="ImmediatelyEnroll">立即报名</a>'+
-    //         '</div></div>';
-    //     $(".newContainer").append(html);
-    // }
 });
 
 function CloseBox(){