Skip to content

Commit

Permalink
Merge pull request #352 from Mister-Hope/master
Browse files Browse the repository at this point in the history
feat: update
  • Loading branch information
kings1990 authored Dec 16, 2024
2 parents 1441119 + fe49c2e commit e9122b9
Show file tree
Hide file tree
Showing 37 changed files with 2,019 additions and 1,341 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/1report-bug.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Bug Report
description: Create a report to help us improve
title: "[Bug]:"
labels: [ "bug" ]
labels: ["bug"]
assignees:
- kings1990
body:
Expand Down Expand Up @@ -60,7 +60,7 @@ body:
value: |
## Describe the bug
> If applicable, add screenshots or record screen to help explain your problem.
> If applicable, add screenshots or record screen to help explain your problem.
- type: textarea
id: description
attributes:
Expand All @@ -78,4 +78,4 @@ body:
- type: markdown
attributes:
value: |
Join our [slack](https://join.slack.com/t/restfulfastrequest/shared_invite/zt-1we57vum8-TALhTHI2uNmPF2bx1NDyWw) channel to communicate more effectively
Join our [slack](https://join.slack.com/t/restfulfastrequest/shared_invite/zt-1we57vum8-TALhTHI2uNmPF2bx1NDyWw) channel to communicate more effectively
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ body:
- type: markdown
attributes:
value: |
Join our [slack](https://join.slack.com/t/restfulfastrequest/shared_invite/zt-1we57vum8-TALhTHI2uNmPF2bx1NDyWw) channel to communicate more effectively
Join our [slack](https://join.slack.com/t/restfulfastrequest/shared_invite/zt-1we57vum8-TALhTHI2uNmPF2bx1NDyWw) channel to communicate more effectively
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/3report-bug-zh.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Bug Report【中文】
description: 创建 bug 以帮助我们改进
title: "[Bug]:"
labels: [ "bug" ]
labels:
- bug
assignees:
- kings1990
body:
Expand Down Expand Up @@ -60,7 +61,7 @@ body:
value: |
## 开始描述 Bug
> 如果可以,请添加屏幕截图或者录屏以帮助更好得解释您的问题。
> 如果可以,请添加屏幕截图或者录屏以帮助更好得解释您的问题。
- type: textarea
id: description
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4feature-request-zh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ body:
- type: markdown
attributes:
value: |
更快速有效的联系作者并沟通,请加入我们的 [微信技术群](https://api-buddy.cn/guide/concatGroup.html)
更快速有效的联系作者并沟通,请加入我们的 [微信技术群](https://api-buddy.cn/guide/concatGroup.html)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ contact_links:
- name: 常见问题
url: https://api-buddy.cn/guide/faq.html
about: 查阅 FAQ 获取一些已知问题的解决方案

- name: 微信群技术群
url: https://api-buddy.cn/guide/concatGroup.html
about: 加入微信技术群,更快更有效地联系作者
6 changes: 3 additions & 3 deletions .github/issue_label_bot.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
label-alias:
bug: 'kind/bug'
feature_request: 'enhancement'
question: 'question'
bug: "kind/bug"
feature_request: "enhancement"
question: "question"
14 changes: 8 additions & 6 deletions .github/workflows/compressImages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,25 @@ on:
branches:
- master
paths:
- '**.jpg'
- '**.jpeg'
- '**.png'
- '**.gif'
- "**.jpg"
- "**.jpeg"
- "**.png"
- "**.gif"
jobs:
build:
name: calibreapp/image-actions
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v4

- name: Compress Images
id: calibre
uses: calibreapp/image-actions@main
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
compressOnly: true

- name: Create New Pull Request If Needed
if: steps.calibre.outputs.markdown != ''
uses: peter-evans/create-pull-request@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: pnpm

- name: Install deps
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: pnpm

- name: Install deps
Expand Down
2 changes: 1 addition & 1 deletion .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"allow_different_nesting": true
},
"MD033": {
"allowed_elements": ["ColorIcon", "SiteInfo"]
"allowed_elements": ["Badge", "ColorIcon", "FontIcon", "SiteInfo"]
},
"MD035": {
"style": "---"
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
**/node_modules/**

docs/.vuepress/public/js/gtag.js

pnpm-lock.yaml
14 changes: 5 additions & 9 deletions LICENSE_FASTREQUEST.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
- # Terms of Service of Restful Fast Request

#### Last Updated: Mar 21, 2022
Note: the open source version of Restful Fast Request Free usings the Apache2 license which can be found in file [LICENSE](LICENSE) which doesen't applys to this paid version plugin: Restful Fast Request.
# Terms of Service of Restful Fast Request

#### Last Updated: Mar 21, 2022

Note: the open source version of Restful Fast Request Free usings the Apache2 license which can be found in file [LICENSE](LICENSE) which doesen't applys to this paid version plugin: Restful Fast Request.

Welcome and thank you for using KingsSoft's Restful Fast Request (“**FastRequest**”, “**we**”)! FastRequest enables users to be more efficient and productive in working with send http request. These Terms of Service (“**Terms**”), along with our DMCA Policy, Privacy Policy, and Acceptable Use Policy (collectively with Terms, the “**Agreement**”), cover your use of and access to our services, software, technology, and support websites (“**Services**”). By using our Services, you’re agreeing to be bound by the terms of this Agreement.
Welcome and thank you for using KingsSoft's Restful Fast Request (“**FastRequest**”, “**we**”)! FastRequest enables users to be more efficient and productive in working with send http request. These Terms of Service (“**Terms**”), along with our DMCA Policy, Privacy Policy, and Acceptable Use Policy (collectively with Terms, the “**Agreement**”), cover your use of and access to our services, software, technology, and support websites (“**Services**”). By using our Services, you’re agreeing to be bound by the terms of this Agreement.

Unless required by applicable law or agreed to in writing, FastRequest is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.


PLEASE READ THIS AGREEMENT CAREFULLY AS IT INCLUDES TERMS REGARDING PRIVACY, FUTURE CHANGES TO THE AGREEMENT, FEES, LIMITATIONS OF LIABILITY, INDEMNITY, RESOLUTION OF DISPUTES BY ARBITRATION INSTEAD OF IN COURT, AND WAIVER OF CLASS ACTIONS.

##### **Software**
Expand All @@ -31,7 +29,7 @@ The Services are protected by copyright, trademark, and other Chinese and foreig

Copyright Agent

[email protected]
<[email protected]>

Zhejiang Ningbo, China

Expand Down Expand Up @@ -69,8 +67,6 @@ OTHER THAN FOR THE TYPES OF LIABILITY WE CANNOT LIMIT BY LAW, WE LIMIT OUR LIABI

To the fullest extent permitted by law, you agree to release, indemnify, and hold FastRequest and its affiliates and subsidiaries, and its respective officers, employees, directors, and agents harmless from any from any and all losses, damages, expenses, including costs and reasonable attorneys’ fees, rights, claims, and actions of any kind and injury (including death) arising out of or relating to your use of the Services, your connection to the Services, your violation of this Agreement or your violation of any rights of another. FastRequest reserves the right, at its own expense, to assume the exclusive defense and control of any matter otherwise subject to indemnification by you, in which event you will cooperate with FastRequest in asserting any available defenses.



##### **Controlling Law**

Except to the extent applicable law provides otherwise, these Terms will be governed by Chinese law without regard to conflict of law provisions.
Expand Down
4 changes: 2 additions & 2 deletions README.zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
更快速得回复问题,可以加入微信群,同时也可以一起探讨研究技术问题

| ![微信技术群](./docs/.vuepress/public/img/wechatGroup.png) |
|-------------------------------------------------------|
| 如果扫码失败请直接搜微信号 FastRequest99 |
| ---------------------------------------------------------- |
| 如果扫码失败请直接搜微信号 FastRequest99 |

## 功能

Expand Down
6 changes: 2 additions & 4 deletions docs/.vuepress/config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { container } from "@mdit/plugin-container";
import { viteBundler } from "@vuepress/bundler-vite";
import { defineUserConfig } from "vuepress";
import { getDirname, path } from "vuepress/utils";
import { path } from "vuepress/utils";

import theme from "./theme.js";

const __dirname = getDirname(import.meta.url);

export default defineUserConfig({
title: "Fast Request",
description: "Intellij Restful Fast Request",
Expand Down Expand Up @@ -66,7 +64,7 @@ export default defineUserConfig({

alias: {
"@theme-hope/layouts/Layout": path.resolve(
__dirname,
import.meta.dirname,
"./layouts/Layout.vue",
),
// "@theme-hope/components/HomePage": path.resolve(
Expand Down
61 changes: 24 additions & 37 deletions docs/.vuepress/theme.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { getDirname, path } from "vuepress/utils";
import { path } from "vuepress/utils";
import { hopeTheme } from "vuepress-theme-hope";
import { enNavbar, zhNavbar } from "./navbar.js";
import { enSidebar, zhSidebar } from "./sidebar.js";

const __dirname = getDirname(import.meta.url);

export default hopeTheme(
{
hostname: "https://api-buddy.com",
Expand Down Expand Up @@ -43,15 +41,30 @@ export default hopeTheme(
},
},

plugins: {
// comment: {
// provider: "Giscus",
// repo: "kings1990/giscus-fastrequest",
// repoId: "R_kgDOHLlUsg",
// category: "fastRequest",
// categoryId: "DIC_kwDOHLlUss4COlsW",
// },
markdown: {
highlighter: {
type: "shiki",
lineNumbers: 10,
theme: "one-dark-pro",
},
align: true,
chartjs: true,
component: true,
include: {
resolvePath: (file) =>
file.startsWith("@src")
? file.replace("@src", path.resolve(import.meta.dirname, ".."))
: file,
},
mark: true,
tasklist: true,
imgLazyload: true,
imgSize: true,
tabs: true,
codeTabs: true,
},

plugins: {
components: {
components: [
"Badge",
Expand Down Expand Up @@ -79,27 +92,6 @@ export default hopeTheme(
},
},

markdownImage: {
lazyload: true,
size: true,
},

markdownTab: true,

mdEnhance: {
align: true,
chart: true,
component: true,
include: {
resolvePath: (file) =>
file.startsWith("@src")
? file.replace("@src", path.resolve(__dirname, ".."))
: file,
},
mark: true,
tasklist: true,
},

notice: [
{
path: "/",
Expand Down Expand Up @@ -132,11 +124,6 @@ export default hopeTheme(
key: "2024.1.9",
},
],

shiki: {
lineNumbers: 10,
theme: 'one-dark-pro',
}
},
},
{ custom: true },
Expand Down
4 changes: 3 additions & 1 deletion docs/compare.snippet.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<!-- markdownlint-disable MD033 MD041 -->

<div class="compare-wrapper" style="display:flex">

<div class="hint-container info" style="margin-right:15px;width:50%">
Expand Down Expand Up @@ -33,7 +35,7 @@
- [x] [<ColorIcon icon="saveGroup" /> <ColorIcon icon="apiParamGroupNew" /> API 分组](/guide/features/apiGroup.md)
- [x] [<ColorIcon icon="saveTemp" /> 临时请求](/guide/features/tempRequest.md)
- [x] [<ColorIcon icon="apifox" /> Apifox 集成](/guide/features/apifox.md)
- [x] [<ColorIcon icon="postmanNew" /> Postman 集成](/guide/features/postmanSync.md)
- [x] [<ColorIcon icon="postmanNew" /> Postman 集成](/guide/features/postmanSync.md)
- [x] [<ColorIcon icon="clearNew" /> 一键清除参数](/guide/features/clear.md)
- [x] [<ColorIcon icon="import" /> cURL 导入](/guide/features/clear.md)
- [x] [<ColorIcon icon="urlCopy" /> 一键拷贝 Url](/guide/features/copyUrl.md)
Expand Down
8 changes: 5 additions & 3 deletions docs/contact.snippet.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<!-- markdownlint-disable MD041 -->

## 🤝 联系我们

如果遇到了问题,请通过以下方式联系我们,将会有更快为你解决问题,同时群里全部都是 Javaer,经常会讨论一些技术问题,热点新闻,跳槽,吐槽等,可以帮助你学到一些东西。

| ![微信技术群](https://img.shields.io/static/v1?label=wechat&message=微信技术群&logo=wechat&color=07C160) | [![twitter](https://img.shields.io/static/v1?label=Twitter&message=FastRequest666&logo=twitter&color=FC8D34)](https://twitter.com/FastRequest666) |
|------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------|
| ![wechat group](/img/wechatGroup.png =300x300) | ![twitter](/img/twitter.png =300x300) |
| 如果扫码失败请直接搜微信号 FastRequest99 | 欢迎关注官方 Twitter |
| -------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
| ![wechat group](/img/wechatGroup.png =300x300) | ![twitter](/img/twitter.png =300x300) |
| 如果扫码失败请直接搜微信号 FastRequest99 | 欢迎关注官方 Twitter |
10 changes: 6 additions & 4 deletions docs/en/compare.snippet.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<!-- markdownlint-disable MD033 MD041 -->

<div class="compare-wrapper" style="display:flex">

<div class="hint-container info" style="margin-right:15px;width:50%">
Expand All @@ -24,22 +26,22 @@
- [x] [<ColorIcon icon="openai" /> OpenAI API Optimizing fields](/en/guide/features/ai.md)
- [x] [<ColorIcon icon="quanjucanshu" /> Project-level config](/en/guide/features/projectValueConfig.md)
- [x] [<ColorIcon icon="environment" /> Environment](/en/guide/features/environment.md)
- [x] [<ColorIcon icon="function" /> Function](/en/guide/features/function.md)
- [x] [<ColorIcon icon="function" /> Function](/en/guide/features/function.md)
- [x] [<ColorIcon icon="domainConfigNew" /> Yaml、Properties domain parse](/en/guide/features/projectLevelDomainConfig.md)
- [x] [<ColorIcon icon="stop" /> Stop API request](/en/guide/features/stopRequest.md)
- [x] [<ColorIcon icon="localScope" /> Navigate to current method](/en/guide/features/navigateCurrentMethod.md)
- [x] [<ColorIcon icon="storeData" /> Multi tab window](/en/guide/features/navigateCurrentMethodJson.md)
- [x] [<ColorIcon icon="saveGroup" /><ColorIcon icon="apiParamGroupNew" /> API grouping](/en/guide/features/apiGroup.md)
- [x] [<ColorIcon icon="saveTemp" /> Temporary request](/en/guide/features/tempRequest.md)
- [x] [<ColorIcon icon="apifox" /> Apifox integration](/en/guide/features/apifox.md)
- [x] [<ColorIcon icon="postmanNew" /> Postman integration](/en/guide/features/postmanSync.md)
- [x] [<ColorIcon icon="postmanNew" /> Postman integration](/en/guide/features/postmanSync.md)
- [x] [<ColorIcon icon="clearNew" /> Clear params](/en/guide/features/clear.md)
- [x] [<ColorIcon icon="import" /> cURL import](/en/guide/features/clear.md)
- [x] [<ColorIcon icon="urlCopy" /> Url copy](/en/guide/features/copyUrl.md)
- [x] [<ColorIcon icon="historyNew" /> History request](/en/guide/features/historyRequest.md)
- [x] [<ColorIcon icon="github" /><ColorIcon icon="gitee" /><ColorIcon icon="gitlab" /> API document sync](/en/guide/features/apiDocSync.md)
- [x] [<ColorIcon icon="markdown" /> API export](/en/guide/features/shareApiDoc.md)
- [x] [<ColorIcon icon="openApi" /> OpenAPI export](/en/guide/features/openApi.md)
- [x] [<ColorIcon icon="openApi" /> OpenAPI export](/en/guide/features/openApi.md)
- [x] [<ColorIcon icon="fullScreen" /> FullScreen](/en/guide/features/fullScreen.md)
- [x] [<ColorIcon icon="commonHeaderNew" /> Common header](/en/guide/features/commonHeader.md)
- [x] [<ColorIcon icon="chrome" /> Html preview](/en/guide/features/htmlPreview.md)
Expand All @@ -50,7 +52,7 @@
- [x] [<ColorIcon icon="restfulFastRequest" /> API list preview<](/en/guide/features/apiPreview.md)
- [x] [<ColorIcon icon="class" /> Api 注释预览](/en/guide/features/apiCommentPreview.md)
- [x] [<ColorIcon icon="restfulFastRequest" /> Auto domain](/en/guide/features/autoDomain.md)
- [x] [<ColorIcon icon="headersPreset" /> Headers Preset](/en/guide/features/headersPreset.md)
- [x] [<ColorIcon icon="headersPreset" /> Headers Preset](/en/guide/features/headersPreset.md)
- [x] [<ColorIcon icon="analyseNew" /> Annual report](/en/guide/features/annualReport.md)
- [x] [More...](./guide/features/)

Expand Down
Loading

0 comments on commit e9122b9

Please sign in to comment.