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

app/controllers/accounts_controller.rb

@@ -60,7 +60,8 @@ class AccountsController < ApplicationController
         ua = UserAgent.find_by_ip(ip)
         ua.update_column(:agent_type, UserAgent::USER_REGISTER) if ua
         successful_authentication(@user)
-        session[:user_id] = @user.id
+        # session[:user_id] = @user.id
+        session[:"#{default_yun_session}"] = @user.id
         normal_status("注册成功")
       end
     rescue Exception => e
@@ -94,7 +95,7 @@ class AccountsController < ApplicationController
     successful_authentication(@user)
     login_control.clear # 重置每日密码错误次数
 
-    session[:user_id] = @user.id
+    # session[:user_id] = @user.id
   end
 
   # 忘记密码
@@ -158,7 +159,7 @@ class AccountsController < ApplicationController
 
   def logout
     UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)
-    session[:user_id] = nil
+    session[:"#{default_yun_session}"] = nil
     logout_user
     render :json => {status: 1, message: "退出成功!"}
   end

app/controllers/admins/shixun_feedback_messages_controller.rb

@@ -0,0 +1,14 @@
+class Admins::ShixunFeedbackMessagesController < Admins::BaseController
+
+  def index
+    default_sort('created_at', 'desc')
+    @params_page = params[:page] || 1
+    if params[:keyword]
+      discusses = Discuss.find_by_sql("select * from discusses join shixuns on discusses.dis_id = shixuns.id where discusses.dis_type='Shixun' AND
+                                   shixuns.name like '%#{params[:keyword]}%'")
+    else
+      discusses = Discuss.where(:dis_type => 'Shixun').includes(:user, :dis)
+    end
+    @discusses = paginate discusses
+  end
+end

app/controllers/application_controller.rb

@@ -299,9 +299,11 @@ class ApplicationController < ActionController::Base
 	# and starts a session if needed
 	def find_current_user
 		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
-		if session[:user_id]
+		uid_logger("0000000000000user setup start: session[:user_id] is #{session[:"#{default_yun_session}"]}")
+		current_domain_session = session[:"#{default_yun_session}"]
+		if current_domain_session
 			# existing session
-			(User.active.find(session[:user_id]) rescue nil)
+			(User.active.find(current_domain_session) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
@@ -313,10 +315,10 @@ class ApplicationController < ActionController::Base
 	def try_to_autologin
 		if cookies[autologin_cookie_name]
 			# auto-login feature starts a new session
-			user = User.try_to_autologin(cookies[autologin_cookie_name])
+			user = nil
-			if user
+			Rails.logger.info("111111111111111111#{default_yun_session}, session is #{session[:"#{default_yun_session}"]} ")
-				start_user_session(user)
+			user = User.try_to_autologin(cookies[autologin_cookie_name]) if session[:"#{default_yun_session}"]
-			end
+			start_user_session(user) if user
 			user
 		end
 	end

app/controllers/concerns/laboratory_helper.rb

@@ -27,5 +27,6 @@ module LaboratoryHelper
 
   def default_yun_session
     @_default_yun_session = "#{request.subdomain.split('.').first}_user_id"
+    # @_default_yun_session = "#{current_laboratory.try(:identifier).split('.').first}_user_id"
   end
 end

app/controllers/concerns/login_helper.rb

@@ -47,7 +47,7 @@ module LoginHelper
       User.current.delete_session_token(session[:tk])
       self.logged_user = nil
     end
-    session[:user_id] = nil
+    session[:"#{default_yun_session}"] = nil
   end
 
   # Sets the logged in user
@@ -73,8 +73,8 @@ module LoginHelper
     # #   session[:"#{request.subdomain}_user_id"] = user.id
     # # end
 
-    session[:user_id] = user.id
+    # session[:user_id] = user.id
-    # session[:"#{default_yun_session}"] = user.id
+    session[:"#{default_yun_session}"] = user.id
     session[:ctime] = Time.now.utc.to_i
     session[:atime] = Time.now.utc.to_i
   end

app/controllers/hack_user_lastest_codes_controller.rb

@@ -35,7 +35,7 @@ class HackUserLastestCodesController < ApplicationController
   # 提交结果显示
   def result
     if @my_hack.submit_status == 1
-      render json: {status:0, message: "正在评测中"}
+      render json: {status: 1, message: "正在评测中"}
     else
       @mode = params[:mode]
       @result =

app/controllers/oauth/base_controller.rb

@@ -12,7 +12,8 @@ class Oauth::BaseController < ActionController::Base
   private
 
   def session_user_id
-    session[:user_id]
+    # session[:user_id]
+    session[:"#{default_yun_session}"]
   end
 
   def current_user

app/controllers/polls_controller.rb

@@ -198,14 +198,14 @@ class PollsController < ApplicationController
   def common_header
     ActiveRecord::Base.transaction do
       begin
+        @poll_status = @poll.get_poll_status(current_user)
         if @user_course_identity > Course::ASSISTANT_PROFESSOR
           @is_teacher_or = 0
-          @user_poll_answer = @poll.check_user_votes_status(current_user)
+          @user_poll_answer = @poll.check_user_votes_status(current_user, @poll_status)
         else
           @is_teacher_or = 1
           @user_poll_answer = 3  #教师页面
         end
-        @poll_status = @poll.get_poll_status(current_user)
         poll_id_array = [@poll.id]
         @poll_publish_count = get_user_permission_course(poll_id_array,2).count   #是否存在已发布的
         @poll_unpublish_count = get_user_permission_course(poll_id_array,1).count  #是否存在未发布的

app/controllers/weapps/registers_controller.rb

@@ -48,7 +48,8 @@ class Weapps::RegistersController < Weapps::BaseController
       )
     end
     successful_authentication(@user)
-    session[:user_id] = @user.id
+    # session[:user_id] = @user.id
+    session[:"#{default_yun_session}"] = @user.id
 
     # render_ok(user_id: @user.id)
   end

app/helpers/polls_helper.rb

@@ -77,7 +77,7 @@ module PollsHelper
       ex_pb_time = poll.get_poll_times(user.id,false)
       poll_publish_time = ex_pb_time[:publish_time]
       poll_end_time = ex_pb_time[:end_time]
-      current_status = poll.check_user_votes_status(user)
+      current_status = poll.check_user_votes_status(user, poll_status)
       lock_icon = 0  #不显示锁图标
     else
       poll_users_list = poll.get_poll_exercise_users

app/models/poll.rb

@@ -146,12 +146,22 @@ class Poll < ApplicationRecord
   end
 
   #判断当前用户的答题状态
-  def check_user_votes_status(user)
+  def check_user_votes_status(user, poll_status)
     poll_answer_user = poll_users.where(user_id: user.id).select(:start_at,:end_at,:commit_status)
     user_status = 2
     if poll_answer_user.exists? && (poll_answer_user.first&.start_at.present? || poll_answer_user.first&.end_at.present?)   #学生有过答题的,或者立即截止，但学生未做试卷的
       user_status = poll_answer_user.first.commit_status
     end
+    # 问卷已截止时学生的答题状态需要考虑问卷的状态
+    if poll_status > 2
+      # 问卷如果还是继续答题状态则自动提交
+      if user_status == 0
+        poll_end_time = get_poll_times(user.id,false)[:end_time]
+        poll_answer_user.first.update_attributes!(:commit_status => 1, :end_at => poll_end_time)
+        user_status = 1
+      end
+      user_status = user_status == 1 ? 1 : 4
+    end
     user_status
   end
 

app/views/admins/shared/_sidebar.html.erb

@@ -65,6 +65,12 @@
       <% end %>
     </li>
 
+    <li>
+      <%= sidebar_item_group('#comments-submenu', '消息', icon: 'comments') do %>
+      <li><%= sidebar_item(admins_shixun_feedback_messages_path, '实训反馈', icon: 'comment', controller: 'admins-shixun_feedback_messages') %></li>
+    <% end %>
+    </li>
+
     <li>
       <%= sidebar_item_group('#major-identification-submenu', '工程认证', icon: 'anchor') do %>
        <li><%= sidebar_item(admins_major_informations_path, '本科专业目录', icon: 'outdent', controller: 'admins-major_informations') %></li>

app/views/admins/shixun_feedback_messages/index.html.erb

@@ -0,0 +1,14 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('实训反馈', admins_shixun_feedback_messages_path) %>
+<% end %>
+
+<div class="box search-form-container">
+  <%= form_tag(admins_shixun_feedback_messages_path, method: :get, class: 'form-inline search-form', remote: true) do %>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-md-4 ml-3', placeholder: '输入实训名称关键字进行搜索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+  <% end %>
+</div>
+
+<div class="box admin-list-container shixun_feedback_messages-list-container">
+  <%= render(partial: 'admins/shixun_feedback_messages/shared/list', locals: {discusses: @discusses}) %>
+</div>

app/views/admins/shixun_feedback_messages/index.js.erb

@@ -0,0 +1,2 @@
+$(".shixun_feedback_messages-list-container")
+    .html("<%= j render partial: "admins/shixun_feedback_messages/shared/list", locals: {discusses: @discusses} %>")

app/views/admins/shixun_feedback_messages/shared/_list.html.erb

@@ -0,0 +1,29 @@
+<table class="table table-hover text-center">
+  <thead class="thead-light">
+  <tr>
+    <th width="5%">序号</th>
+    <th width="25%" class="text-left">实训名称</th>
+    <th width="50%" class="text-left">评论内容</th>
+    <th width="10%">评论者</th>
+    <th width="10%">评论时间</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if discusses.present? %>
+    <% discusses.each_with_index do |discuss, index| %>
+      <tr>
+        <td><%= (@params_page.to_i - 1) * 20 + index + 1 %></td>
+        <% identifier = Game.find_by(challenge_id: discuss.challenge_id, user_id: discuss.user_id)&.identifier %>
+        <td class="text-left"><%= link_to discuss.dis.name, "/tasks/#{identifier}", target: '_blank'%></td>
+        <td class="text-left"><%= content_safe discuss.content %></td>
+        <td><%= discuss.user.show_real_name %></td>
+        <td><%= format_time discuss.created_at %></td>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: discusses } %>

app/views/hack_user_lastest_codes/result.json.jbuilder

@@ -1,7 +1,12 @@
-json.(@result, :id, :status, :error_line, :error_msg,
+json.status 0
+json.message "评测成功"
+json.data do
+  json.(@result, :id, :status, :error_line, :error_msg,
       :input, :output, :execute_time, :execute_memory)
 # 提交模式多了一个预计输出
-if @mode == "submit"
+  if @mode == "submit"
     json.expected_output @result.expected_output
+  end
 end
 
+

app/views/hacks/edit.json.jbuilder

@@ -1,5 +1,5 @@
 # 编程内容
-json.(@hack, :name, :description, :language, :code)
+json.(@hack, :name, :description, :language, :difficult, :category, :time_limit, :open_or_not)
 
 # 代码
 json.language @hack.language

config/routes.rb

@@ -1039,6 +1039,7 @@ Rails.application.routes.draw do
     end
     resources :shixuns, only: [:index,:destroy]
     resources :shixun_settings, only: [:index,:update]
+    resources :shixun_feedback_messages, only: [:index]
     resources :department_applies,only: [:index,:destroy] do
       collection do
         post :merge