Skip to content

Commit

Permalink
Merge pull request #2491 from Mister-Hope/main
Browse files Browse the repository at this point in the history
feat: bump deps
  • Loading branch information
Snailclimb authored Sep 24, 2024
2 parents 74170ea + 70819c9 commit 510a823
Show file tree
Hide file tree
Showing 24 changed files with 3,858 additions and 2,682 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v4

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

Expand Down
3 changes: 2 additions & 1 deletion docs/.vuepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default defineUserConfig({

title: "JavaGuide",
description:
"「Java学习指北 + Java面试指南」一份涵盖大部分 Java 程序员所需要掌握的核心知识。准备 Java 面试,复习 Java 知识点,首选 JavaGuide! ",
"「Java 学习指北 + Java 面试指南」一份涵盖大部分 Java 程序员所需要掌握的核心知识。准备 Java 面试,复习 Java 知识点,首选 JavaGuide! ",
lang: "zh-CN",

head: [
Expand Down Expand Up @@ -61,4 +61,5 @@ export default defineUserConfig({
pagePatterns: ["**/*.md", "!**/*.snippet.md", "!.vuepress", "!node_modules"],

shouldPrefetch: false,
shouldPreload: false,
});
1 change: 1 addition & 0 deletions docs/.vuepress/styles/config.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$theme-color: #2980b9;
5 changes: 2 additions & 3 deletions docs/.vuepress/styles/palette.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
$theme-color: #2980b9;
$sidebar-width: 20rem;
$sidebar-mobile-width: 16rem;
$font-family: 'Georgia, -apple-system, "Nimbus Roman No9 L", "PingFang SC", "Hiragino Sans GB", "Noto Serif SC", "Microsoft Yahei", "WenQuanYi Micro Hei", sans-serif';
$font-family-heading: 'Georgia, -apple-system, "Nimbus Roman No9 L", "PingFang SC", "Hiragino Sans GB", "Noto Serif SC", "Microsoft Yahei", "WenQuanYi Micro Hei", sans-serif';
$vp-font: 'Georgia, -apple-system, "Nimbus Roman No9 L", "PingFang SC", "Hiragino Sans GB", "Noto Serif SC", "Microsoft Yahei", "WenQuanYi Micro Hei", sans-serif';
$vp-font-heading: 'Georgia, -apple-system, "Nimbus Roman No9 L", "PingFang SC", "Hiragino Sans GB", "Noto Serif SC", "Microsoft Yahei", "WenQuanYi Micro Hei", sans-serif';
29 changes: 4 additions & 25 deletions docs/.vuepress/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,6 @@ export default hopeTheme({
},

plugins: {
components: {
rootComponents: {
// https://plugin-components.vuejs.press/zh/guide/utilities/notice.html#%E7%94%A8%E6%B3%95
// notice: [
// {
// path: "/",
// title: "PDF面试资料(2024版)",
// showOnce: true,
// content:
// "2024最新版原创PDF面试资料来啦!涵盖 Java 核心、数据库、缓存、分布式、设计模式、智力题等内容,非常全面!",
// actions: [
// {
// text: "点击领取",
// link: "https://oss.javaguide.cn/backend-notekbook/official-account-traffic-backend-notebook-with-data-screenshot.png",
// type: "primary",
// },
// ],
// },
// ],
},
},

blog: true,

copyright: {
Expand All @@ -81,12 +59,13 @@ export default hopeTheme({
rss: true,
},

markdownTab: {
codeTabs: true,
},

mdEnhance: {
align: true,
codetabs: true,
figure: true,
gfm: true,
hint: true,
include: {
resolvePath: (file, cwd) => {
if (file.startsWith("@"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ category: 走近作者

如果你也想通过接私活变现的话,可以在我的公众号后台回复“**接私活**”来了解一些我的个人经验分享。

<div align="center">
<img src="https://oss.javaguide.cn/github/javaguide/gongzhonghaoxuanchuan.png" style="margin: 0 auto;" />
</div>
::: center

![](https://oss.javaguide.cn/github/javaguide/gongzhonghaoxuanchuan.png)

:::

## 为什么自称 Guide?

Expand Down
2 changes: 2 additions & 0 deletions docs/cs-basics/algorithms/10-classical-sorting-algorithms.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ tag:

> 本文转自:<http://www.guoyaohua.com/sorting.html>,JavaGuide 对其做了补充完善。
<!-- markdownlint-disable MD024 -->

## 引言

所谓排序,就是使一串记录,按照其中的某个或某些关键字的大小,递增或递减的排列起来的操作。排序算法,就是如何使得记录按照要求排列的方法。排序算法在很多领域得到相当地重视,尤其是在大量数据的处理方面。一个优秀的算法可以节省大量的资源。在各个领域中考虑到数据的各种限制和规范,要得到一个符合实际的优秀算法,得经过大量的推理和分析。
Expand Down
2 changes: 2 additions & 0 deletions docs/cs-basics/algorithms/linkedlist-algorithm-problems.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ tag:
- 算法
---

<!-- markdownlint-disable MD024 -->

## 1. 两数相加

### 题目描述
Expand Down
54 changes: 27 additions & 27 deletions docs/cs-basics/network/computer-network-xiexiren-summary.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/cs-basics/network/nat.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ SOHO 子网的“代理人”,也就是和外界的窗口,通常由路由器
3. WAN 的 ISP 变更接口地址时,无需通告 LAN 内主机。
4. LAN 主机对 WAN 不可见,不可直接寻址,可以保证一定程度的安全性。

然而,NAT 协议由于其独特性,存在着一些争议。比如,可能你已经注意到了,<b>NAT 协议在 LAN 以外,标识一个内部主机时,使用的是端口号,因为 IP 地址都是相同的。</b>这种将端口号作为主机寻址的行为,可能会引发一些误会。此外,路由器作为网络层的设备,修改了传输层的分组内容(修改了源 IP 地址和端口号),同样是不规范的行为。但是,尽管如此,NAT 协议作为 IPv4 时代的产物,极大地方便了一些本来棘手的问题,一直被沿用至今。
然而,NAT 协议由于其独特性,存在着一些争议。比如,可能你已经注意到了,**NAT 协议在 LAN 以外,标识一个内部主机时,使用的是端口号,因为 IP 地址都是相同的。**这种将端口号作为主机寻址的行为,可能会引发一些误会。此外,路由器作为网络层的设备,修改了传输层的分组内容(修改了源 IP 地址和端口号),同样是不规范的行为。但是,尽管如此,NAT 协议作为 IPv4 时代的产物,极大地方便了一些本来棘手的问题,一直被沿用至今。

<!-- @include: @article-footer.snippet.md -->
Loading

0 comments on commit 510a823

Please sign in to comment.