Skip to content

Commit faf4eeb

Browse files
committed
Merge branch 'master' into lc_old_to_new
2 parents b79b4f1 + d7b4b7c commit faf4eeb

File tree

21 files changed

+39
-69
lines changed

21 files changed

+39
-69
lines changed

.ci/hk/en/sdk/TapPayments/Global/tds-payments-global.mdx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -967,8 +967,8 @@ You can query the detailed information of an order by order ID and determine the
967967

968968
```sh
969969
curl -X POST \
970-
-H 'X-LC-Id: {{appid}} \
971-
-H 'X-LC-Key: {{masterKey}},master \
970+
-H 'X-LC-Id: {{appid}}' \
971+
-H 'X-LC-Key: {{masterKey}},master' \
972972
https://{{host}}/open/payment/v1/orders/1670731970469806082
973973
```
974974

@@ -999,8 +999,8 @@ After the payment is successful, verifying the order indicates that the payment
999999

10001000
```sh
10011001
curl -X POST \
1002-
-H 'X-LC-Id: {{appid}} \
1003-
-H 'X-LC-Key: {{masterKey}},master \
1002+
-H 'X-LC-Id: {{appid}}' \
1003+
-H 'X-LC-Key: {{masterKey}},master' \
10041004
https://{{host}}/open/payment/v1/orders/1670731970469806082/verify?token=2cf31318c6f4939d5eaf2e9431bf45f2
10051005
```
10061006

@@ -1046,8 +1046,8 @@ Refund an order.
10461046

10471047
```sh
10481048
curl -X GET \
1049-
-H 'X-LC-Id: {{appid}} \
1050-
-H 'X-LC-Key: {{masterKey}},master \
1049+
-H 'X-LC-Id: {{appid}}' \
1050+
-H 'X-LC-Key: {{masterKey}},master' \
10511051
https://{{host}}/open/payment/v1/orders/1670731970469806082/refund
10521052
```
10531053

@@ -1119,7 +1119,7 @@ The request body is a JSON string defined as `payload`.
11191119
}
11201120
```
11211121

1122-
You also need the `webhookToken` configured in the DC backend as the secret of the HmacSHA256 algorithm to finally get
1122+
You also need the `API key` configured in the DC backend as the secret of the HmacSHA256 algorithm to finally get
11231123

11241124
```
11251125
sign = HmacSHA256(secret, ts + "." + payload )

.ci/hk/zh-Hans/sdk/TapPayments/Global/tds-payments-global.mdx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,8 +1143,8 @@ public class Callback < T >
11431143

11441144
```sh
11451145
curl -X GET \
1146-
-H 'X-LC-Id: {{client_id}} \
1147-
-H 'X-LC-Key: {{server_secret}},master \
1146+
-H 'X-LC-Id: {{client_id}}' \
1147+
-H 'X-LC-Key: {{server_secret}},master' \
11481148
https://tds-tapsdk0.intl.tapapis.com/open/payment/v1/orders/1670731970469806082
11491149
```
11501150

@@ -1175,8 +1175,8 @@ curl -X GET \
11751175

11761176
```sh
11771177
curl -X POST \
1178-
-H 'X-LC-Id: {{client_id}} \
1179-
-H 'X-LC-Key: {{server_secret}},master \
1178+
-H 'X-LC-Id: {{client_id}}' \
1179+
-H 'X-LC-Key: {{server_secret}},master' \
11801180
-H 'Content-Type: application/json; charset=utf-8'
11811181
-d '{"token": "2cf31318c6f4939d5eaf2e9431bf45f2"}'
11821182
https://tds-tapsdk0.intl.tapapis.com/open/payment/v1/orders/1670731970469806082/verify
@@ -1225,8 +1225,8 @@ curl -X POST \
12251225

12261226
```sh
12271227
curl -X GET \
1228-
-H 'X-LC-Id: {{client_id}} \
1229-
-H 'X-LC-Key: {{server_secret}},master \
1228+
-H 'X-LC-Id: {{client_id}}' \
1229+
-H 'X-LC-Key: {{server_secret}},master' \
12301230
https://tds-tapsdk0.intl.tapapis.com/open/payment/v1/orders/1670731970469806082/refund
12311231
```
12321232

@@ -1301,7 +1301,7 @@ TapPay-Signature: 1687224754,4dd293a514223c052513c1db449106f13710c733855d2af6654
13011301
}
13021302
```
13031303

1304-
还需要在 DC 后台配置过的 `webhookToken`作为 HmacSHA256 算法的 secret 最终得到
1304+
此外,还需要将在 TapTap 开发者中心后台配置的 `API 密钥` 作为 HmacSHA256 算法的 secret 最终得到
13051305

