Merge branches 'dev_aliyun' and 'dev_item_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank

app/controllers/application_controller.rb

@@ -400,7 +400,7 @@ class ApplicationController < ActionController::Base
 			end
 		rescue Exception => e
 			uid_logger("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new("实训平台繁忙（繁忙等级：84）")
+			raise Educoder::TipException.new(message)
 		end
 	end
 

app/controllers/shixuns_controller.rb

@@ -795,12 +795,12 @@ class ShixunsController < ApplicationController
 					rep_url = Base64.urlsafe_encode64(repo_ip_url @repo_path)
 					uri = "#{cloud_bridge}/bridge/game/openGameInstance"
 					params = {tpiID: "#{@myshixun.id}", tpmGitURL: rep_url, tpiRepoName: @myshixun.repo_name.split("/").last}
-					interface_post uri, params, 83, "实训云平台繁忙（繁忙等级：83）"
+					interface_post uri, params, 83, "服务器出现问题，请重置环境"
 				end
 			end
 		rescue => e
 			uid_logger_error(e.message)
-			tip_exception("服务器出现问题，请重置环境")
+			tip_exception(e.message)
 		end
 	end
 

app/services/concerns/elasticsearch_able.rb

@@ -9,7 +9,7 @@ module ElasticsearchAble
       highlight: highlight_options,
       body_options: body_options,
       page: page,
-      per_page: per_page
+      per_page: 20
     }
   end
 
@@ -37,7 +37,7 @@ module ElasticsearchAble
 
   def per_page
     per_page = params[:per_page].to_s.strip.presence || params[:limit].to_s.strip.presence
-    per_page.to_i <= 0 ? 20 : per_page.to_i
+    per_page.to_i <= 0 || per_page.to_i > 20 ? 20 : per_page.to_i
   end
 
   def page