From 4df02b4eb610c0bb8b1a524769a942a6fdd788ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AC=A2=E4=B9=90=E9=A9=AC?=
 <38058090+SkywalkerSpace@users.noreply.github.com>
Date: Wed, 27 Mar 2024 21:25:36 +0800
Subject: [PATCH] rstript service_url (#5997)

---
 frontend/src/pages/sys-admin/web-settings/input-item.js | 4 ++++
 scripts/setup-seafile-mysql.py                          | 2 +-
 scripts/setup-seafile.sh                                | 2 +-
 seahub/api2/endpoints/admin/web_settings.py             | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/sys-admin/web-settings/input-item.js b/frontend/src/pages/sys-admin/web-settings/input-item.js
index 41c5e32fff..577397adba 100644
--- a/frontend/src/pages/sys-admin/web-settings/input-item.js
+++ b/frontend/src/pages/sys-admin/web-settings/input-item.js
@@ -23,6 +23,10 @@ class WebSettingInput extends Component {
     };
   }
 
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    this.setState({value: nextProps.value});
+  }
+
   toggleBtns = () => {
     this.setState({isBtnsShown: !this.state.isBtnsShown});
   };
diff --git a/scripts/setup-seafile-mysql.py b/scripts/setup-seafile-mysql.py
index 1f20cde7fd..9c5dcf0010 100644
--- a/scripts/setup-seafile-mysql.py
+++ b/scripts/setup-seafile-mysql.py
@@ -1042,7 +1042,7 @@ class SeahubConfigurator(AbstractConfigurator):
             fp.write('\n')
             self.write_secret_key(fp)
             fp.write('\n')
-            fp.write('SERVICE_URL = "http://%s/"' % ccnet_config.ip_or_domain)
+            fp.write('SERVICE_URL = "http://%s"' % ccnet_config.ip_or_domain)
             fp.write('\n')
             self.write_database_config(fp)
 
diff --git a/scripts/setup-seafile.sh b/scripts/setup-seafile.sh
index 4df5c9d8fb..f1edbae432 100755
--- a/scripts/setup-seafile.sh
+++ b/scripts/setup-seafile.sh
@@ -543,7 +543,7 @@ if [[ ! -f ${dest_settings_py} ]]; then
 # -*- coding: utf-8 -*-
 SECRET_KEY = "$key"
 
-SERVICE_URL = "http://$ip_or_domain/"
+SERVICE_URL = "http://$ip_or_domain"
 
 EOF
 fi
diff --git a/seahub/api2/endpoints/admin/web_settings.py b/seahub/api2/endpoints/admin/web_settings.py
index 920c84bbd7..ae98dd4a66 100644
--- a/seahub/api2/endpoints/admin/web_settings.py
+++ b/seahub/api2/endpoints/admin/web_settings.py
@@ -95,6 +95,9 @@ class AdminWebSettings(APIView):
                 error_msg = 'value invalid.'
                 return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
 
+            if key in ('SERVICE_URL', 'FILE_SERVER_ROOT'):
+                value = value.rstrip('/')
+
             try:
                 setattr(config, key, value)
             except AttributeError as e: