From 80559d41094623d1a34109d09adb261ffe52c596 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 21 Feb 2020 16:05:11 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/controller_rescue_handler.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/concerns/controller_rescue_handler.rb b/app/controllers/concerns/controller_rescue_handler.rb index a3e603bd9..6ff15cfbc 100644 --- a/app/controllers/concerns/controller_rescue_handler.rb +++ b/app/controllers/concerns/controller_rescue_handler.rb @@ -14,6 +14,10 @@ module ControllerRescueHandler Util.logger_error e render json: {status: -1, message: "接口方法异常"} end + + rescue_from ActionController::UnknownFormat do |e| + render json: {status: -1, message: "接口调用非JSON格式"} + end # rescue_from ActionView::MissingTemplate, with: :object_not_found # rescue_from ActiveRecord::RecordNotFound, with: :object_not_found rescue_from Educoder::TipException, with: :tip_show From ff7f2d709b48dcae35f4458933c4a9590e60e2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 21 Feb 2020 16:34:32 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/config/webpack.config.dev.js | 2 +- public/react/public/css/demo_index.html | 46 +++ public/react/public/css/iconfont.css | 20 +- public/react/public/css/iconfont.eot | Bin 87004 -> 87360 bytes public/react/public/css/iconfont.js | 2 +- public/react/public/css/iconfont.json | 14 + public/react/public/css/iconfont.svg | 6 + public/react/public/css/iconfont.ttf | Bin 86836 -> 87192 bytes public/react/public/css/iconfont.woff | Bin 55004 -> 55256 bytes public/react/public/css/iconfont.woff2 | Bin 46088 -> 46304 bytes public/react/src/App.js | 18 +- .../react/src/modules/courses/css/Courses.css | 3 +- public/react/src/modules/login/Otherlogin.css | 49 +++ public/react/src/modules/login/Otherlogin.js | 145 ++++----- .../react/src/modules/login/Otherloginold.js | 292 ++++++++++++++++++ .../src/modules/paths/PathDetail/DetailTop.js | 56 ++-- .../src/modules/paths/PathDetail/sendPanel.js | 6 +- .../modules/user/LoginRegisterComponent.js | 15 +- public/react/src/modules/user/commontwo.css | 8 + .../educoder/iconfont/demo_index.html | 46 +++ .../educoder/iconfont/iconfont.css | 20 +- .../educoder/iconfont/iconfont.eot | Bin 87004 -> 87360 bytes .../stylesheets/educoder/iconfont/iconfont.js | 2 +- .../educoder/iconfont/iconfont.json | 14 + .../educoder/iconfont/iconfont.svg | 6 + .../educoder/iconfont/iconfont.ttf | Bin 86836 -> 87192 bytes .../educoder/iconfont/iconfont.woff | Bin 55004 -> 55256 bytes .../educoder/iconfont/iconfont.woff2 | Bin 46088 -> 46304 bytes 28 files changed, 635 insertions(+), 135 deletions(-) create mode 100644 public/react/src/modules/login/Otherlogin.css create mode 100644 public/react/src/modules/login/Otherloginold.js diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js index 98396ab18..85aa92b9f 100644 --- a/public/react/config/webpack.config.dev.js +++ b/public/react/config/webpack.config.dev.js @@ -32,7 +32,7 @@ module.exports = { // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s //devtool: "cheap-module-eval-source-map", // 开启调试 - //devtool: "source-map", // 开启调试 + devtool: "source-map", // 开启调试 // These are the "entry points" to our application. // This means they will be the "root" imports that are included in JS bundle. // The first two entry points enable "hot" CSS and auto-refreshes for JS. diff --git a/public/react/public/css/demo_index.html b/public/react/public/css/demo_index.html index fb08bc9cf..281ac40d0 100644 --- a/public/react/public/css/demo_index.html +++ b/public/react/public/css/demo_index.html @@ -30,6 +30,18 @@