Merge pull request #6 from 142vip/next

feat: 更换主题，修复一些问题
2026-02-08 04:53:59 +08:00 · 2023-02-07 23:19:52 +08:00
parent 1dae053473 be28c0ff83
commit e8a8621356
50 changed files with 1530 additions and 1165 deletions
--- a/21
+++ b/21
@@ -1,23 +1,22 @@
+#
+# - 功能: 408CSFamily镜像构建
+# - 用法: docker build -f Dockerfile --build-arg APP_VERSION=0.0.1 -t 408CSFamily-0.0.1  .
+#
+
 ## 注意：vite构建需要支持node14以上，安装node16较为稳妥
 FROM registry.cn-hangzhou.aliyuncs.com/142vip/node:16.12.0-alpine AS build_base
-LABEL version="Beta1.0"  description="408CSFamily合集"
-LABEL author="【Github&公众号】：Rong姐姐好可爱" email="fairy@2925.com"
-
 RUN mkdir -p /apps
-
 WORKDIR /apps
 COPY . .

-## 安装依赖
 RUN npm i pnpm@6 -g && pnpm i -D && pnpm build

-
-
 FROM registry.cn-hangzhou.aliyuncs.com/142vip/nginx:1.23.0-alpine
+
+ARG APP_VERSION
+LABEL version=$APP_VERSION   description="408CSFamily合集"
+LABEL author="【Github&公众号】：Rong姐姐好可爱" email="fairy_408@2925.com"
+
 # 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面 注意：--from参数
 COPY  --from=build_base /apps/docs/.vuepress/dist/  /usr/share/nginx/html/
-
 COPY nginx.conf /etc/nginx/
