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

app/controllers/exercises_controller.rb

@@ -601,7 +601,7 @@ class ExercisesController < ApplicationController
         end
       rescue Exception => e
         uid_logger_error(e.message)
-        tip_exception("试卷提交失败")
+        tip_exception(e.message)
         raise ActiveRecord::Rollback
       end
     end

app/controllers/weapps/courses_controller.rb

@@ -1,6 +1,6 @@
 class Weapps::CoursesController < Weapps::BaseController
   # before_action :require_wechat_login!
-  before_action :teacher_allowed, except: [:create]
+  before_action :teacher_allowed, except: [:create, :show, :shixun_homework_category]
 
   def create
     return render_error("只有老师身份才能创建课堂") unless current_user.is_teacher?
@@ -17,16 +17,29 @@ class Weapps::CoursesController < Weapps::BaseController
   end
 
   def update
-    Weapps::UpdateCourseService.call(current_course, course_params)
+    Weapps::UpdateCourseService.call(current_course, update_course_params)
     render_ok
   end
 
+  def show
+    @course = current_course
+    @current_user = current_user
+  end
+
+  def shixun_homework_category
+    @categories = current_course.shixun_course_modules.first&.course_second_categories
+  end
+
   private
 
   def course_params
     params.permit(:name, :course_list_name, :credit, course_module_types: [])
   end
 
+  def update_course_params
+    params.permit(:name, :course_list_name, :credit)
+  end
+
   def current_course
     @_current_course = Course.find params[:id]
   end

app/views/weapps/courses/shixun_homework_category.json.jbuilder

@@ -0,0 +1,3 @@
+json.categories @categories.each do |category|
+  json.(category, :id, :name)
+end

app/views/weapps/courses/show.json.jbuilder

@@ -0,0 +1,4 @@
+json.(@course, :id, :name, :course_members_count, :credit)
+json.teachers_count @course.teachers.count
+json.students_count @course.students.count
+json.course_identity @current_user.course_identity(@course)

config/routes.rb

@@ -880,7 +880,11 @@ Rails.application.routes.draw do
         post :cancel_sticky, on: :collection
       end
 
-      resources :courses, only: [:create, :update, :edit]
+      resources :courses, only: [:create, :update, :edit, :show] do
+        member do
+          get :shixun_homework_category
+        end
+      end
     end
 
     resources :users_for_partners, only: [:index]