merge upstream

Signed-off-by: wozulong <>

web/src/components/SystemSetting.js

@@ -31,6 +31,7 @@ const SystemSetting = () => {
     SMTPFrom: '',
     SMTPToken: '',
     ServerAddress: '',
+    OutProxyUrl: '',
     StripeApiSecret: '',
     StripeWebhookSecret: '',
     StripePriceId: '',
@@ -150,6 +151,7 @@ const SystemSetting = () => {
       name === 'Notice' ||
       (name.startsWith('SMTP') && name !== 'SMTPSSLEnabled') ||
       name === 'ServerAddress' ||
+      name === 'OutProxyUrl' ||
       name === 'StripeApiSecret' ||
       name === 'StripeWebhookSecret' ||
       name === 'StripePriceId' ||
@@ -181,6 +183,11 @@ const SystemSetting = () => {
     await updateOption('ServerAddress', ServerAddress);
   };
 
+  const submitOutProxyUrl = async () => {
+    let OutProxyUrl = removeTrailingSlash(inputs.OutProxyUrl);
+    await updateOption('OutProxyUrl', OutProxyUrl);
+  };
+
   const submitPaymentConfig = async () => {
     if (inputs.ServerAddress === '') {
       showError('请先填写服务器地址');
@@ -368,6 +375,20 @@ const SystemSetting = () => {
             更新服务器地址
           </Form.Button>
           <Divider />
+          <Header as='h3' inverted={isDark}>
+            代理设置
+          </Header>
+          <Form.Group widths='equal'>
+            <Form.Input
+              label='出口代理地址'
+              placeholder='例如：http://1.2.3.4:8888'
+              value={inputs.OutProxyUrl}
+              name='OutProxyUrl'
+              onChange={handleInputChange}
+            />
+          </Form.Group>
+          <Form.Button onClick={submitOutProxyUrl}>更新代理设置</Form.Button>
+          <Divider />
           <Header as='h3' inverted={isDark}>
             支付设置（当前仅支持Stripe Checkout）
             <Header.Subheader>