From 8f0db2f4738843ccd184d705ab59e630374b55b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 30 Dec 2019 16:59:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/AppConfig.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 29e7461ec..9350001e4 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -7,8 +7,6 @@ import { broadcastChannelOnmessage ,SetAppModel, isDev, queryString } from 'educ import { notification } from 'antd'; import './index.css'; const opens ="79e33abd4b6588941ab7622aed1e67e8"; -let timestamp = Date.parse(new Date()); -const newopens=md5(opens+timestamp) broadcastChannelOnmessage('refreshPage', () => { window.location.reload() }) @@ -94,6 +92,8 @@ export function initAxiosInterceptors(props) { } } if(`${config[0]}`!=`true`){ + let timestamp = Date.parse(new Date())/1000; + let newopens=md5(opens+timestamp) if (window.location.port === "3007") { config.url = `${proxy}${url}`; if (config.url.indexOf('?') == -1) { From d7dc0c8648f1f5a0e76ba1925cd840a91c15ced9 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 30 Dec 2019 17:24:51 +0800 Subject: [PATCH 2/6] first stamp --- app/controllers/application_controller.rb | 2 +- app/controllers/main_controller.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3d1fd642e..d3f70fad2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -27,7 +27,7 @@ class ApplicationController < ActionController::Base if params[:client_key].present? Rails.logger.info("111111 #{params[:client_key]}") Rails.logger.info("00000 #{params[:timestamp]}") - tip_exception(501, "请求超时") if Time.now - params[:timestamp].to_i > 5 + tip_exception(501, "请求不合理") if Time.now - params[:timestamp].to_i > 5 timestamp = params[:timestamp] sign = Digest::MD5.hexdigest("#{OPENKEY}#{timestamp}") Rails.logger.info("2222 #{sign}") diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 395e536f4..bf18b2cda 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -4,4 +4,8 @@ class MainController < ApplicationController def index render file: 'public/react/build/index.html', :layout => false end + + def first_stamp + render :json => { status: 0, message: Time.now.to_i } + end end \ No newline at end of file From e4c46793dcc4cd29c03993dc0788a7a485d5127e Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 30 Dec 2019 17:28:59 +0800 Subject: [PATCH 3/6] first stamp --- config/routes.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index f9ed12dbe..afa61a0aa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,9 @@ Rails.application.routes.draw do require 'admin_constraint' mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new + root 'main#index' + get 'main#first_stamp' + get 'attachments/download/:id', to: 'attachments#show' get 'attachments/download/:id/:filename', to: 'attachments#show' get 'auth/qq/callback', to: 'oauth/qq#create' @@ -1334,7 +1337,7 @@ Rails.application.routes.draw do get 'oauth/get_code', to: 'oauth#get_code' get 'oauth/get_token_callback', to: 'oauth#get_token_callback' - root 'main#index' + ## react用 get '*path', to: 'main#index', constraints: ReactConstraint.new From f5984c0483579d59fb5e4a82cb2bf1c88d509b92 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 30 Dec 2019 17:30:18 +0800 Subject: [PATCH 4/6] first stamp --- config/routes.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index afa61a0aa..633a93776 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,9 +4,6 @@ Rails.application.routes.draw do require 'admin_constraint' mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new - root 'main#index' - get 'main#first_stamp' - get 'attachments/download/:id', to: 'attachments#show' get 'attachments/download/:id/:filename', to: 'attachments#show' get 'auth/qq/callback', to: 'oauth/qq#create' @@ -1337,7 +1334,8 @@ Rails.application.routes.draw do get 'oauth/get_code', to: 'oauth#get_code' get 'oauth/get_token_callback', to: 'oauth#get_token_callback' - + root 'main#index' + get 'main#first_stamp' ## react用 get '*path', to: 'main#index', constraints: ReactConstraint.new From b00eb6090240d4d3430f01301b288c599725e492 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 30 Dec 2019 17:34:37 +0800 Subject: [PATCH 5/6] .. --- app/controllers/ecs/homes_controller.rb | 4 ++++ app/controllers/main_controller.rb | 4 ---- config/routes.rb | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/ecs/homes_controller.rb b/app/controllers/ecs/homes_controller.rb index 7edbd7d78..2202f6882 100644 --- a/app/controllers/ecs/homes_controller.rb +++ b/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 diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index bf18b2cda..395e536f4 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -4,8 +4,4 @@ class MainController < ApplicationController def index render file: 'public/react/build/index.html', :layout => false end - - def first_stamp - render :json => { status: 0, message: Time.now.to_i } - end end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 633a93776..7506066ed 100644 --- a/config/routes.rb +++ b/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' @@ -1335,7 +1336,7 @@ Rails.application.routes.draw do get 'oauth/get_token_callback', to: 'oauth#get_token_callback' root 'main#index' - get 'main#first_stamp' + ## react用 get '*path', to: 'main#index', constraints: ReactConstraint.new From 26a473620b66de26a42cd040d09cc596decae4b2 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 30 Dec 2019 17:35:29 +0800 Subject: [PATCH 6/6] .. --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 7506066ed..c569596cc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,7 +15,7 @@ Rails.application.routes.draw do scope '/api' do get 'home/index' get 'home/search' - get 'home#first_stamp' + get 'home/first_stamp' get 'search', to: 'searchs#index'