Skip to content

Commit

Permalink
Merge pull request #2254 from Mister-Hope/main
Browse files Browse the repository at this point in the history
feat: bump deps
  • Loading branch information
Snailclimb authored Feb 6, 2024
2 parents af60681 + e194254 commit 6eaf13c
Show file tree
Hide file tree
Showing 7 changed files with 1,149 additions and 1,238 deletions.
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

pnpm nano-staged
3 changes: 3 additions & 0 deletions docs/.vuepress/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { viteBundler } from "@vuepress/bundler-vite";
import { defineUserConfig } from "vuepress";
import theme from "./theme.js";

Expand Down Expand Up @@ -53,6 +54,8 @@ export default defineUserConfig({
],
],

bundler: viteBundler(),

theme,

pagePatterns: ["**/*.md", "!**/*.snippet.md", "!.vuepress", "!node_modules"],
Expand Down
15 changes: 4 additions & 11 deletions docs/.vuepress/theme.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { getDirname, path } from "@vuepress/utils";
import { getDirname, path } from "vuepress/utils";
import { hopeTheme } from "vuepress-theme-hope";
import { componentsPlugin } from "vuepress-plugin-components";

import navbar from "./navbar.js";
import sidebar from "./sidebar/index.js";
Expand Down Expand Up @@ -30,15 +29,7 @@ export default hopeTheme({
'<a href="https://beian.miit.gov.cn/" target="_blank">鄂ICP备2020015769号-1</a>',
displayFooter: true,

pageInfo: [
"Author",
"Category",
"Tag",
// "Date",
"Original",
"Word",
"ReadingTime",
],
pageInfo: ["Author", "Category", "Tag", "Original", "Word", "ReadingTime"],

blog: {
intro: "/about-the-author/",
Expand Down Expand Up @@ -72,7 +63,9 @@ export default hopeTheme({
],
},
},

blog: true,

copyright: {
author: "JavaGuide(javaguide.cn)",
license: "MIT",
Expand Down
2 changes: 1 addition & 1 deletion docs/java/jvm/jvm-parameters-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ tag:

### 2.2.显式新生代内存(Young Generation)

根据[Oracle 官方文档](https://docs.oracle.com/javase/8/docs/technotes/guides/vm/gctuning/sizing.html),在堆总可用内存配置完成之后,第二大影响因素是为 `Young Generation` 在堆内存所占的比例。默认情况下,YG 的最小大小为 1310 _MB_,最大大小为*无限制*
根据[Oracle 官方文档](https://docs.oracle.com/javase/8/docs/technotes/guides/vm/gctuning/sizing.html),在堆总可用内存配置完成之后,第二大影响因素是为 `Young Generation` 在堆内存所占的比例。默认情况下,YG 的最小大小为 1310 _MB_,最大大小为 _无限制_

一共有两种指定 新生代内存(Young Generation)大小的方法:

Expand Down
5 changes: 4 additions & 1 deletion docs/system-design/framework/mybatis/mybatis-interview.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@ head:
答:

- `${}`是 Properties 文件中的变量占位符,它可以用于标签属性值和 sql 内部,属于原样文本替换,可以替换任意内容,比如\${driver}会被原样替换为`com.mysql.jdbc. Driver`
一个实例:根据参数按任意字段排序:

一个示例:根据参数按任意字段排序:

```sql
select * from users order by ${orderCols}
```

`orderCols`可以是 `name``name desc``name,sex asc`等,实现灵活的排序。

- `#{}`是 sql 的参数占位符,MyBatis 会将 sql 中的`#{}`替换为? 号,在 sql 执行前会使用 PreparedStatement 的参数设置方法,按序给 sql 的? 号占位符设置参数值,比如 ps.setInt(0, parameterValue),`#{item.name}` 的取值方式为使用反射从参数对象中获取 item 对象的 name 属性值,相当于 `param.getItem().getName()`
Expand Down
28 changes: 12 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,27 @@
"lint": "pnpm lint:prettier && pnpm lint:md",
"lint:md": "markdownlint-cli2 '**/*.md'",
"lint:prettier": "prettier --check --write .",
"prepare": "husky install",
"prepare": "husky",
"update": "pnpm dlx vp-update"
},
"nano-staged": {
"**/*": "prettier --write --ignore-unknown",
".md": "markdownlint-cli2"
},
"packageManager": "pnpm@8.13.1",
"packageManager": "pnpm@8.15.1",
"dependencies": {
"@vuepress/client": "2.0.0-rc.0",
"@vuepress/plugin-search": "2.0.0-rc.0",
"@vuepress/utils": "2.0.0-rc.0",
"husky": "8.0.3",
"markdownlint-cli2": "0.11.0",
"@vuepress/bundler-vite": "2.0.0-rc.6",
"@vuepress/plugin-copyright": "2.0.0-rc.11",
"@vuepress/plugin-feed": "2.0.0-rc.11",
"@vuepress/plugin-search": "2.0.0-rc.11",
"husky": "9.0.10",
"markdownlint-cli2": "0.12.1",
"mathjax-full": "3.2.2",
"nano-staged": "0.8.0",
"nodejs-jieba": "0.1.2",
"prettier": "3.1.1",
"vue": "^3.4.13",
"vuepress": "2.0.0-rc.0",
"vuepress-plugin-copyright2": "2.0.0-rc.11",
"vuepress-plugin-feed2": "2.0.0-rc.11",
"vuepress-theme-hope": "2.0.0-rc.11"
},
"devDependencies": {
"vuepress-plugin-components": "2.0.0-rc.11"
"prettier": "3.2.5",
"vue": "3.4.15",
"vuepress": "2.0.0-rc.6",
"vuepress-theme-hope": "2.0.0-rc.22"
}
}
Loading

0 comments on commit 6eaf13c

Please sign in to comment.