From d15b5b2907908e1e7322aa195c353575460a3405 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 25 Dec 2019 20:20:03 +0800
Subject: [PATCH 1/2] 1

---
 .../record_detail.json.jbuilder               | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/views/hack_user_lastest_codes/record_detail.json.jbuilder b/app/views/hack_user_lastest_codes/record_detail.json.jbuilder
index 8f72014fe..66eedf85e 100644
--- a/app/views/hack_user_lastest_codes/record_detail.json.jbuilder
+++ b/app/views/hack_user_lastest_codes/record_detail.json.jbuilder
@@ -1,8 +1,12 @@
-json.(@hack_user, :id, :status, :error_line, :error_msg, :expected_output,
-    :input, :output, :execute_time, :execute_memory, :created_at, :code)
-json.language @hack_user.hack.language
-json.name @hack_user.hack.name
-json.myproblem_identifier @my_hack.identifier
-json.user do
-  json.partial! 'users/user', user: current_user
-end
\ No newline at end of file
+json.status 0
+json.message "返回成功"
+json.data do
+  json.(@hack_user, :id, :status, :error_line, :error_msg, :expected_output,
+      :input, :output, :execute_time, :execute_memory, :created_at, :code)
+  json.language @hack_user.hack.language
+  json.name @hack_user.hack.name
+  json.myproblem_identifier @my_hack.identifier
+  json.user do
+    json.partial! 'users/user', user: current_user
+  end
+end

From a04917fa2946ba4c33192ba4e6ecebd5b19d013f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 26 Dec 2019 09:17:32 +0800
Subject: [PATCH 2/2] VNC

---
 app/controllers/shixuns_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 992bd87f8..59dd20633 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -467,7 +467,7 @@ class ShixunsController < ApplicationController
 	def update_learn_setting
 		begin
 			ActiveRecord::Base.transaction do
-				@shixun.update_attributes!(shixun_params)
+				@shixun.update_attributes!(shixun_params.merge(vnc_evaluate: 1))
 			end
 		rescue => e
 			uid_logger_error("实训学习页面设置失败--------#{e.message}")