Merge branch 'master' into feat/maas-support

src/langbot/pkg/platform/sources/officialaccount.py

@@ -76,6 +76,7 @@ class OfficialAccountAdapter(abstract_platform_adapter.AbstractMessagePlatformAd
                 AppID=config['AppID'],
                 logger=logger,
                 unified_mode=True,
+                api_base_url=config.get('api_base_url', 'https://api.weixin.qq.com'),
             )
         elif config['Mode'] == 'passive':
             bot = OAClientForLongerResponse(
@@ -86,6 +87,7 @@ class OfficialAccountAdapter(abstract_platform_adapter.AbstractMessagePlatformAd
                 LoadingMessage=config.get('LoadingMessage', ''),
                 logger=logger,
                 unified_mode=True,
+                api_base_url=config.get('api_base_url', 'https://api.weixin.qq.com'),
             )
         else:
             raise KeyError('请设置微信公众号通信模式')

src/langbot/pkg/platform/sources/officialaccount.yaml

@@ -53,6 +53,16 @@ spec:
       type: string
       required: true
       default: "AI正在思考中，请发送任意内容获取回复。"
+    - name: api_base_url
+      label:
+        en_US: API Base URL
+        zh_Hans: API 基础 URL
+      description:
+        en_US: API Base URL, used for accessing the Official Account API. If you are deploying in an internal network environment and accessing the Official Account API through a reverse proxy, please fill in this item according to the documentation.
+        zh_Hans: 可选，若您部署在内网环境并通过反向代理访问微信公众号 API，可根据文档修改此项
+      type: string
+      required: false
+      default: "https://api.weixin.qq.com"
 execution:
   python:
     path: ./officialaccount.py

src/langbot/pkg/platform/sources/wecom.py

@@ -170,6 +170,7 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
             contacts_secret=config['contacts_secret'],
             logger=logger,
             unified_mode=True,
+            api_base_url=config.get('api_base_url', 'https://qyapi.weixin.qq.com/cgi-bin'),
         )
 
         super().__init__(

src/langbot/pkg/platform/sources/wecom.yaml

@@ -46,6 +46,16 @@ spec:
       type: string
       required: true
       default: ""
+    - name: api_base_url
+      label:
+        en_US: API Base URL
+        zh_Hans: API 基础 URL
+      description:
+        en_US: API Base URL, used for accessing the WeCom API. If you are deploying in an internal network environment and accessing the WeCom Customer Service API through a reverse proxy, please fill in this item according to the documentation.
+        zh_Hans: 可选，若您部署在内网环境并通过反向代理访问企业微信 API，可根据文档填写此项
+      type: string
+      required: false
+      default: "https://qyapi.weixin.qq.com/cgi-bin"
 execution:
   python:
     path: ./wecom.py

src/langbot/pkg/platform/sources/wecomcs.py

@@ -141,6 +141,7 @@ class WecomCSAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
             EncodingAESKey=config['EncodingAESKey'],
             logger=logger,
             unified_mode=True,
+            api_base_url=config.get('api_base_url', 'https://qyapi.weixin.qq.com/cgi-bin'),
         )
 
         super().__init__(

src/langbot/pkg/platform/sources/wecomcs.yaml

@@ -39,6 +39,16 @@ spec:
       type: string
       required: true
       default: ""
+    - name: api_base_url
+      label:
+        en_US: API Base URL
+        zh_Hans: API 基础 URL
+      description:
+        en_US: API Base URL, used for accessing the WeCom API. If you are deploying in an internal network environment and accessing the WeCom Customer Service API through a reverse proxy, please fill in this item according to the documentation.
+        zh_Hans: 可选，若您部署在内网环境并通过反向代理访问企业微信 API，可根据文档修改此项
+      type: string
+      required: false
+      default: "https://qyapi.weixin.qq.com/cgi-bin"
 execution:
   python:
     path: ./wecomcs.py