Merge branch 'dev_aliyun' into dev_cxt

app/controllers/application_controller.rb

@@ -27,8 +27,7 @@ class ApplicationController < ActionController::Base
 		if params[:client_key].present?
 			Rails.logger.info("111111  #{params[:client_key]}")
 			Rails.logger.info("00000  #{params[:timestamp]}")
-			Rails.logger.info("Time.now - params[:timestamp].to_i: #{Time.now.to_i - params[:timestamp].to_i}")
-			tip_exception(501, "请求超时") unless (Time.now.to_i - params[:timestamp].to_i).between?(0,5)
+			tip_exception(501, "请求不合理") unless (Time.now.to_i - params[:timestamp].to_i).between?(0,5)
 			timestamp = params[:timestamp]
 			sign = Digest::MD5.hexdigest("#{OPENKEY}#{timestamp}")
 			Rails.logger.info("2222  #{sign}")

app/controllers/ecs/homes_controller.rb

@@ -3,6 +3,10 @@ class Ecs::HomesController < Ecs::BaseController
     @school_managers = current_school.users
   end
 
+  def first_stamp
+    render :json => { status: 0, message: Time.now.to_i }
+  end
+
   private
 
   def current_school

config/routes.rb

@@ -15,6 +15,7 @@ Rails.application.routes.draw do
   scope '/api' do
     get 'home/index'
     get 'home/search'
+    get 'home/first_stamp'
 
     get 'search', to: 'searchs#index'
 
@@ -1337,6 +1338,7 @@ Rails.application.routes.draw do
 
   root 'main#index'
 
+
   ## react用
   get '*path', to: 'main#index', constraints: ReactConstraint.new
 end