From e6b59eb2a1d1ade4d26c9ef55982cb8f7e6a372c Mon Sep 17 00:00:00 2001
From: lxy <liuxinyu_x@163.com>
Date: Wed, 4 Sep 2024 11:37:02 +0800
Subject: [PATCH] =?UTF-8?q?application=20config=E6=B7=BB=E5=8A=A0location?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/application/web/index.tsx          | 76 ++++++++++++++-
 .../config/application/wechatPublic/index.tsx | 93 ++++++++++++++++---
 2 files changed, 153 insertions(+), 16 deletions(-)

diff --git a/src/components/config/application/web/index.tsx b/src/components/config/application/web/index.tsx
index 6990df752..027ef31fd 100644
--- a/src/components/config/application/web/index.tsx
+++ b/src/components/config/application/web/index.tsx
@@ -48,8 +48,8 @@ export default function Web(props: {
                     style={{ marginTop: 10 }}
                 >
                     <Form.Item label="appId"
-                     //name="appId"
-                     >
+                    //name="appId"
+                    >
                         <>
                             <Input
                                 placeholder="请输入appId"
@@ -62,8 +62,8 @@ export default function Web(props: {
                         </>
                     </Form.Item>
                     <Form.Item label="appSecret"
-                     //name="appSecret"
-                     >
+                    //name="appSecret"
+                    >
                         <>
                             <Input
                                 placeholder="请输入appSecret"
@@ -111,6 +111,74 @@ export default function Web(props: {
                 </Form>
             </Col>
 
+            <Col flex="auto">
+                <Divider orientation="left" className={Styles.title}>
+                    location
+                </Divider>
+                <Form
+                    colon={true}
+                    labelAlign="left"
+                    layout="vertical"
+                    style={{ marginTop: 10 }}
+                >
+                    <Form.Item label="协议">
+                        <>
+                            <Select
+                                style={{ width: '100%' }}
+                                placeholder="请选择协议"
+                                value={config?.location?.protocol}
+                                onChange={(value: 'http' | 'https') => {
+                                    setValue(`location.protocol`, value);
+                                }}
+                                options={
+                                    [
+                                        {
+                                            label: 'http',
+                                            value: 'http',
+                                        },
+                                        {
+                                            label: 'https',
+                                            value: 'https',
+                                        },
+                                    ] as Array<{
+                                        label: string;
+                                        value: 'http' | 'https';
+                                    }>
+                                }
+                            />
+                        </>
+                    </Form.Item>
+                    <Form.Item
+                        label="主机"
+                    >
+                        <>
+                            <Input
+                                placeholder="请输入主机"
+                                type="text"
+                                value={config?.location?.host}
+                                onChange={(e) =>
+                                    setValue(`location.host`, e.target.value)
+                                }
+                            />
+                        </>
+                    </Form.Item>
+                    <Form.Item
+                        label="端口"
+                    >
+                        <>
+                            <Input
+                                placeholder="请输入端口"
+                                type="text"
+                                value={config?.location?.port}
+                                onChange={(e) =>
+                                    setValue(`location.port`, e.target.value || '')
+                                }
+                            />
+                        </>
+                    </Form.Item>
+                </Form>
+            </Col>
+
             {/* <Col flex="auto">
                 <Divider orientation="left" className={Styles.title}>
                     网站-授权方式
diff --git a/src/components/config/application/wechatPublic/index.tsx b/src/components/config/application/wechatPublic/index.tsx
index 1263a4a9e..cc44ee447 100644
--- a/src/components/config/application/wechatPublic/index.tsx
+++ b/src/components/config/application/wechatPublic/index.tsx
@@ -55,7 +55,7 @@ export default function WechatPublic(props: {
                 >
                     <Form.Item label="appId"
                     //name="appId"
-                     >
+                    >
                         <>
                             <Input
                                 placeholder="请输入appId"
@@ -69,7 +69,7 @@ export default function WechatPublic(props: {
                     </Form.Item>
                     <Form.Item label="appSecret"
                     // name="appSecret"
-                     >
+                    >
                         <>
                             <Input
                                 placeholder="请输入appSecret"
@@ -81,7 +81,7 @@ export default function WechatPublic(props: {
                             />
                         </>
                     </Form.Item>
-                    <Form.Item label="原始ID" 
+                    <Form.Item label="原始ID"
                     //name="originalId"
                     >
                         <>
@@ -97,8 +97,8 @@ export default function WechatPublic(props: {
                     </Form.Item>
                     {isService && (
                         <Form.Item label="是否为服务号"
-                         //name="isService"
-                         >
+                        //name="isService"
+                        >
                             <>
                                 <Switch
                                     checkedChildren="是"
@@ -113,6 +113,75 @@ export default function WechatPublic(props: {
                     )}
                 </Form>
             </Col>
+
+            <Col flex="auto">
+                <Divider orientation="left" className={Styles.title}>
+                    location
+                </Divider>
+                <Form
+                    colon={true}
+                    labelAlign="left"
+                    layout="vertical"
+                    style={{ marginTop: 10 }}
+                >
+                    <Form.Item label="协议">
+                        <>
+                            <Select
+                                style={{ width: '100%' }}
+                                placeholder="请选择协议"
+                                value={config?.location?.protocol}
+                                onChange={(value: 'http' | 'https') => {
+                                    setValue(`location.protocol`, value);
+                                }}
+                                options={
+                                    [
+                                        {
+                                            label: 'http',
+                                            value: 'http',
+                                        },
+                                        {
+                                            label: 'https',
+                                            value: 'https',
+                                        },
+                                    ] as Array<{
+                                        label: string;
+                                        value: 'http' | 'https';
+                                    }>
+                                }
+                            />
+                        </>
+                    </Form.Item>
+                    <Form.Item
+                        label="主机"
+                    >
+                        <>
+                            <Input
+                                placeholder="请输入主机"
+                                type="text"
+                                value={config?.location?.host}
+                                onChange={(e) =>
+                                    setValue(`location.host`, e.target.value)
+                                }
+                            />
+                        </>
+                    </Form.Item>
+                    <Form.Item
+                        label="端口"
+                    >
+                        <>
+                            <Input
+                                placeholder="请输入端口"
+                                type="text"
+                                value={config?.location?.port}
+                                onChange={(e) =>
+                                    setValue(`location.port`, e.target.value || '')
+                                }
+                            />
+                        </>
+                    </Form.Item>
+                </Form>
+            </Col>
+
             {/* <Col flex="auto">
                 <Divider orientation="left" className={Styles.title}>
                     网站-授权方式
@@ -179,8 +248,8 @@ export default function WechatPublic(props: {
                     layout="vertical"
                     style={{ marginTop: 10 }}
                 >
-                    <Form.Item label="appId" 
-                   // name="appId"
+                    <Form.Item label="appId"
+                    // name="appId"
                     >
                         <>
                             <Input
@@ -227,7 +296,7 @@ export default function WechatPublic(props: {
                     >
                         <Form.Item label="服务器地址(URL)"
                         // name="url"
-                         >
+                        >
                             <>
                                 <Input
                                     placeholder="请输入服务器地址(URL)，选填"
@@ -241,7 +310,7 @@ export default function WechatPublic(props: {
                         </Form.Item>
                         <Form.Item label="令牌(Token)"
                         // name="token"
-                         >
+                        >
                             <>
                                 <Input
                                     placeholder="请输入令牌(Token)"
@@ -255,7 +324,7 @@ export default function WechatPublic(props: {
                         </Form.Item>
                         <Form.Item
                             label="消息加解密密钥(EncodingAESKey)"
-                           // name="encodingAESKey"
+                            // name="encodingAESKey"
                             tooltip="消息加解密密钥将用于消息体加解密过程。具体功能请参见微信文档"
                         >
                             <>
@@ -273,8 +342,8 @@ export default function WechatPublic(props: {
                             </>
                         </Form.Item>
                         <Form.Item label="消息加解密方式"
-                         //name="mode"
-                         >
+                        //name="mode"
+                        >
                             <>
                                 <Select
                                     placeholder="请选择消息加解密方式"