mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-06-02 12:05:54 +00:00
Compare commits
2 Commits
feat/card_
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4054ba2a76 | ||
|
|
c7cb42bd79 |
9
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
9
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
@@ -10,6 +10,15 @@ body:
|
|||||||
placeholder: 例如:v3.3.0、CentOS x64 Python 3.10.3、Docker
|
placeholder: 例如:v3.3.0、CentOS x64 Python 3.10.3、Docker
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
|
- type: dropdown
|
||||||
|
attributes:
|
||||||
|
label: 部署版本
|
||||||
|
description: 请选择您使用的 LangBot 部署版本。
|
||||||
|
options:
|
||||||
|
- 社区版
|
||||||
|
- 云服务
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
- type: textarea
|
- type: textarea
|
||||||
attributes:
|
attributes:
|
||||||
label: 异常情况
|
label: 异常情况
|
||||||
|
|||||||
9
.github/ISSUE_TEMPLATE/bug-report_en.yml
vendored
9
.github/ISSUE_TEMPLATE/bug-report_en.yml
vendored
@@ -10,6 +10,15 @@ body:
|
|||||||
placeholder: "For example: v3.3.0, CentOS x64 Python 3.10.3, Docker"
|
placeholder: "For example: v3.3.0, CentOS x64 Python 3.10.3, Docker"
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
|
- type: dropdown
|
||||||
|
attributes:
|
||||||
|
label: Deployment version
|
||||||
|
description: Please select the LangBot deployment version you are using.
|
||||||
|
options:
|
||||||
|
- Community Edition
|
||||||
|
- Cloud Service
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
- type: textarea
|
- type: textarea
|
||||||
attributes:
|
attributes:
|
||||||
label: Exception
|
label: Exception
|
||||||
|
|||||||
@@ -881,7 +881,8 @@ class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
|
|
||||||
bot_account_id = config['bot_name']
|
bot_account_id = config['bot_name']
|
||||||
|
|
||||||
bot = lark_oapi.ws.Client(config['app_id'], config['app_secret'], event_handler=event_handler)
|
domain = self._resolve_domain(config)
|
||||||
|
bot = lark_oapi.ws.Client(config['app_id'], config['app_secret'], event_handler=event_handler, domain=domain)
|
||||||
api_client = self.build_api_client(config)
|
api_client = self.build_api_client(config)
|
||||||
cipher = AESCipher(config.get('encrypt-key', ''))
|
cipher = AESCipher(config.get('encrypt-key', ''))
|
||||||
self.request_app_ticket(api_client, config)
|
self.request_app_ticket(api_client, config)
|
||||||
@@ -1014,13 +1015,28 @@ class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _resolve_domain(config) -> str:
|
||||||
|
domain = config.get('domain', lark_oapi.FEISHU_DOMAIN)
|
||||||
|
if domain == 'custom':
|
||||||
|
domain = config.get('custom_domain', '')
|
||||||
|
if not domain:
|
||||||
|
raise ValueError('Custom domain is required when domain is set to "custom"')
|
||||||
|
return domain.rstrip('/')
|
||||||
|
|
||||||
def build_api_client(self, config):
|
def build_api_client(self, config):
|
||||||
app_id = config['app_id']
|
app_id = config['app_id']
|
||||||
app_secret = config['app_secret']
|
app_secret = config['app_secret']
|
||||||
api_client = lark_oapi.Client.builder().app_id(app_id).app_secret(app_secret).build()
|
domain = self._resolve_domain(config)
|
||||||
|
api_client = lark_oapi.Client.builder().app_id(app_id).app_secret(app_secret).domain(domain).build()
|
||||||
if 'isv' == config.get('app_type', 'self'):
|
if 'isv' == config.get('app_type', 'self'):
|
||||||
api_client = (
|
api_client = (
|
||||||
lark_oapi.Client.builder().app_id(app_id).app_secret(app_secret).app_type(lark_oapi.AppType.ISV).build()
|
lark_oapi.Client.builder()
|
||||||
|
.app_id(app_id)
|
||||||
|
.app_secret(app_secret)
|
||||||
|
.app_type(lark_oapi.AppType.ISV)
|
||||||
|
.domain(domain)
|
||||||
|
.build()
|
||||||
)
|
)
|
||||||
return api_client
|
return api_client
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,57 @@ spec:
|
|||||||
en: https://link.langbot.app/en/platforms/lark
|
en: https://link.langbot.app/en/platforms/lark
|
||||||
ja: https://link.langbot.app/ja/platforms/lark
|
ja: https://link.langbot.app/ja/platforms/lark
|
||||||
config:
|
config:
|
||||||
|
- name: domain
|
||||||
|
label:
|
||||||
|
en_US: Platform Domain
|
||||||
|
zh_Hans: 平台域名
|
||||||
|
zh_Hant: 平台域名
|
||||||
|
ja_JP: プラットフォームドメイン
|
||||||
|
description:
|
||||||
|
en_US: Select the open platform domain. Use Feishu for Chinese mainland, Lark for international
|
||||||
|
zh_Hans: 选择开放平台域名,国内使用飞书,海外使用 Lark
|
||||||
|
zh_Hant: 選擇開放平台域名,國內使用飛書,海外使用 Lark
|
||||||
|
ja_JP: オープンプラットフォームのドメインを選択。中国国内は飛書、海外は Lark を使用
|
||||||
|
type: select
|
||||||
|
options:
|
||||||
|
- name: https://open.feishu.cn
|
||||||
|
label:
|
||||||
|
en_US: Feishu (open.feishu.cn)
|
||||||
|
zh_Hans: 飞书 (open.feishu.cn)
|
||||||
|
zh_Hant: 飛書 (open.feishu.cn)
|
||||||
|
ja_JP: 飛書 (open.feishu.cn)
|
||||||
|
- name: https://open.larksuite.com
|
||||||
|
label:
|
||||||
|
en_US: Lark (open.larksuite.com)
|
||||||
|
zh_Hans: Lark (open.larksuite.com)
|
||||||
|
zh_Hant: Lark (open.larksuite.com)
|
||||||
|
ja_JP: Lark (open.larksuite.com)
|
||||||
|
- name: custom
|
||||||
|
label:
|
||||||
|
en_US: Custom
|
||||||
|
zh_Hans: 自定义
|
||||||
|
zh_Hant: 自定義
|
||||||
|
ja_JP: カスタム
|
||||||
|
required: false
|
||||||
|
default: https://open.feishu.cn
|
||||||
|
- name: custom_domain
|
||||||
|
label:
|
||||||
|
en_US: Custom Domain
|
||||||
|
zh_Hans: 自定义域名
|
||||||
|
zh_Hant: 自定義域名
|
||||||
|
ja_JP: カスタムドメイン
|
||||||
|
description:
|
||||||
|
en_US: "Enter the full domain URL, e.g. https://open.example.com"
|
||||||
|
zh_Hans: "输入完整的域名 URL,例如 https://open.example.com"
|
||||||
|
zh_Hant: "輸入完整的域名 URL,例如 https://open.example.com"
|
||||||
|
ja_JP: "完全なドメイン URL を入力(例: https://open.example.com)"
|
||||||
|
type: string
|
||||||
|
required: false
|
||||||
|
default: ""
|
||||||
|
show_if:
|
||||||
|
field: domain
|
||||||
|
operator: eq
|
||||||
|
value: custom
|
||||||
- name: one-click-create
|
- name: one-click-create
|
||||||
label:
|
label:
|
||||||
en_US: One-Click Create App
|
en_US: One-Click Create App
|
||||||
@@ -140,10 +191,10 @@ spec:
|
|||||||
zh_Hant: 應用類型
|
zh_Hant: 應用類型
|
||||||
ja_JP: アプリタイプ
|
ja_JP: アプリタイプ
|
||||||
description:
|
description:
|
||||||
en_US: Default to self-built application, refer to https://open.feishu.cn/document/platform-overveiw/overview
|
en_US: "Default to self-built application, refer to https://open.feishu.cn/document/platform-overveiw/overview"
|
||||||
zh_Hans: 默认为企业自建应用,参考 https://open.feishu.cn/document/platform-overveiw/overview
|
zh_Hans: "默认为企业自建应用,参考 https://open.feishu.cn/document/platform-overveiw/overview"
|
||||||
zh_Hant: 預設為企業自建應用,參考 https://open.feishu.cn/document/platform-overveiw/overview
|
zh_Hant: "預設為企業自建應用,參考 https://open.feishu.cn/document/platform-overveiw/overview"
|
||||||
ja_JP: デフォルトはカスタムアプリです。詳細は https://open.feishu.cn/document/platform-overveiw/overview を参照してください
|
ja_JP: "デフォルトはカスタムアプリです。詳細は https://open.feishu.cn/document/platform-overveiw/overview を参照してください"
|
||||||
type: select
|
type: select
|
||||||
options:
|
options:
|
||||||
- name: self
|
- name: self
|
||||||
|
|||||||
Reference in New Issue
Block a user