Merge branch 'develop' into dev_trustie_server

2026-05-20 19:55:56 +08:00 · 2021-06-22 15:15:51 +08:00
parent 23f7439a8c 539b832af6
commit 7bb4cf7391
2 changed files with 2 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -770,7 +770,7 @@ class ApplicationController < ActionController::Base
 	end

 	def base_url
-		request.base_url
+		Rails.application.config_for(:configuration)['platform_url'] || request.base_url
 	end

 	def convert_image!