13061306
```
13071307
sign = HmacSHA256(secret, ts + "." + payload )

.ci/leancloud/en/sdk/storage/rest.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ LeanCloud will automatically create a unique index for `authData.platform_name.u
16351635
This avoids binding a third-party account to multiple users.
16361636
However, you need to verify `authData` yourself (except for certain platforms, see below).
16371637

1638-
LeanCloud has built-in support for Apple and some popular social networks in China ([Weibo](http://weibo.com/), [WeChat](https://www.wechat.com/en) (*weixin* in Chinese pinyin), and [QQ](https://imqq.com/English1033.html)).
1638+
LeanCloud has built-in support for Apple and some popular social networks in China ([Weibo](http://weibo.com/), [WeChat](https://www.wechat.com/en) (*weixin* in Chinese pinyin), and [QQ](https://im.qq.com/index/)).
16391639

16401640
```json
16411641
{

.ci/leancloud/zh-Hans/sdk/authentication/rest.mdx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -435,17 +435,7 @@ curl -X DELETE \
435435
}
436436
```
437437

438-
[腾讯微博](http://t.qq.com/) 的 authData 内容:
439438

440-
```json
441-
{
442-
"qq": {
443-
"openid": "0395BA18A5CD6255E5BA185E7BEBA242",
444-
"access_token": "12345678-SaMpLeTuo3m2avZxh5cjJmIrAfx4ZYyamdofM7IjU",
445-
"expires_in": 1382686496
446-
}
447-
}
448-
```
449439

450440
[微信](http://open.weixin.qq.com/) 的 authData 内容:
451441

docs/sdk/authentication/guide.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ Client ID 用于校验 `identity_token` 及获取 `access_token`,指的是 App
11321132
11331133
#### 获取 Private Key 及 Private Key ID
11341134
1135-
Private Key 用于获取 `access_token`。登录 Apple 开发者平台,在左侧的「Certificates, Identifiers & Profiles」中选择「Keys」,添加一个用于 Apple Sign In 的 Private Key,下载 `.p8` 文件,同时在下载 Key 的页面获得 Private Key ID。详情请参考 [Apple 的文档](https://help.apple.com/developer-account/#/dev77c875b7e)。
1135+
Private Key 用于获取 `access_token`。登录 Apple 开发者平台,在左侧的「Certificates, Identifiers & Profiles」中选择「Keys」,添加一个用于 Apple Sign In 的 Private Key,下载 `.p8` 文件,同时在下载 Key 的页面获得 Private Key ID。详情请参考 [Apple 的文档](https://developer.apple.com/cn/help/account/)。
11361136
11371137
将 Key ID 填写到控制台,将下载下来的 Private Key 文件上传到控制台。控制台只能上传 Private Key 文件,无法查看及下载其内容。
11381138

docs/sdk/authentication/rest.mdx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -337,17 +337,6 @@ curl -X DELETE \
337337
}
338338
```
339339

340-
[腾讯微博](http://t.qq.com/) 的 authData 内容:
341-
342-
```json
343-
{
344-
"qq": {
345-
"openid": "0395BA18A5CD6255E5BA185E7BEBA242",
346-
"access_token": "12345678-SaMpLeTuo3m2avZxh5cjJmIrAfx4ZYyamdofM7IjU",
347-
"expires_in": 1382686496
348-
}
349-
}
350-
```
351340

352341
[微信](http://open.weixin.qq.com/) 的 authData 内容:
353342

docs/sdk/domain/guide.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ AV.init({
244244

245245
请参考 [即时通讯开发指南](/sdk/im/guide/overview/) 配置。
246246

247+
247248
旧版本的 SDK 请参考以下方法配置(建议使用最新版本的 SDK):
248249

249250
<details>
@@ -720,7 +721,7 @@ Let's Encrypt 之外,比较知名的免费 SSL 证书提供商有 [ZeroSSL]、
720721
```
721722
issueCert for {host}: Authorization not found in HTTP response from {host} ;
722723
```
723-
因为工信部规定,网站接入多个云服务商时,需要在各云服务商处接入备案。这个报错是缺少对应的云服务商备案所导致的(如果是华东区的应用,很可能是缺少腾讯云备案);可以参考[域名备案指南](http://localhost:3888/docs/sdk/domain/icp/#%E6%8E%A5%E5%85%A5%E5%A4%87%E6%A1%88)进行备案操作;
724+
因为工信部规定,网站接入多个云服务商时,需要在各云服务商处接入备案。这个报错是缺少对应的云服务商备案所导致的(如果是华东区的应用,很可能是缺少腾讯云备案);可以参考[域名备案指南](/sdk/domain/icp)进行备案操作;
724725

725726
[let's encrypt]: https://letsencrypt.org/
726727
[zerossl]: https://zerossl.com/

docs/sdk/engine/deploy/python.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ from app import app
3737
application = app
3838
```
3939

40-
流行的 Python Web 框架对 WSGI 都有支持,比如 [Flask](https://flask.palletsprojects.com/en/2.1.x/)[Django](https://www.djangoproject.com)[Tornado](https://www.tornadoweb.org/en/stable/)。我们提供了 Flask 和 Django 两个框架的示例项目作为参考,你也可以直接把它们当作一个应用项目的初始化模版:
40+
流行的 Python Web 框架对 WSGI 都有支持,比如 [Flask](https://flask.palletsprojects.com/en/)[Django](https://www.djangoproject.com)[Tornado](https://www.tornadoweb.org/en/stable/)。我们提供了 Flask 和 Django 两个框架的示例项目作为参考,你也可以直接把它们当作一个应用项目的初始化模版:
4141

4242
- [Flask](https://github.com/leancloud/python-getting-started)
4343
- [Django](https://github.com/leancloud/django-getting-started)

docs/sdk/engine/functions/sdk.mdx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ app.listen(process.env.LEANCLOUD_APP_PORT);
7474

7575
Node SDK 的历史版本:
7676

77-
- `0.x`:最初的版本,对 Node.js 4.x 及以上版本兼容不佳,建议用户参考 [升级到云引擎 Node.js SDK 1.0](https://leancloud.cn/docs/leanengine-node-sdk-upgrade-1.html) 来更新。
7877
- `1.x`:彻底废弃了全局的 `currentUser`,依赖的 JavaScript 也升级到了 1.x 分支,支持了 Koa 和 Node.js 4.x 及以上版本。
7978
- `2.x`:提供了对 Promise 风格的云函数、Hook 写法的支持,移除了一些被弃用的特性(`AV.Cloud.httpRequest`),不再支持 Backbone 风格的回调函数。
8079
- `3.x`**推荐使用** 的版本,指定 JavaScript SDK 为 peer dependency(允许自定义 JS SDK 的版本),升级 JS SDK 到 3.x。

docs/sdk/storage/faq.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import Path from "/src/docComponents/path";
4646

4747
<Conditional brand="leancloud">
4848

49-
对于 [社交信息流](https://leancloud.cn/docs/status_system.html)`create``update` 按照 Status 和 Follower/Followee 的对象数量来计费。
49+
对于 [社交信息流](https://docs.leancloud.cn/sdk/other/openview/status_system/)`create``update` 按照 Status 和 Follower/Followee 的对象数量来计费。
5050

5151
</Conditional>
5252

i18n/en/docusaurus-plugin-content-docs/current/sdk/authentication/guide.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@ To check if a `TDSUser` is authenticated, you can invoke the `isAuthenticated` m
467467

468468
For each given object, you can specify which users are allowed to read it and which are allowed to modify it. To support this type of security, each object has an access control list implemented by an `ACL` object. More details can be found in [ACL Guide](/sdk/storage/guide/acl/).
469469

470+
470471
## Third-Party Sign-on
471472

472473
We have already introduced how to [implement quick log-in with TapTap](/sdk/taptap-login/guide/start/#quick-log-in-with-taptap).
@@ -595,7 +596,7 @@ Client ID is used to verify `identity_token` and to obtain `access_token`. It is
595596
596597
#### Getting Private Key and Private Key ID
597598
598-
Private Key is used to obtain `access_token`. You can go to Apple Developer, select “Keys” from “Certificates, Identifiers & Profiles”, add a Private Key for Sign in with Apple, and then download the `.p8` file. You will also obtain the Private Key ID from the page you download the key. See [Apple’s docs](https://help.apple.com/developer-account/#/dev77c875b7e) for more details.
599+
Private Key is used to obtain `access_token`. You can go to Apple Developer, select “Keys” from “Certificates, Identifiers & Profiles”, add a Private Key for Sign in with Apple, and then download the `.p8` file. You will also obtain the Private Key ID from the page you download the key. See [Apple’s docs](https://developer.apple.com/cn/help/account/) for more details.
599600
600601
The last step is to fill in the Key ID on the Developer Center and upload the downloaded Private Key. You can only upload Private Keys, but cannot view or download them.
601602

i18n/en/docusaurus-plugin-content-docs/current/sdk/engine/deploy/python.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ from app import app
3737
application = app
3838
```
3939

40-
Most popular Python-based web frameworks come with support for WSGI, including [Flask](https://flask.palletsprojects.com/en/2.1.x/), [Django](https://www.djangoproject.com), and [Tornado](https://www.tornadoweb.org/en/stable/). We provide the following Flask- and Django-based boilerplates for you to reference and start your project with:
40+
Most popular Python-based web frameworks come with support for WSGI, including [Flask](https://flask.palletsprojects.com/en/), [Django](https://www.djangoproject.com), and [Tornado](https://www.tornadoweb.org/en/stable/). We provide the following Flask- and Django-based boilerplates for you to reference and start your project with:
4141

4242
- [Flask](https://github.com/leancloud/python-getting-started)
4343
- [Django](https://github.com/leancloud/django-getting-started)

i18n/en/docusaurus-plugin-content-docs/current/sdk/engine/functions/guides.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,7 @@ For example, if a `BeforeSave` hook is triggered by a Cloud Function that has al
19731973

19741974
## Hooks for Instant Messaging
19751975

1976-
See <Conditional brand="tds">[Hooks and System Conversations](/sdk/im/guide/systemconv/)</Conditional><Conditional brand="leancloud">[Hooks and System Conversations](https://leancloud.cn/docs/realtime-guide-systemconv.html)</Conditional> for more information.
1976+
See <Conditional brand="tds">[Hooks and System Conversations](/sdk/im/guide/systemconv/)</Conditional><Conditional brand="leancloud">[Hooks and System Conversations](https://docs.leancloud.app/en/sdk/im/guide/systemconv/)</Conditional> for more information.
19771977
19781978
## Writing Cloud Functions Online
19791979

i18n/en/docusaurus-plugin-content-docs/current/sdk/engine/functions/rest-api.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ We recommend that you use [Postman](https://www.postman.com/) for testing the RE
1818

1919
The base URL of the REST API is the API domain of your application (represented with `{{host}}`). You can bind and view API domains on the dashboard. See <Conditional brand="tds">[Domain](/sdk/storage/guide/setup-dotnet/#domain)</Conditional><Conditional brand="leancloud">[Binding Your Domains](/sdk/domain/guide/)</Conditional> for more information.
2020

21-
See <Conditional brand="tds">[this article](/sdk/storage/guide/rest/#request-format)</Conditional><Conditional brand="leancloud">[this article](https://leancloud.cn/docs/rest_api.html#hash1094926014)</Conditional> for more information about the format of the request.
21+
See <Conditional brand="tds">[this article](/sdk/storage/guide/rest/#request-format)</Conditional><Conditional brand="leancloud">[this article](https://docs.leancloud.app/en/sdk/storage/guide/rest/#request-format)</Conditional> for more information about the format of the request.
2222

2323
## Overview
2424

i18n/en/docusaurus-plugin-content-docs/current/sdk/engine/platform.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Cloud Engine barely interferes in the processes of your application. You are fre
3333

3434
Cloud Engine is primarily optimized for hosting stateless HTTP services. Although your application has access to the disk, there’s no guarantee that the disk will keep the files created by your application persistently. For long-term data storage, use the <Conditional brand="tds">[Data Storage](/sdk/storage/features)</Conditional><Conditional brand="leancloud">[Data Storage](/sdk/storage/overview/)</Conditional> service or LeanDB’s hosted [Redis](/sdk/engine/database/redis/), [MongoDB](/sdk/engine/database/mongo/), and [Elasticsearch](/sdk/engine/database/es/).
3535

36+
3637
<p>
3738
To associate an existing project to a Cloud Engine application, run{" "}
3839
<code>{CLI_BINARY} switch</code>:

i18n/en/docusaurus-plugin-content-docs/current/sdk/multiplayer/client-engine/client-engine.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ The system will charge according to the daily peak consumption of computing unit
100100

101101
<Conditional region="cn">
102102

103-
The system will charge according to the daily peak consumption of computing units. The price of a single computing unit can be found on the [official website](https://developer.taptap.cn/product-intro/price). For example, if an application on a China node uses up to 2 computing units on a given day, the charge for that day will be 2 * computing unit price of China.
103+
The system will charge according to the daily peak consumption of computing units. The price of a single computing unit can be found on the [official website](https://developer.taptap.io/product-intro/price). For example, if an application on a China node uses up to 2 computing units on a given day, the charge for that day will be 2 * computing unit price of China.
104104

105105
</Conditional>
106106

0 commit comments

Comments
 (0)