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

app/controllers/hack_user_lastest_codes_controller.rb

@@ -105,7 +105,7 @@ class HackUserLastestCodesController < ApplicationController
         else
           [{input: params[:input]}]
         end
-    testCases = Base64.urlsafe_encode64(test_sets.to_json)
+    testCases = Base64.encode64(test_sets.to_json)
     #codeFileContent = Base64.urlsafe_encode64(@my_hack.code)
     debug_params = {execMode: exec_mode,
                     tpiID: @my_hack.identifier,

app/controllers/hacks_controller.rb

@@ -1,8 +1,9 @@
 class HacksController < ApplicationController
   before_action :require_login, except: [:index]
+  before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set]
   before_action :require_teacher_identity, only: [:create, :update_set]
   before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set]
-  before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set]
+
 
   # 开启编程，如果第一次开启，创建一条记录，如果已经开启过的话，直接返回标识即可
   def start

app/controllers/weapps/registers_controller.rb

@@ -50,7 +50,7 @@ class Weapps::RegistersController < Weapps::BaseController
     successful_authentication(@user)
     session[:user_id] = @user.id
 
-    render_ok(user_id: @user.id)
+    # render_ok(user_id: @user.id)
   end
 
   private