From 6e2e70810d2f10ad0e6c699710bf9291f3b03bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Dec 2019 19:46:12 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B0=83=E6=95=B43=E6=AC=A1=E8=AF=B7?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 3 +++ public/react/src/modules/tpm/NewHeader.js | 25 ++++++++++++++++++++- public/react/src/modules/tpm/TPMIndexHOC.js | 25 ++++++++++++++++++++- 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 07fd13e49..c5c5a869a 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -460,6 +460,9 @@ class App extends Component { this.setState({ mygetHelmetapi:response.data.setting }); + //存储配置到游览器 + localStorage.setItem('chromesetting',JSON.stringify(response.data.setting)); + localStorage.setItem('chromesettingresponse',JSON.stringify(response)); try { if (response.data.setting.tab_logo_url) { this.gettablogourldata(response); diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index ac5213ec1..c633b35ed 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -706,6 +706,29 @@ submittojoinclass=(value)=>{ } getAppdata=()=>{ + try { + var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); + var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse')); + console.log("NewHeaderNewHeaderNewHeader"); + console.log(chromesettingArray); + console.log(chromesettingresponseArray); + + this.setState({ + mygetHelmetapi2:chromesettingArray + }); + if (chromesettingArray.tab_logo_url) { + this.gettablogourldata(chromesettingresponseArray); + } else { + this.gettablogourlnull(); + } + }catch (e) { + console.log("head获取游览器配置失败 重新请求开始读取配置"); + console.log(e); + this.geturlsdata(); + } + }; + + geturlsdata=()=>{ let url = "/setting.json"; axios.get(url).then((response) => { // console.log("app.js开始请求/setting.json"); @@ -741,7 +764,7 @@ submittojoinclass=(value)=>{ this.gettablogourlnull(); }); - }; + } matchpaths=(url)=>{ diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index fe760f372..e86c85bb2 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -315,6 +315,28 @@ export function TPMIndexHOC(WrappedComponent) { } //获取当前定制信息 getAppdata = () => { + try { + var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); + var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse')); + console.log("TPMLNdexHOC"); + console.log(chromesettingArray); + console.log(chromesettingresponseArray); + this.setState({ + mygetHelmetapi:chromesettingArray + }); + if (chromesettingArray.tab_logo_url) { + this.gettablogourldata(chromesettingresponseArray); + } else { + this.gettablogourlnull(); + } + }catch (e) { + console.log("hoc获取游览器配置失败 重新请求开始读取配置"); + console.log(e); + this.getAppdatausr(); + } + + }; + getAppdatausr=()=>{ let url = "/setting.json"; axios.get(url).then((response) => { // console.log("app.js开始请求/setting.json"); @@ -350,7 +372,8 @@ export function TPMIndexHOC(WrappedComponent) { this.gettablogourlnull(); }); - }; + + } /** 课堂权限相关方法，暂时写这里了 ----------------------------------------END */ From e363dfebda72502e8f1a7a3ac000c41041caa569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Dec 2019 19:48:27 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=B0=83=E6=95=B43=E6=AC=A1=E8=AF=B7?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 2 ++ public/react/src/modules/tpm/TPMIndexHOC.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index c633b35ed..146eb52ef 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -738,6 +738,8 @@ submittojoinclass=(value)=>{ this.setState({ mygetHelmetapi2:response.data.setting }); + localStorage.setItem('chromesetting',JSON.stringify(response.data.setting)); + localStorage.setItem('chromesettingresponse',JSON.stringify(response)); try { if (response.data.setting.tab_logo_url) { this.gettablogourldata(response); diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index e86c85bb2..9f58d173a 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -346,6 +346,8 @@ export function TPMIndexHOC(WrappedComponent) { this.setState({ mygetHelmetapi: response.data.setting }); + localStorage.setItem('chromesetting',JSON.stringify(response.data.setting)); + localStorage.setItem('chromesettingresponse',JSON.stringify(response)); try { if (response.data.setting.tab_logo_url) { this.gettablogourldata(response); From f219e377b6a9f6767fc050d17b3e3e5162dfdf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Dec 2019 19:48:59 +0800 Subject: [PATCH 3/9] =?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/modules/tpm/NewHeader.js | 1 - public/react/src/modules/tpm/TPMIndexHOC.js | 1 - 2 files changed, 2 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 146eb52ef..b37a9d474 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -723,7 +723,6 @@ submittojoinclass=(value)=>{ } }catch (e) { console.log("head获取游览器配置失败 重新请求开始读取配置"); - console.log(e); this.geturlsdata(); } }; diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 9f58d173a..68f3e4b1c 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -331,7 +331,6 @@ export function TPMIndexHOC(WrappedComponent) { } }catch (e) { console.log("hoc获取游览器配置失败 重新请求开始读取配置"); - console.log(e); this.getAppdatausr(); } From 44de6c1e25f831a34755dc5618027ef08c951029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Dec 2019 19:50:55 +0800 Subject: [PATCH 4/9] =?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/modules/tpm/NewHeader.js | 6 +++--- public/react/src/modules/tpm/TPMIndexHOC.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index b37a9d474..95813c28c 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -709,9 +709,9 @@ submittojoinclass=(value)=>{ try { var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse')); - console.log("NewHeaderNewHeaderNewHeader"); - console.log(chromesettingArray); - console.log(chromesettingresponseArray); + // console.log("NewHeaderNewHeaderNewHeader"); + // console.log(chromesettingArray); + // console.log(chromesettingresponseArray); this.setState({ mygetHelmetapi2:chromesettingArray diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 68f3e4b1c..f50260336 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -318,9 +318,9 @@ export function TPMIndexHOC(WrappedComponent) { try { var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse')); - console.log("TPMLNdexHOC"); - console.log(chromesettingArray); - console.log(chromesettingresponseArray); + // console.log("TPMLNdexHOC"); + // console.log(chromesettingArray); + // console.log(chromesettingresponseArray); this.setState({ mygetHelmetapi:chromesettingArray }); From 26a6c145ca281ebc437629c552d67601d267b2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 28 Dec 2019 00:26:17 +0800 Subject: [PATCH 5/9] =?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/public/css/edu-all.css | 20 ++++++++++---------- public/stylesheets/educoder/edu-all.css | 20 ++++++++++---------- public/stylesheets/educoder/edu-main.css | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 66adaf482..2bcd1fb98 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -3485,15 +3485,15 @@ a.singlepublishtwo{ word-break: break-all; } -.RightPaneDrawer .ant-drawer-content{ - background: #070f1a; - overflow: hidden !important; -} +/*.RightPaneDrawer .ant-drawer-content{*/ +/* background: #070f1a;*/ +/* overflow: hidden !important;*/ +/*}*/ -.deletebuttom{ - border: transparent; -} +/*.deletebuttom{*/ +/* border: transparent;*/ +/*}*/ -.RightPaneDrawer .jupyter_data_list{ - max-height: 340px; -} \ No newline at end of file +/*.RightPaneDrawer .jupyter_data_list{*/ +/* max-height: 340px;*/ +/*}*/ \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index d4b5633d7..9ea25e0e4 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3805,15 +3805,15 @@ a.singlepublishtwo{ word-break: break-all; } -.RightPaneDrawer .ant-drawer-content{ - background: #070f1a; - overflow: hidden !important; -} +/*.RightPaneDrawer .ant-drawer-content{*/ +/* background: #070f1a;*/ +/* overflow: hidden !important;*/ +/*}*/ -.deletebuttom{ - border: transparent; -} +/*.deletebuttom{*/ +/* border: transparent;*/ +/*}*/ -.RightPaneDrawer .jupyter_data_list{ - max-height: 340px; -} \ No newline at end of file +/*.RightPaneDrawer .jupyter_data_list{*/ +/* max-height: 340px;*/ +/* }*/ \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index cbb6fb1f5..4037fb38a 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -826,15 +826,15 @@ html>body #ajax-indicator { position: fixed; } word-break: break-all; } -.RightPaneDrawer .ant-drawer-content{ - background: #070f1a; - overflow: hidden !important; -} +/*.RightPaneDrawer .ant-drawer-content{*/ +/* background: #070f1a;*/ +/* overflow: hidden !important;*/ +/*}*/ -.deletebuttom{ - border: transparent; -} +/*.deletebuttom{*/ +/* border: transparent;*/ +/*}*/ -.RightPaneDrawer .jupyter_data_list{ - max-height: 340px; -} \ No newline at end of file +/*.RightPaneDrawer .jupyter_data_list{*/ +/* max-height: 340px;*/ +/*}*/ \ No newline at end of file From 50c9261a9ff021a6194b19978cc02811a9b2e174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 28 Dec 2019 00:36:43 +0800 Subject: [PATCH 6/9] =?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/public/css/edu-all.css | 20 ++++++++++---------- public/stylesheets/educoder/edu-all.css | 20 ++++++++++---------- public/stylesheets/educoder/edu-main.css | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 2bcd1fb98..66adaf482 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -3485,15 +3485,15 @@ a.singlepublishtwo{ word-break: break-all; } -/*.RightPaneDrawer .ant-drawer-content{*/ -/* background: #070f1a;*/ -/* overflow: hidden !important;*/ -/*}*/ +.RightPaneDrawer .ant-drawer-content{ + background: #070f1a; + overflow: hidden !important; +} -/*.deletebuttom{*/ -/* border: transparent;*/ -/*}*/ +.deletebuttom{ + border: transparent; +} -/*.RightPaneDrawer .jupyter_data_list{*/ -/* max-height: 340px;*/ -/*}*/ \ No newline at end of file +.RightPaneDrawer .jupyter_data_list{ + max-height: 340px; +} \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 9ea25e0e4..8be6e00ab 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3805,15 +3805,15 @@ a.singlepublishtwo{ word-break: break-all; } -/*.RightPaneDrawer .ant-drawer-content{*/ -/* background: #070f1a;*/ -/* overflow: hidden !important;*/ -/*}*/ +.RightPaneDrawer .ant-drawer-content{ + background: #070f1a; + overflow: hidden !important; +} -/*.deletebuttom{*/ -/* border: transparent;*/ -/*}*/ +.deletebuttom{ + border: transparent; +} -/*.RightPaneDrawer .jupyter_data_list{*/ -/* max-height: 340px;*/ -/* }*/ \ No newline at end of file +.RightPaneDrawer .jupyter_data_list{ + max-height: 340px; + } \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 4037fb38a..cbb6fb1f5 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -826,15 +826,15 @@ html>body #ajax-indicator { position: fixed; } word-break: break-all; } -/*.RightPaneDrawer .ant-drawer-content{*/ -/* background: #070f1a;*/ -/* overflow: hidden !important;*/ -/*}*/ +.RightPaneDrawer .ant-drawer-content{ + background: #070f1a; + overflow: hidden !important; +} -/*.deletebuttom{*/ -/* border: transparent;*/ -/*}*/ +.deletebuttom{ + border: transparent; +} -/*.RightPaneDrawer .jupyter_data_list{*/ -/* max-height: 340px;*/ -/*}*/ \ No newline at end of file +.RightPaneDrawer .jupyter_data_list{ + max-height: 340px; +} \ No newline at end of file From c02657b432a8eab3febceca34ef7ac111e6db826 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 28 Dec 2019 18:17:11 +0800 Subject: [PATCH 7/9] test --- app/views/admins/laboratories/index.html.erb | 20 +------------------- app/views/admins/laboratories/index.js.erb | 2 +- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/app/views/admins/laboratories/index.html.erb b/app/views/admins/laboratories/index.html.erb index 397f50cbe..a463ab7a6 100644 --- a/app/views/admins/laboratories/index.html.erb +++ b/app/views/admins/laboratories/index.html.erb @@ -1,19 +1 @@ -<% define_admin_breadcrumbs do %> - <% add_admin_breadcrumb('云上实验室') %> -<% end %> - -
- <%= form_tag(admins_laboratories_path(unsafe_params), method: :get, class: 'form-inline search-form flex-1', remote: true) do %> - <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-6 col-md-4 ml-3', placeholder: '学校名称/二级域名前缀检索') %> - <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> - <% end %> - - <%= javascript_void_link '新建', class: 'btn btn-primary', data: { toggle: 'modal', target: '.admin-create-laboratory-modal' } %> -
- -
- <%= render(partial: 'admins/laboratories/shared/list', locals: { laboratories: @laboratories }) %> -
- -<%= render 'admins/laboratories/shared/create_laboratory_modal' %> -<%= render 'admins/laboratories/shared/add_laboratory_user_modal' %> \ No newline at end of file +666git \ No newline at end of file diff --git a/app/views/admins/laboratories/index.js.erb b/app/views/admins/laboratories/index.js.erb index dc17c6a6d..8853508e8 100644 --- a/app/views/admins/laboratories/index.js.erb +++ b/app/views/admins/laboratories/index.js.erb @@ -1 +1 @@ -$('.laboratory-list-container').html("<%= j(render partial: 'admins/laboratories/shared/list', locals: { laboratories: @laboratories }) %>"); \ No newline at end of file +555 \ No newline at end of file From 8916be95297cdde0afc140b4fa43dad7cfaff4e1 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 28 Dec 2019 18:22:10 +0800 Subject: [PATCH 8/9] add log --- app/controllers/admins/laboratories_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/admins/laboratories_controller.rb b/app/controllers/admins/laboratories_controller.rb index 9f6d23c9b..36dcbbe07 100644 --- a/app/controllers/admins/laboratories_controller.rb +++ b/app/controllers/admins/laboratories_controller.rb @@ -1,6 +1,7 @@ class Admins::LaboratoriesController < Admins::BaseController def index default_sort('id', 'desc') + Rails.logger("666666666") laboratories = Admins::LaboratoryQuery.call(params) @laboratories = paginate laboratories.preload(:school, :laboratory_users) From 2474cfc0465949751ac8ee9b76a4e1ea72445ca5 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 28 Dec 2019 18:29:14 +0800 Subject: [PATCH 9/9] rest --- .../admins/laboratories_controller.rb | 1 - app/views/admins/laboratories/index.html.erb | 20 +++- app/views/admins/laboratories/index.js.erb | 2 +- config/environments/production.rb.example | 111 ------------------ 4 files changed, 20 insertions(+), 114 deletions(-) delete mode 100644 config/environments/production.rb.example diff --git a/app/controllers/admins/laboratories_controller.rb b/app/controllers/admins/laboratories_controller.rb index 36dcbbe07..9f6d23c9b 100644 --- a/app/controllers/admins/laboratories_controller.rb +++ b/app/controllers/admins/laboratories_controller.rb @@ -1,7 +1,6 @@ class Admins::LaboratoriesController < Admins::BaseController def index default_sort('id', 'desc') - Rails.logger("666666666") laboratories = Admins::LaboratoryQuery.call(params) @laboratories = paginate laboratories.preload(:school, :laboratory_users) diff --git a/app/views/admins/laboratories/index.html.erb b/app/views/admins/laboratories/index.html.erb index a463ab7a6..397f50cbe 100644 --- a/app/views/admins/laboratories/index.html.erb +++ b/app/views/admins/laboratories/index.html.erb @@ -1 +1,19 @@ -666git \ No newline at end of file +<% define_admin_breadcrumbs do %> + <% add_admin_breadcrumb('云上实验室') %> +<% end %> + +
+ <%= form_tag(admins_laboratories_path(unsafe_params), method: :get, class: 'form-inline search-form flex-1', remote: true) do %> + <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-6 col-md-4 ml-3', placeholder: '学校名称/二级域名前缀检索') %> + <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> + <% end %> + + <%= javascript_void_link '新建', class: 'btn btn-primary', data: { toggle: 'modal', target: '.admin-create-laboratory-modal' } %> +
+ +
+ <%= render(partial: 'admins/laboratories/shared/list', locals: { laboratories: @laboratories }) %> +
+ +<%= render 'admins/laboratories/shared/create_laboratory_modal' %> +<%= render 'admins/laboratories/shared/add_laboratory_user_modal' %> \ No newline at end of file diff --git a/app/views/admins/laboratories/index.js.erb b/app/views/admins/laboratories/index.js.erb index 8853508e8..dc17c6a6d 100644 --- a/app/views/admins/laboratories/index.js.erb +++ b/app/views/admins/laboratories/index.js.erb @@ -1 +1 @@ -555 \ No newline at end of file +$('.laboratory-list-container').html("<%= j(render partial: 'admins/laboratories/shared/list', locals: { laboratories: @laboratories }) %>"); \ No newline at end of file diff --git a/config/environments/production.rb.example b/config/environments/production.rb.example deleted file mode 100644 index be2bdf3d7..000000000 --- a/config/environments/production.rb.example +++ /dev/null @@ -1,111 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] - # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). - # config.require_master_key = true - - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. - ## config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? - config.public_file_server.enabled = true - - # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier - # config.assets.css_compressor = :sass - - # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false - - # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = 'http://assets.example.com' - - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX - - # Store uploaded files on the local file system (see config/storage.yml for options) - config.active_storage.service = :local - - # Mount Action Cable outside main process or domain - # config.action_cable.mount_path = nil - # config.action_cable.url = 'wss://example.com/cable' - # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Use the lowest log level to ensure availability of diagnostic information - # when problems arise. - config.log_level = :info - - # Prepend all log lines with the following tags. - config.log_tags = [ :request_id ] - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - # Use a real queuing backend for Active Job (and separate queues per environment) - # config.active_job.queue_adapter = :resque - # config.active_job.queue_name_prefix = "educoderplus_#{Rails.env}" - - config.action_mailer.perform_caching = false - - # Ignore bad email addresses and do not raise email delivery errors. - # Set this to true and configure the email server for immediate delivery to raise delivery errors. - # config.action_mailer.raise_delivery_errors = false - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new - - # Use a different logger for distributed setups. - # require 'syslog/logger' - # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') - - if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) - end - - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false - - config.active_record.belongs_to_required_by_default = false - - # config.cache_store = :file_store, "#{Rails.root }/files/cache_store/" - #config.cache_store = :redis_store, 'redis://r-bp122bd1b710f274.redis.rds.aliyuncs.com:6379/0/cache', { expires_in: 90.minutes } - config.cache_store = :redis_store, 'redis://10.9.72.102:6379/0/cache', { expires_in: 90.minutes } - - config.action_mailer.delivery_method = :smtp - config.action_mailer.smtp_settings = { - address: 'smtp.exmail.qq.com', - port: 25, - domain: 'smtp.qq.com', - user_name: 'educoder@trustie.org', - password: 'mAZc9EWbe2Kawaqo2', - authentication: 'login', - enable_starttls_auto: true } -end