-
-#EXPOSE 7000
-#CMD ["nginx", "-g", "daemon off;"]
--- a/Faster.Dockerfile
+++ b/Faster.Dockerfile
@@ -0,0 +1,14 @@
+#
+# - 功能: 快速构建408CSFamily镜像
+# - 用法: docker build -f Faster.Dockerfile --build-arg APP_VERSION=0.0.1 -t 408CSFamily-0.0.1  .
+#
+
+FROM registry.cn-hangzhou.aliyuncs.com/142vip/nginx:1.23.0-alpine
+
+ARG APP_VERSION
+LABEL version=$APP_VERSION  description="408CSFamily合集"
+LABEL author="【Github&公众号】：Rong姐姐好可爱" email="fairy_408@2925.com"
+
+# 将dist文件中的内容复制到 /usr/share/nginx/html/
+COPY ./docs/.vuepress/dist/  /usr/share/nginx/html/
+COPY nginx.conf /etc/nginx/
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -1,4 +1,5 @@
-import { hopeTheme } from "vuepress-theme-hope";
+import themeConfig from "./config/theme.config";
+import pluginsConfig from "./config/plugins.config";

 export default {
  title: "计算机应试全家桶",
@@ -7,11 +8,11 @@ export default {
  port: 4200,
  head: [
    [
-        "link", { rel: "icon", href: "/408_favicon.ico" }
+      "link", {rel: "icon", href: "/408_favicon.ico"}
    ],
    [
-        // 百度统计
-      'script',{},`
+      // 百度统计
+      'script', {}, `
      var _hmt = _hmt || [];
      (function() {
        var hm = document.createElement("script");
@@ -21,127 +22,6 @@ export default {
      })();`
    ]
  ],
-  // 参考主题：https://theme-hope.vuejs.press/zh/config/intro.html#%E9%85%8D%E7%BD%AE%E6%A6%82%E5%BF%B5
-  theme: hopeTheme({
-    hostname:'https://408.142vip.cn',
-    author:{
-      name:'ChuFan',
-      email:'fairy_408@2925.com',
-      url:'https://www.142vip.cn'
-    },
-    favicon:"/408_favicon.ico",
-    logo: "/assets/408_logo.png",
-    navbar: require("./config/navbar/index"),  // 注意这个关键字有所改变
-    sidebar: require("./config/sidebar/index"),
-
-    // 主题布局选项
-    repo: "https://github.com/mmdapl/408CSFamily",
-    logoDark:"/assets/408_logo.png",
-
-
-    // 博客配置
-    blog_:{
-      name:'测试',
-      avatar:'',
-      description:'',
-      intro:'',
-      roundAvatar:true,
-      timeline:"时间轴的顶部文字",
-      // articleInfo:"",
-      // medias:{
-      //   "BiliBili": "哔哩哔哩"
-      // }
-    },
-    lastUpdated: true,
-    lastUpdatedText: "最近更新",
-    contributorsText: '贡献者',
-    notFound: ['宝贝不要急，我努力更新就会慢慢有的哟...想要什么，也欢迎微信后台私信！'],// 自定义404页面提示语，数组
-    backToHome: '返回首页', // 返回首页
-
-    sidebarDepth: 1,
-    editLink: false,
-    // 默认为 "Edit this page"
-    // editLinkText: '帮助我们改善此页面！',
-    search: true,
-    searchMaxSuggestions: 10,
-    plugins: {
-      // 开启博客功能
-      // blog:true,
-      // 代码块
-      mdEnhance: {
-        codetabs: true,
-      },
-    },
-  }),
-  // plugins: [
-  //   // 全文搜索 参考配置：https://github.com/vuepress/vuepress-next/blob/main/docs/.vuepress/config.ts
-  //   ['@vuepress/docsearch',
-  //     {
-  //       apiKey: '<API_KEY>',
-  //       indexName: '<INDEX_NAME>',
-  //       locales: {
-  //         '/': {
-  //           placeholder: '搜索一下',
-  //           translations: {
-  //             button: {
-  //               buttonText: '搜索一下',
-  //               buttonAriaLabel: '搜索一下',
-  //             },
-  //             modal: {
-  //               searchBox: {
-  //                 resetButtonTitle: '清除查询条件',
-  //                 resetButtonAriaLabel: '清除查询条件',
-  //                 cancelButtonText: '取消',
-  //                 cancelButtonAriaLabel: '取消'
-  //               },
-  //               startScreen: {
-  //                 recentSearchesTitle: '搜索历史',
-  //                 noRecentSearchesText: '没有搜索历史',
-  //                 saveRecentSearchButtonTitle: '保存至搜索历史',
-  //                 removeRecentSearchButtonTitle: '从搜索历史中移除',
-  //                 favoriteSearchesTitle: '收藏',
-  //                 removeFavoriteSearchButtonTitle: '从收藏中移除',
-  //               },
-  //               errorScreen: {
-  //                 titleText: '无法获取结果',
-  //                 helpText: '你可能需要检查你的网络连接',
-  //               },
-  //               footer: {
-  //                 selectText: '查询',
-  //                 selectKeyAriaLabel: 'Enter key',
-  //                 navigateText: '切换',
-  //                 navigateUpKeyAriaLabel: 'Arrow up',
-  //                 navigateDownKeyAriaLabel: 'Arrow down',
-  //                 closeText: '关闭',
-  //                 closeKeyAriaLabel: 'Escape key',
-  //                 searchByText: '技术支持',
-  //               },
-  //               noResultsScreen: {
-  //                 noResultsText: '无法找到相关结果',
-  //                 suggestedQueryText: '你可以尝试查询',
-  //                 openIssueText: '你认为该查询应该有结果？',
-  //                 openIssueLinkText: '点击反馈',
-  //               },
-  //             },
-  //           }
-  //         }
-  //       }
-  //     }],
-  //   // other plugins
-  //   // [
-  //   //   // 本地全文搜索
-  //   //   '@vuepress/plugin-search',
-  //   //   {
-  //   //     locales: {
-  //   //       '/': {
-  //   //         placeholder: '搜索',
-  //   //       },
-  //   //       '/zh/': {
-  //   //         placeholder: '搜索',
-  //   //       },
-  //   //     },
-  //   //     maxSuggestions: 10 // 显示最大搜索
-  //   //   },
-  //   // ],
-  // ]
-};
+  theme: themeConfig,
+  plugins: pluginsConfig
+}
--- a/docs/.vuepress/config/constant.js
+++ b/docs/.vuepress/config/constant.js
@@ -0,0 +1,5 @@
+
+export const FOOTER_HTML_INFO=`
+<a href="https://tongji.baidu.com/web/welcome/login" target="_blank">百度统计</a>  Copyrights © 2015-${new Date().getFullYear()} 妍荣姑娘网络工作室 
+| <a href="https://github.com/mmdapl" target="_blank">储凡</a>
+`
--- a/docs/.vuepress/config/navbar.js
+++ b/docs/.vuepress/config/navbar.js
@@ -1,73 +0,0 @@
-module.exports = [
-  {
-    text: '首页',
-    link: '/'
-  },
-  {
-    text: "恶补算法",
-    // link: "/DS/coding/algorithm"
-    children: [{
-      text: '课本习题',
-      link: '/'
-    }, {
-      text: '刷题笔记',
-      link: '/todo'
-    }, {
-      text: '在线刷题',
-      children: [{
-        text: '杭电OJ', link: 'http://acm.hdu.edu.cn/'
-      },
-      {
-        text: '牛客网', link: 'https://www.nowcoder.com/'
-      }, {
-        text: 'LeetCode', link: 'https://leetcode-cn.com/'
-      }]
-    }]
-  },
-  {
-    text: "数据结构",
-    link: "/DS/basic_introduction"
-  },
-  {
-    text: "操作系统",
-    link: "/OS/"
-  },
-  {
-    text: "计算机组成原理",
-    link: "/CCP/"
-  },
-
-  {
-    text: "计算机网络",
-    link: "/CN/"
-  }, {
-    text: '其他资料',
-    children: [{
-      text: '考研相关',
-      children: [{
-        text: '111',
-        link: '/333'
-      }]
-    }, {
-      text: "思维导图",
-      children: [{
-        text: '数据结构',
-        link: '/NoteMap/DS_Map'
-      }, {
-        text: '操作系统',
-        link: '/NoteMap/OS_Map'
-      }, {
-        text: '计算机组成原理',
-        link: '/NoteMap/CCP_Map'
-      }, {
-        text: '计算机网络',
-        link: '/NoteMap/CN_Map'
-      }]
-    }]
-  },
-  {
-    text: "大事记",
-    link: "/Big_Event_History/"
-  },
-
-];
--- a/docs/.vuepress/config/navbar/index.js
+++ b/docs/.vuepress/config/navbar/index.js
@@ -1,4 +1,4 @@
-module.exports = [
+export default [
  {
    text: '主页',
    link: '/'
@@ -6,7 +6,7 @@ module.exports = [
  {
    text: "算法恶补",
    children: [{
-      text: '习题练手',
+      text: '习题狂刷',
      link: '/algorithm/topic_practice'
    }, {
      text: '刷题笔记',
--- a/docs/.vuepress/config/plugins.config.js
+++ b/docs/.vuepress/config/plugins.config.js
@@ -0,0 +1,19 @@
+import {searchProPlugin} from "vuepress-plugin-search-pro";
+
+export default  [
+  searchProPlugin({
+    // 索引全部内容
+    indexContent: true,
+    // 为分类和标签添加索引
+    customFields: [
+      {
+        getter: (page) => page.frontmatter.category,
+        formatter: "分类：$content",
+      },
+      {
+        getter: (page) => page.frontmatter.tag,
+        formatter: "标签：$content",
+      },
+    ],
+  }),
+]
--- a/docs/.vuepress/config/sidebar.js
+++ b/docs/.vuepress/config/sidebar.js
@@ -1,18 +0,0 @@
-module.exports = {
-  // "/category/": require("../../category/sidebar_contents"),
-  // "/DataStructure/": require("../../category/sidebar_contents"),
-  "/ds": require("../../ds/sidebar_contents"),
-  // "/OS": [
-  //   {
-  //     text: 'VuePress Reference',
-  //     collapsible: true,
-  //     children: ['/reference/cli.md', '/reference/config.md'],
-  //   },
-  //   {
-  //     text: 'Bundlers Reference',
-  //     collapsible: true,
-  //     children: ['/reference/bundler/vite.md', '/reference/bundler/webpack.md'],
-  //   },
-  // ],
-
-};
--- a/docs/.vuepress/config/sidebar/algorithm.sidebar.js
+++ b/docs/.vuepress/config/sidebar/algorithm.sidebar.js
@@ -1,4 +1,4 @@
-module.exports = [
+export default [
  {
    text: '基础入门',
    link: "/ds/basic_introduction",
--- a/docs/.vuepress/config/sidebar/cpp.sidebar.js
+++ b/docs/.vuepress/config/sidebar/cpp.sidebar.js
@@ -0,0 +1,2 @@
+export default[
+]
--- a/docs/.vuepress/config/sidebar/ds.sidebar.js
+++ b/docs/.vuepress/config/sidebar/ds.sidebar.js
@@ -1,52 +1,53 @@
-module.exports = [
-  {
+export default [
+    {
    text: '基础入门',
-    link: "/ds/basic_introduction",
+    link: "/ds/basic-introduction",
    collapsible: false,
    children: [{
      text: '1.1 基本概念',
-      link: '/ds/basic_introduction/1.basic_concepts.md'
+      link: '/ds/basic-introduction/1.basic_concepts.md'
    }, {
      text: '1.2 数据结构三要素',
-      link: '/ds/basic_introduction/2.three_elements_of_data_structure.md'
+      link: '/ds/basic-introduction/2.three_elements_of_data_structure.md'
    }, {
      text: '1.3 算法和算法评价',
-      link: '/ds/basic_introduction/3.algorithm_and_algorithm_evaluation.md'
+      link: '/ds/basic-introduction/3.algorithm_and_algorithm_evaluation.md'
    }],
  },
  {
    text: '线性表',
    collapsible: true,
-    link: "/ds/linear_table",
+    link: "/ds/linear-table",
    children: [{
      text: '2.1 基础概念和操作',
-      link: '/ds/linear_table/1.basic_concept_and_operation.md'
+      link: '/ds/linear-table/1.basic_concept_and_operation.md'
    }, {
      text: '2.2 线性表的顺序表示',
-      link: '/ds/linear_table/2.sequential_representation.md'
+      link: '/ds/linear-table/2.sequential_representation.md'
    }, {
      text: '2.3 基础概念和操作',
-      link: '/ds/linear_table/3.chain_representation.md'
+      link: '/ds/linear-table/3.chain_representation.md'
    }, {
      text: '2.4 基础概念和操作',
-      link: '/ds/linear_table/4.double_linked_list.md'
+      link: '/ds/linear-table/4.double_linked_list.md'
    }, {
      text: '2.5 基础概念和操作',
-      link: '/ds/linear_table/5.circular_list.md'
+      link: '/ds/linear-table/5.circular_list.md'
    }, {
      text: '2.6 基础概念和操作',
-      link: '/ds/linear_table/6.static_linked_list.md'
+      link: '/ds/linear-table/6.static_linked_list.md'
    }, {
      text: '2.7 基础概念和操作',
-      link: '/ds/linear_table/7.comparison_of_sequential_list_and_linked_list.md'
+      link: '/ds/linear-table/7.comparison_of_sequential_list_and_linked_list.md'
    }, {
      text: '2.8 存储结构的选取',
-      link: '/ds/linear_table/8.selection_of_storage_structure.md'
+      link: '/ds/linear-table/8.selection_of_storage_structure.md'
    }, {
      text: '2.9 零碎知识补充',
-      link: '/ds/linear_table/9.piecemeal_knowledge_supplement.md'
+      link: '/ds/linear-table/9.piecemeal_knowledge_supplement.md'
    }],
-  }, {
+  },
+  {
    text: "栈和队列",
    link: "/ds/栈和队列/",
    collapsible: true,
@@ -76,4 +77,4 @@ module.exports = [
      link: '/ds/栈和队列/8.特殊矩阵的压缩存储.md'
    }]
  }
-]
+  ]
--- a/docs/.vuepress/config/sidebar/index.js
+++ b/docs/.vuepress/config/sidebar/index.js
@@ -1,8 +1,7 @@
-module.exports = {
-  // "/category/": require("../../category/sidebar_contents"),
-  // "/DataStructure/": require("../../category/sidebar_contents"),
-  "/ds": require("./ds_content.js"),
-  "/ds/coding": require("./algorithm_content")
-
+import dsSidebar from "./ds.sidebar";
+import algorithmSidebar from "./algorithm.sidebar";

+export default{
+  "/ds": dsSidebar,
+  "/ds/coding": algorithmSidebar
 };
--- a/docs/.vuepress/config/sidebar/os.sidebar.js
+++ b/docs/.vuepress/config/sidebar/os.sidebar.js
@@ -0,0 +1,2 @@
+
+export default[]
--- a/docs/.vuepress/config/theme.config.js
+++ b/docs/.vuepress/config/theme.config.js
@@ -0,0 +1,80 @@
+import {hopeTheme} from "vuepress-theme-hope";
+import navbar from "./navbar";
+import sidebar from "./sidebar";
+import {FOOTER_HTML_INFO} from "./constant";
+
+/**
+ * hope主题配置
+ * 参考：https://theme-hope.vuejs.press/zh/config/
+ */
+export default hopeTheme({
+  darkmode:"toggle",
+  // 支持全屏
+  // fullscreen: true,
+  // 纯净模式
+  // pure: true,
+  hostname:'https://408.142vip.cn',
+  author:{
+    name:'ChuFan',
+    email:'fairy_408@2925.com',
+    url:'https://www.142vip.cn'
+  },
+  favicon:"/408_favicon.ico",
+  logo: "/assets/408_logo.png",
+  navbar: navbar,
+  // 导航栏布局
+  navbarLayout:{
+    start: ["Brand"],
+    center: ["Links"],
+    end: ["Language","Search","Repo", "Outlook", ]
+  },
+  sidebar: sidebar,
+  // sidebar: "heading",
+
+  // 主题布局选项
+  repo: "https://github.com/mmdapl/408CSFamily",
+  logoDark:"/assets/408_logo.png",
+
+  // 博客配置
+  blog:{
+    name:'测试',
+    avatar:'',
+    description:'',
+    intro:'',
+    roundAvatar:true,
+    timeline:"时间轴的顶部文字",
+    articleInfo:"",
+    medias:{
+      "BiliBili": "https://space.bilibili.com/350937042?spm_id_from=333.1007.0.0"
+    }
+  },
+
+  // 设置页脚
+  displayFooter:true,
+  footer:FOOTER_HTML_INFO,
+  copyright:false,
+
+  // 主题色选择器
+  themeColor: {
+    blue: "#2196f3",
+    red: "#f26d6d",
+    green: "#3eaf7c",
+    orange: "#fb9b5f",
+  },
+
+  plugins: {
+    copyright:false,
+    // 开启博客功能
+    blog:true,
+    // 代码块
+    mdEnhance: {
+      codetabs: true,
+    },
+    copyCode: {
+      showInMobile:true
+    },
+    feed: {
+      json: true,
+    },
+  },
+})
--- a/docs/.vuepress/styles/config.scss
+++ b/docs/.vuepress/styles/config.scss
@@ -0,0 +1,7 @@
+// 参考：https://theme-hope.vuejs.press/zh/guide/interface/code-theme.htm
+
+// 浅色主题
+$code-light-them:"vs";
+
+// 深色主题
+$code-dark-theme:"atom-dark";
--- a/docs/.vuepress/styles/palette.less
+++ b/docs/.vuepress/styles/palette.less
--- a/docs/.vuepress/styles/palette.scss
+++ b/docs/.vuepress/styles/palette.scss
@@ -0,0 +1,2 @@
+// 主题色
+$theme-color: #2196f3;
--- a/docs/.vuepress/theme/index.js
+++ b/docs/.vuepress/theme/index.js
@@ -1,17 +0,0 @@
-/*
- * @Description: 
- * @Version: Beta1.0
- * @Author: 【B站&公众号】Rong姐姐好可爱
- * @Date: 2022-04-24 08:37:12
- * @LastEditors: 【B站&公众号】Rong姐姐好可爱
- * @LastEditTime: 2022-04-24 08:37:13
- */
-const { path } = require('@vuepress/utils')
-
-module.exports = {
-  name: 'vuepress-theme-local',
-  extends: '@vuepress/theme-default',
-  layouts: {
-    Layout: path.resolve(__dirname, 'layouts/Layout.vue'),
-  },
-}
--- a/docs/.vuepress/theme/layouts/Layout.vue
+++ b/docs/.vuepress/theme/layouts/Layout.vue
@@ -1,35 +0,0 @@
-<!--
- * @Description: 
- * @Version: Beta1.0
- * @Author: 【B站&公众号】Rong姐姐好可爱
- * @Date: 2022-04-24 08:37:48
- * @LastEditors: 【B站&公众号】Rong姐姐好可爱
- * @LastEditTime: 2022-04-24 08:47:23
-->
-<script setup>
-import ParentLayout from '@vuepress/theme-default/lib/client/layouts/Layout.vue'</script>
-
-<template>
-  <ParentLayout>
-    <template #page-bottom>
-      <div class="my-footer">自定义页脚</div>
-
-    </template>
-
-    <template #navbar-before>
-      <div class="my-footer">搜索框</div>
-
-    </template>
-
-    <template #sidebar-top>
-      <div class="sidebar-top">广告区域</div>
-
-    </template>
-  </ParentLayout>
-</template>
-
-<style lang="css">
-.my-footer {
-  text-align: center;
-}
-</style>
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,17 +1,13 @@
 ---
 home: true
-heroImage: https://static01.imgkr.com/temp/f0108d7c178b4ce196e43ebec14fbf23.png
-heroImageDark: http://vuejs.org/images/logo.png
 heroText: 计算机应试全家桶
-externalLinkIcon: false 
-tagline: 磨刀不误砍柴工、读完硕士再打工，笔记内容持续更新...
-
+tagline: 磨刀不误砍柴工、读完硕士再打工...
 actions:
  - text: 快速开始→
    link: /guide/
    type: primary
  - text: 工作机会
-    link: /gangg
+    link: /work/
    type: secondary
 features:
  - title: 基础概览
@@ -70,12 +66,10 @@ footerWrap:
    - title: 哔哩哔哩
      link: https://space.bilibili.com/350937042
      details: 不定期更新
-#  <a href="https://tongji.baidu.com/web/welcome/login" target="_blank">百度统计</a>
-footer:    Copyrights © 2015-2021 妍荣姑娘网络工作室 | <a href="https://github.com/mmdapl" target="_blank">Chu·Fan</a> 
+  

 ---

-
 ---

 ### 本地浏览【推荐】
@@ -90,7 +84,7 @@ footer:    Copyrights © 2015-2021 妍荣姑娘网络工作室 | <a href="https:
 git clone https://github.com/mmdapl/408CSFamily.git

 ## 进入408CSFamily文件夹中
-cd 408CSFamily/
+cd 408CSFamily

 ## tips: 如果本地已经clone过仓库，建议执行pull指令，获取最新
 git pull
@@ -99,6 +93,7 @@ git pull
 pnpm install

 ## 执行dev指令，本地启动项目，打开http://localhost:4200即可访问文档
+
 pnpm dev

 ```
@@ -110,7 +105,7 @@ pnpm dev
 git clone https://github.com/mmdapl/408CSFamily.git

 ## 进入408CSFamily文件夹中
-cd 408CSFamily/
+cd 408CSFamily

 ## tips: 如果本地已经clone过仓库，建议执行pull指令，获取最新
 git pull
@@ -156,8 +151,6 @@ yarn run dev
 ### 提交记录


-
-
 ---


--- a/docs/big-event-history.md
+++ b/docs/big-event-history.md
@@ -1,11 +1,3 @@
-<!--
- * @Description: 
- * @Version: Beta1.0
- * @Author: 【B站&公众号】Rong姐姐好可爱
- * @Date: 2022-04-21 23:43:19
- * @LastEditors: 【B站&公众号】Rong姐姐好可爱
- * @LastEditTime: 2022-04-23 18:18:09
-->

 ## 网站大事记

--- a/docs/ccp/sidebar_content.js
+++ b/docs/ccp/sidebar_content.js
@@ -1,10 +0,0 @@
-/*
- * @Description: 计算机组成原理 导航栏
- * @Version: Beta1.0
- * @Author: 【B站&公众号】Rong姐姐好可爱
- * @Date: 2022-04-21 23:19:09
- * @LastEditors: 【B站&公众号】Rong姐姐好可爱
- * @LastEditTime: 2022-04-21 23:19:10
- */
-module.exports=[
-]
--- a/docs/cn/Readme.md
+++ b/docs/cn/Readme.md
@@ -1,12 +1,5 @@

-<!--
- * @Description: 
- * @Version: Beta1.0
- * @Author: 【B站&公众号】Rong姐姐好可爱
- * @Date: 2021-03-08 10:10:27
- * @LastEditors: 【B站&公众号】Rong姐姐好可爱
- * @LastEditTime: 2022-04-21 23:33:59
-->

 ## 计算机网络
+
 doing
--- a/docs/ds/README11.md
+++ b/docs/ds/README11.md
--- a/docs/ds/basic-introduction/1.basic_concepts.md
+++ b/docs/ds/basic-introduction/1.basic_concepts.md
--- a/docs/ds/basic-introduction/2.three_elements_of_data_structure.md
+++ b/docs/ds/basic-introduction/2.three_elements_of_data_structure.md
--- a/docs/ds/basic-introduction/3.algorithm_and_algorithm_evaluation.md
+++ b/docs/ds/basic-introduction/3.algorithm_and_algorithm_evaluation.md
--- a/docs/ds/basic-introduction/Readme.md
+++ b/docs/ds/basic-introduction/Readme.md
--- a/docs/ds/basic-introduction/basic_introduction.png
+++ b/docs/ds/basic-introduction/basic_introduction.png
--- a/docs/ds/basic-introduction/basic_introduction.xmind
+++ b/docs/ds/basic-introduction/basic_introduction.xmind
--- a/docs/ds/linear-table/1.basic_concept_and_operation.md
+++ b/docs/ds/linear-table/1.basic_concept_and_operation.md
--- a/docs/ds/linear-table/2.sequential_representation.md
+++ b/docs/ds/linear-table/2.sequential_representation.md
--- a/docs/ds/linear-table/3.chain_representation.md
+++ b/docs/ds/linear-table/3.chain_representation.md
--- a/docs/ds/linear-table/4.double_linked_list.md
+++ b/docs/ds/linear-table/4.double_linked_list.md
--- a/docs/ds/linear-table/5.circular_list.md
+++ b/docs/ds/linear-table/5.circular_list.md
--- a/docs/ds/linear-table/6.static_linked_list.md
+++ b/docs/ds/linear-table/6.static_linked_list.md
--- a/docs/ds/linear-table/7.comparison_of_sequential_list_and_linked_list.md
+++ b/docs/ds/linear-table/7.comparison_of_sequential_list_and_linked_list.md
--- a/docs/ds/linear-table/8.selection_of_storage_structure.md
+++ b/docs/ds/linear-table/8.selection_of_storage_structure.md
--- a/docs/ds/linear-table/9.piecemeal_knowledge_supplement.md
+++ b/docs/ds/linear-table/9.piecemeal_knowledge_supplement.md
--- a/docs/ds/linear-table/Readme.md
+++ b/docs/ds/linear-table/Readme.md
--- a/docs/ds/linear-table/线性表_水印.png
+++ b/docs/ds/linear-table/线性表_水印.png
--- a/docs/note-map/CN_Map.md
+++ b/docs/note-map/CN_Map.md
@@ -1,10 +0,0 @@
-<!--
- * @Description: 计算机网络思维导图
- * @Version: Beta1.0
- * @Author: 【B站&公众号】Rong姐姐好可爱
- * @Date: 2022-04-21 23:21:16
- * @LastEditors: 【B站&公众号】Rong姐姐好可爱
- * @LastEditTime: 2022-04-21 23:21:17
-->
-
-## 计算机网络思维导图
--- a/docs/note-map/DS_Map.md
+++ b/docs/note-map/DS_Map.md
@@ -1,10 +0,0 @@
-<!--
- * @Description: 数据结构思维导图
- * @Version: Beta1.0
- * @Author: 【B站&公众号】Rong姐姐好可爱
- * @Date: 2022-04-21 23:21:49
- * @LastEditors: 【B站&公众号】Rong姐姐好可爱
- * @LastEditTime: 2022-04-21 23:21:49
-->
-
-## 数据结构思维导图
--- a/docs/note-map/cn-map.md
+++ b/docs/note-map/cn-map.md
@@ -0,0 +1,2 @@
+
+## 计算机网络思维导图
--- a/docs/note-map/ds-map.md
+++ b/docs/note-map/ds-map.md
@@ -0,0 +1 @@
+## 数据结构思维导图
--- a/docs/os/Readme.md
+++ b/docs/os/Readme.md
@@ -1,15 +1,6 @@
 ---
-title: Readme
+title: 操作系统
 ---
-<!--
- * @Description: 
- * @Version: Beta1.0
- * @Author: 【B站&公众号】Rong姐姐好可爱
- * @Date: 2021-03-08 10:10:52
- * @LastEditors: 【B站&公众号】Rong姐姐好可爱
- * @LastEditTime: 2022-04-21 23:13:11
-->
-

 ## 操作系统
 doing
--- a/package.json
+++ b/package.json
@@ -1,25 +1,28 @@
 {
  "name": "408CSFamily",
  "description": "专业代号408 ，计算机基础知识点合集",
+  "version": "0.0.0",
  "main": "index.js",
  "scripts": {
    "dev": "vuepress dev docs",
    "build": "vuepress build docs",
-    "build-image": "bash scripts/build_image.sh $npm_package_version",
+    "image": "bash scripts/build_image.sh $npm_package_version",
+    "faster-image": "bash scripts/build_image.sh $npm_package_version faster",
    "ali": "bash scripts/deploy.sh ali $npm_package_version",
    "github": "bash scripts/page_deploy.sh",
    "clean": "find . -name \"node_modules\" -type d -exec rm -rf '{}' +"
  },
-  "author":{
+  "author": {
    "name": "Chu Fan",
    "email": "fairy_408@2925.com",
    "url": "https://github.com/142vip"
  },
  "devDependencies": {
    "@vuepress/client": "2.0.0-beta.60",
-    "vue": "^3.2.45",
+    "vue": "^3.2.47",
    "vuepress": "2.0.0-beta.60",
-    "vuepress-theme-hope": "^2.0.0-beta.171"
+    "vuepress-plugin-search-pro": "^2.0.0-beta.172",
+    "vuepress-theme-hope": "^2.0.0-beta.172"
  },
  "license": "MIT"
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/scripts/build_image.sh
+++ b/scripts/build_image.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 ## 功能：本地前后端项目构建、打包镜像，上传docker仓库
 ## 参考：https://blog.csdn.net/Dontla/article/details/125210694
+## 使用示例：bash xxx.sh  版本号 faster[可选]
+##    -  bash build_image.sh  0.0.1 faster
 ## 作者：储凡
-## 使用示例：bash xxx.sh  版本号
-##    -  bash build_image.sh  0.0.1
 ##

-
 ## 日志颜色定义
 readonly successLogger="\033[36m"
 readonly errorLogger="\033[1;31m"
@@ -16,9 +15,13 @@ readonly currentTime=$(date "+%Y-%m-%d %H:%M:%S")
 ## 项目名称
 readonly projectName="408CSFamily"
 ## 仓库地址
-readonly repoAddress="registry.cn-hangzhou.aliyuncs.com/142vip/doc_book:"
+readonly repoAddress="registry.cn-hangzhou.aliyuncs.com/142vip/doc_book"
 ## 版本号
 version=${1}
+## 是否先本地构建，执行npm run build操作
+isFaster=${2}
+## 镜像名称
+imageTagName=${repoAddress}:${projectName}-${version}


 prepare_check(){
@@ -30,7 +33,15 @@ prepare_check(){

 run(){
  echo -e "${successLogger}---------------- shell ${projectName} start ---------------- "
-    docker build  -t  "${repoAddress}${projectName}-${version}" .
+
+  if [ "${isFaster}" == "faster" ];then
+    ## 本地构建、快速制作镜像
+    npm run build && docker build -f Faster.Dockerfile --build-arg APP_VERSION="${version}" -t "${imageTagName}"  .
+  else
+    ## ci流程构建
+    docker build -f Dockerfile --build-arg APP_VERSION="${version}" -t "${imageTagName}"  .
+  fi
+
  echo -e "${successLogger}---------------- shell ${projectName} end   ---------------- "
  push_docker_image
 }
@@ -40,14 +51,14 @@ run(){

 ## 推送镜像
 push_docker_image(){
-    if [[ "$(docker images -q  "${repoAddress}${projectName}-${version}" 2> /dev/null)" != "" ]];
+    if [[ "$(docker images -q  "${imageTagName}" 2> /dev/null)" != "" ]];
      then
        ## 推送
-        docker push "${repoAddress}${projectName}-${version}"
+        docker push "${imageTagName}"
        echo -e "${successLogger}---------------- 上传镜像成功，删除本地镜像 ---------------- "
-        docker rmi "${repoAddress}${projectName}-${version}"
+        docker rmi "${imageTagName}"
    else
-        echo -e "${errorLogger}${currentTime}：镜像：${repoAddress}${projectName}-${version}不存在"
+        echo -e "${errorLogger}${currentTime}：[镜像] ${imageTagName}不存在"
    fi
  exit 0
 }
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -72,7 +72,7 @@ run(){
      ## 删除容器
      delete_container  "${containerName}"
      ## 删除镜像
-      delete_image "${repoAddress}:${containerName}_${version}"
+      delete_image "${repoAddress}:${containerName}-${version}"
      ## 部署
      deploy_to_ali
      exit 0;