Skip to content

Commit 0cfb50e

Browse files
JstarfishJstarfish
committed
redis
1 parent ac1ca29 commit 0cfb50e

File tree

8 files changed

+71
-61
lines changed

8 files changed

+71
-61
lines changed

‎docs/.DS_Store‎

2 KB
Binary file not shown.

‎docs/.vuepress/dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 4ebd1cc056050c5d0378eb052ea65d2454ba39a7
1+
Subproject commit 356586bb9f66cae45a41358b7c93f4e38c1a6a17

‎docs/data-management/.DS_Store‎

2 KB
Binary file not shown.

‎docs/data-management/MySQL/MySQL-Index.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
- 可以简单的理解为“排好序的快速查找数据结构”，数据本身之外，<font color=#FF0000>**数据库还维护者一个满足特定查找算法的数据结构**</font>，这些数据结构以某种方式引用（指向）数据，这样就可以在这些数据结构上实现高级查找算法。这种数据结构，就是索引。下图是一种可能的索引方式示例。
1414

15-
<<<<<<< HEAD
1615
![](https://static01.imgkr.com/temp/5dda88d8f792449eb6ba7206265aab40.png)
1716
=======
1817
![](https://tva1.sinaimg.cn/large/007S8ZIlly1ghphshtu04j30gt08xmxn.jpg)

‎docs/framework/.DS_Store‎

2 KB
Binary file not shown.

‎docs/framework/spring/My-Spring.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# 手写 Spring
22

33
![image-20201106173130849](https://cdn.jsdelivr.net/gh/Jstarfish/picBed/img/20201106173132.png)
4-
5-
<<<<<<< HEAD
64
配置阶段：主要是完成application.xml配置和Annotation配置。
75

86
初始化阶段：主要是加载并解析配置信息，然后，初始化IOC容器，完成容器的DI操作，已经完成HandlerMapping的初始化。
@@ -34,5 +32,3 @@
3432
3533
⑾ DispatcherServlet响应用户。
3634
```
37-
38-
>>>>>>> 4e1ddf5a75a905b28c1e7ad17661188dd4f191b0

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"license": "ISC",
1313
"devDependencies": {
1414
"@vuepress-reco/vuepress-plugin-bulletin-popover": "^1.5.7",
15-
"vuepress": "^1.7.1",
15+
"vuepress": "^1.8.2",
1616
"vuepress-plugin-mathjax": "^1.2.8",
1717
"vuepress-theme-reco": "^1.5.7"
1818
}

‎yarn.lock‎

Lines changed: 69 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,18 +1218,18 @@
12181218
resolved "https://registry.yarnpkg.com/@vuepress-reco/vuepress-plugin-pagation/-/vuepress-plugin-pagation-1.6.0.tgz#c632aae1638ff9c67fe58c39ab617132be9eeecb"
12191219
integrity sha512-QvmAqfbCnkvdLU0/yZWkFrL/PJgKhciB3FWgJu756FH66iqO/QKDPaZ1vlzI3RfYOIEwLEhPd1U9Rvt9ICaQtQ==
12201220

1221-
"@vuepress/core@1.7.1":
1222-
version "1.7.1"
1223-
resolved "https://registry.yarnpkg.com/@vuepress/core/-/core-1.7.1.tgz#e92faad0e9445fdd775f8e0d65e927bc35e80571"
1224-
integrity sha512-M5sxZq30Ke1vXa4ZZjk6185fwtpiJOqzXNnzcIe0GxtvtaF8Yij6b+KqQKlUJnnUXm+CKxiLCr8PTzDY26N7yw==
1221+
"@vuepress/core@1.8.2":
1222+
version "1.8.2"
1223+
resolved "https://registry.yarnpkg.com/@vuepress/core/-/core-1.8.2.tgz#4f5bafc894691bfea4146294a582a129483daf2a"
1224+
integrity sha512-lh9BLC06k9s0wxTuWtCkiNj49fkbW87enp0XSrFZHEoyDGSGndQjZmMMErcHc5Hx7nrW1nzc33sPH1NNtJl0hw==
12251225
dependencies:
12261226
"@babel/core" "^7.8.4"
12271227
"@vue/babel-preset-app" "^4.1.2"
1228-
"@vuepress/markdown" "1.7.1"
1229-
"@vuepress/markdown-loader" "1.7.1"
1230-
"@vuepress/plugin-last-updated" "1.7.1"
1231-
"@vuepress/plugin-register-components" "1.7.1"
1232-
"@vuepress/shared-utils" "1.7.1"
1228+
"@vuepress/markdown" "1.8.2"
1229+
"@vuepress/markdown-loader" "1.8.2"
1230+
"@vuepress/plugin-last-updated" "1.8.2"
1231+
"@vuepress/plugin-register-components" "1.8.2"
1232+
"@vuepress/shared-utils" "1.8.2"
12331233
autoprefixer "^9.5.1"
12341234
babel-loader "^8.0.4"
12351235
cache-loader "^3.0.0"
@@ -1262,32 +1262,32 @@
12621262
webpack-merge "^4.1.2"
12631263
webpackbar "3.2.0"
12641264

1265-
"@vuepress/markdown-loader@1.7.1":
1266-
version "1.7.1"
1267-
resolved "https://registry.yarnpkg.com/@vuepress/markdown-loader/-/markdown-loader-1.7.1.tgz#f3ab20965d5dec6e2fc2d11c78ef1a9f08d62f72"
1268-
integrity sha512-GM1F/tRhP9qZydTC89FXJPlLH+BmZijMKom5BYLAMEXsU20A9kABTRoatPjOUbZuKT+gn03JgG97qVd8xa/ETw==
1265+
"@vuepress/markdown-loader@1.8.2":
1266+
version "1.8.2"
1267+
resolved "https://registry.yarnpkg.com/@vuepress/markdown-loader/-/markdown-loader-1.8.2.tgz#b2a58291a967f2bbe0af6e58f9542f5911879233"
1268+
integrity sha512-mWzFXikCUcAN/chpKkqZpRYKdo0312hMv8cBea2hvrJYV6y4ODB066XKvXN8JwOcxuCjxWYJkhWGr+pXq1oTtw==
12691269
dependencies:
1270-
"@vuepress/markdown" "1.7.1"
1270+
"@vuepress/markdown" "1.8.2"
12711271
loader-utils "^1.1.0"
12721272
lru-cache "^5.1.1"
12731273

1274-
"@vuepress/markdown@1.7.1":
1275-
version "1.7.1"
1276-
resolved "https://registry.yarnpkg.com/@vuepress/markdown/-/markdown-1.7.1.tgz#56f60c2362fd82b8f2702eefa366c0d5b02fdcbd"
1277-
integrity sha512-Ava9vJECHG1+RC53ut1dXSze35IH5tc3qesC06Ny37WS93iDSQy09j8y+a0Lugy12j1369+QQeRFWa40tdHczA==
1274+
"@vuepress/markdown@1.8.2":
1275+
version "1.8.2"
1276+
resolved "https://registry.yarnpkg.com/@vuepress/markdown/-/markdown-1.8.2.tgz#50ea5a1962591a436b26d1aa2b111df37eb9ea8a"
1277+
integrity sha512-zznBHVqW+iBkznF/BO/GY9RFu53khyl0Ey0PnGqvwCJpRLNan6y5EXgYumtjw2GSYn5nDTTALYxtyNBdz64PKg==
12781278
dependencies:
1279-
"@vuepress/shared-utils" "1.7.1"
1279+
"@vuepress/shared-utils" "1.8.2"
12801280
markdown-it "^8.4.1"
12811281
markdown-it-anchor "^5.0.2"
12821282
markdown-it-chain "^1.3.0"
12831283
markdown-it-emoji "^1.4.0"
12841284
markdown-it-table-of-contents "^0.4.0"
12851285
prismjs "^1.13.0"
12861286

1287-
"@vuepress/plugin-active-header-links@1.7.1":
1288-
version "1.7.1"
1289-
resolved "https://registry.yarnpkg.com/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.7.1.tgz#5a16281bebb977fc1c2b93d992b1a3b7ff840641"
1290-
integrity sha512-Wgf/oB9oPZLnYoLjQ/xbQc4Qa3RU5tXAo2dB4Xl/7bUL6SqBxO866kX3wPxKdSOIL58tq8iH9XbUe3Sxi8/ISQ==
1287+
"@vuepress/plugin-active-header-links@1.8.2":
1288+
version "1.8.2"
1289+
resolved "https://registry.yarnpkg.com/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.8.2.tgz#0cb9b29c826dd97d35357a9b09c962ef782cb793"
1290+
integrity sha512-JmXAQg8D7J8mcKe2Ue3BZ9dOCzJMJXP4Cnkkc/IrqfDg0ET0l96gYWZohCqlvRIWt4f0VPiFAO4FLYrW+hko+g==
12911291
dependencies:
12921292
lodash.debounce "^4.0.8"
12931293

@@ -1305,10 +1305,10 @@
13051305
vuepress-plugin-mailchimp "^1.4.1"
13061306
vuepress-plugin-sitemap "^2.3.1"
13071307

1308-
"@vuepress/plugin-last-updated@1.7.1":
1309-
version "1.7.1"
1310-
resolved "https://registry.yarnpkg.com/@vuepress/plugin-last-updated/-/plugin-last-updated-1.7.1.tgz#668c55daa6b8bc1d8ee42cdb4169cf67c01b6e97"
1311-
integrity sha512-VW5jhBuO0WRHDsBmFsKC6QtEyBLCgyhuH9nQ65aairCn3tdoJPz0uQ4g3lr/boVbgsPexO677Sn3dRPgYqnMug==
1308+
"@vuepress/plugin-last-updated@1.8.2":
1309+
version "1.8.2"
1310+
resolved "https://registry.yarnpkg.com/@vuepress/plugin-last-updated/-/plugin-last-updated-1.8.2.tgz#7ce689f8d5050cf0213949bc2e5aa879c09ff4b1"
1311+
integrity sha512-pYIRZi52huO9b6HY3JQNPKNERCLzMHejjBRt9ekdnJ1xhLs4MmRvt37BoXjI/qzvXkYtr7nmGgnKThNBVRTZuA==
13121312
dependencies:
13131313
cross-spawn "^6.0.5"
13141314

@@ -1319,26 +1319,41 @@
13191319
dependencies:
13201320
medium-zoom "^1.0.4"
13211321

1322-
"@vuepress/plugin-nprogress@1.7.1":
1323-
version "1.7.1"
1324-
resolved "https://registry.yarnpkg.com/@vuepress/plugin-nprogress/-/plugin-nprogress-1.7.1.tgz#101ebf720eaa635a473e16ca16e7b4a7850331fa"
1325-
integrity sha512-KtqfI3RitbsEbm22EhbooTvhjfMf6zttKlbND7LcyJwP3MEPVYyzQJuET03hk9z4SgCfNV2r/W3sYyejzzTMog==
1322+
"@vuepress/plugin-nprogress@1.8.2":
1323+
version "1.8.2"
1324+
resolved "https://registry.yarnpkg.com/@vuepress/plugin-nprogress/-/plugin-nprogress-1.8.2.tgz#dc6c082925420c8c59ecb7fc2d4a9401f6d4664a"
1325+
integrity sha512-3TOBee2NM3WLr1tdjDTGfrAMggjN+OlEPyKyv8FqThsVkDYhw48O3HwqlThp9KX7UbL3ExxIFBwWRFLC+kYrdw==
13261326
dependencies:
13271327
nprogress "^0.2.0"
13281328

1329-
"@vuepress/plugin-register-components@1.7.1":
1330-
version "1.7.1"
1331-
resolved "https://registry.yarnpkg.com/@vuepress/plugin-register-components/-/plugin-register-components-1.7.1.tgz#1ff58e931e8c27d64f9b86f2df879ddaceccdebe"
1332-
integrity sha512-MlFdH6l3rTCJlGMvyssXVG998cq5LSMzxCuQLYcRdtHQT4HbikIcV4HSPGarWInD1mP12+qX/PvKUawGwp1eVg==
1329+
"@vuepress/plugin-register-components@1.8.2":
1330+
version "1.8.2"
1331+
resolved "https://registry.yarnpkg.com/@vuepress/plugin-register-components/-/plugin-register-components-1.8.2.tgz#2fb45a68b0a1efb8822670d95c3b231a2d0eb74d"
1332+
integrity sha512-6SUq3nHFMEh9qKFnjA8QnrNxj0kLs7+Gspq1OBU8vtu0NQmSvLFZVaMV7pzT/9zN2nO5Pld5qhsUJv1g71MrEA==
13331333
dependencies:
1334-
"@vuepress/shared-utils" "1.7.1"
1334+
"@vuepress/shared-utils" "1.8.2"
13351335

1336-
"@vuepress/plugin-search@1.7.1":
1337-
version "1.7.1"
1338-
resolved "https://registry.yarnpkg.com/@vuepress/plugin-search/-/plugin-search-1.7.1.tgz#f52b6e77af30f452213bc677741cefe8a8309be2"
1339-
integrity sha512-OmiGM5eYg9c+uC50b6/cSxAhqxfD7AIui6JEztFGeECrlP33RLHmteXK9YBBZjp5wTNmoYs+NXI/cWggYUPW8Q==
1336+
"@vuepress/plugin-search@1.8.2":
1337+
version "1.8.2"
1338+
resolved "https://registry.yarnpkg.com/@vuepress/plugin-search/-/plugin-search-1.8.2.tgz#74b92f663acf6b4560e15dc0442a84c4e874e206"
1339+
integrity sha512-JrSJr9o0Kar14lVtZ4wfw39pplxvvMh8vDBD9oW09a+6Zi/4bySPGdcdaqdqGW+OHSiZNvG+6uyfKSBBBqF6PA==
13401340

1341-
"@vuepress/shared-utils@1.7.1", "@vuepress/shared-utils@^1.2.0":
1341+
"@vuepress/shared-utils@1.8.2":
1342+
version "1.8.2"
1343+
resolved "https://registry.yarnpkg.com/@vuepress/shared-utils/-/shared-utils-1.8.2.tgz#5ec1601f2196aca34ad82eed7c9be2d7948f705b"
1344+
integrity sha512-6kGubc7iBDWruEBUU7yR+sQ++SOhMuvKWvWeTZJKRZedthycdzYz7QVpua0FaZSAJm5/dIt8ymU4WQvxTtZgTQ==
1345+
dependencies:
1346+
chalk "^2.3.2"
1347+
escape-html "^1.0.3"
1348+
fs-extra "^7.0.1"
1349+
globby "^9.2.0"
1350+
gray-matter "^4.0.1"
1351+
hash-sum "^1.0.2"
1352+
semver "^6.0.0"
1353+
toml "^3.0.0"
1354+
upath "^1.1.0"
1355+
1356+
"@vuepress/shared-utils@^1.2.0":
13421357
version "1.7.1"
13431358
resolved "https://registry.yarnpkg.com/@vuepress/shared-utils/-/shared-utils-1.7.1.tgz#028bc6003247bb4c60cdc96f231eecfb55e7b85d"
13441359
integrity sha512-ydB2ZKsFZE6hFRb9FWqzZksxAPIMJjtBawk50RP6F+YX5HbID/HlyYYZM9aDSbk6RTkjgB5UzJjggA2xM8POlw==
@@ -1353,14 +1368,14 @@
13531368
toml "^3.0.0"
13541369
upath "^1.1.0"
13551370

1356-
"@vuepress/theme-default@1.7.1":
1357-
version "1.7.1"
1358-
resolved "https://registry.yarnpkg.com/@vuepress/theme-default/-/theme-default-1.7.1.tgz#36fee5bb5165798c0082c512cbf4d94352260d97"
1359-
integrity sha512-a9HeTrlcWQj3ONHiABmlN2z9TyIxKfQtLsA8AL+WgjN3PikhFuZFIJGzfr+NLt67Y9oiI+S9ZfiaVyvWM+7bWQ==
1371+
"@vuepress/theme-default@1.8.2":
1372+
version "1.8.2"
1373+
resolved "https://registry.yarnpkg.com/@vuepress/theme-default/-/theme-default-1.8.2.tgz#7f474036c752c1f9801b83f68f5c70c092b182b4"
1374+
integrity sha512-rE7M1rs3n2xp4a/GrweO8EGwqFn3EA5gnFWdVmVIHyr7C1nix+EqjpPQF1SVWNnIrDdQuCw38PqS+oND1K2vYw==
13601375
dependencies:
1361-
"@vuepress/plugin-active-header-links" "1.7.1"
1362-
"@vuepress/plugin-nprogress" "1.7.1"
1363-
"@vuepress/plugin-search" "1.7.1"
1376+
"@vuepress/plugin-active-header-links" "1.8.2"
1377+
"@vuepress/plugin-nprogress" "1.8.2"
1378+
"@vuepress/plugin-search" "1.8.2"
13641379
docsearch.js "^2.5.2"
13651380
lodash "^4.17.15"
13661381
stylus "^0.54.8"
@@ -8440,13 +8455,13 @@ vuepress-theme-reco@^1.5.7:
84408455
vue-click-outside "1.1.0"
84418456
vuepress-plugin-smooth-scroll "^0.0.9"
84428457

8443-
vuepress@^1.7.1:
8444-
version "1.7.1"
8445-
resolved "https://registry.yarnpkg.com/vuepress/-/vuepress-1.7.1.tgz#bb0e139d8c407a0b5aa962cf9577832a5808937e"
8446-
integrity sha512-AdA3do1L4DNzeF8sMTE+cSUJ5hR/6f3YujU8DVowi/vFOg/SX2lJF8urvDkZUSXzaAT6aSgkI9L+B6D+i7SJjA==
8458+
vuepress@^1.8.2:
8459+
version "1.8.2"
8460+
resolved "https://registry.yarnpkg.com/vuepress/-/vuepress-1.8.2.tgz#97e8bf979630611fc7b621fc4cc35b798ee5e847"
8461+
integrity sha512-BU1lUDwsA3ghf7a9ga4dsf0iTc++Z/l7BR1kUagHWVBHw7HNRgRDfAZBDDQXhllMILVToIxaTifpne9mSi94OA==
84478462
dependencies:
8448-
"@vuepress/core" "1.7.1"
8449-
"@vuepress/theme-default" "1.7.1"
8463+
"@vuepress/core" "1.8.2"
8464+
"@vuepress/theme-default" "1.8.2"
84508465
cac "^6.5.6"
84518466
envinfo "^7.2.0"
84528467
opencollective-postinstall "^2.0.2"

0 commit comments

Comments
 (0)