Merge branch 'dev_aliyun' into dev_tj

merge aliyun
dev_static
tangjiang 5 years ago
commit 6a75df1253

@ -224,7 +224,7 @@ class CoursesController < ApplicationController
normal_status(0, "成功") normal_status(0, "成功")
rescue => e rescue => e
uid_logger_error(e.message) uid_logger_error(e.message)
tip_exception("课堂更新失败") tip_exception("课堂更新失败,原因: #{e.message}")
raise ActiveRecord::Rollback raise ActiveRecord::Rollback
end end
end end

@ -225,7 +225,7 @@ class GraduationTasksController < ApplicationController
} }
attachment = work.attachments.last attachment = work.attachments.last
if attachment if attachment
o[:downloadUrl] = "https://#{Setting.host_name}/"+download_url(attachment) o[:downloadUrl] = "https://#{edu_setting('host_name')}/"+download_url(attachment)
end end
o o

Loading…
Cancel
Save