Merge remote-tracking branch 'origin/main'

# Conflicts: # .idea/workspace.xml # docs/index.html
2024-04-02 23:22:44 -04:00 · 2024-04-02 23:22:44 -04:00 · 8c1d372877
parent 4ad68dea7c 396bce4627
commit 8c1d372877
7 changed files with 262 additions and 215 deletions
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA" serialisationVersion="2">
+    <checkstyleVersion>10.14.0</checkstyleVersion>
+    <scanScope>JavaOnly</scanScope>
+    <copyLibs>true</copyLibs>
+    <option name="thirdPartyClasspath" />
+    <option name="activeLocationIds" />
+    <option name="locations">
+      <list>
+        <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
+        <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
+      </list>
+    </option>
+  </component>
+</project>
--- a/.idea/jpa-buddy.xml
+++ b/.idea/jpa-buddy.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaBuddyIdeaProjectConfig">
+    <option name="renamerInitialized" value="true" />
+  </component>
+</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -3,4 +3,7 @@
  <component name="ProjectRootManager">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
 </project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -4,7 +4,7 @@
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="bcab706c-5ba0-41f2-97c8-0b468ae56157" name="Changes" comment="更新 MD 文件链接">
+    <list default="true" id="bcab706c-5ba0-41f2-97c8-0b468ae56157" name="Changes" comment="修正软件跟踪的代码">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/docs/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/index.html" afterDir="false" />
    </list>
@ -22,30 +22,30 @@
  <component name="MarkdownSettingsMigration">
    <option name="stateVersion" value="1" />
  </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 1
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 1
+}</component>
  <component name="ProjectId" id="2eCYZXFkbinR1HjObBpI4QTzny3" />
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "main",
-    "ignore.virus.scanning.warn.message": "true",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "C:/WorkDir/Repository/iSharkfly-Docs/docsify-docs-cn/docs",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/WorkDir/Repository/iSharkfly-Docs/docsify-docs-cn/docs&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  }
-}]]></component>
+}</component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
      <recent name="C:\WorkDir\Repository\iSharkfly-Docs\docsify-docs-cn\docs" />
@ -59,7 +59,8 @@
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
      <updated>1706942673858</updated>
-      <workItem from="1711410086527" duration="8102000" />
+      <workItem from="1711410086527" duration="3852000" />
+      <workItem from="1711477746841" duration="3330000" />
    </task>
    <task id="LOCAL-00001" summary="Docs init">
      <option name="closed" value="true" />
@ -93,26 +94,56 @@
      <option name="project" value="LOCAL" />
      <updated>1711413264699</updated>
    </task>
-    <task id="LOCAL-00005" summary="更新 MD 文件链接">
+    <task id="LOCAL-00005" summary="更新 CROS 可能出现问题的连接">
      <option name="closed" value="true" />
-      <created>1711414937667</created>
+      <created>1711478854257</created>
      <option name="number" value="00005" />
      <option name="presentableId" value="LOCAL-00005" />
      <option name="project" value="LOCAL" />
-      <updated>1711414937667</updated>
+      <updated>1711478854257</updated>
    </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="更新链接">
+      <option name="closed" value="true" />
+      <created>1711479826377</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1711479826377</updated>
+    </task>
+    <task id="LOCAL-00007" summary="修正软件跟踪的代码">
+      <option name="closed" value="true" />
+      <created>1711481259876</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1711481259876</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
  <component name="VcsManagerConfiguration">
    <MESSAGE value="Docs init" />
    <MESSAGE value="添加 CNAME" />
    <MESSAGE value="测试中文翻译" />
    <MESSAGE value="更新文档连接" />
-    <MESSAGE value="更新 MD 文件链接" />
-    <option name="LAST_COMMIT_MESSAGE" value="更新 MD 文件链接" />
+    <MESSAGE value="域名配置到" />
+    <MESSAGE value="更新 CROS 可能出现问题的连接" />
+    <MESSAGE value="更新链接" />
+    <MESSAGE value="修正软件跟踪的代码" />
+    <option name="LAST_COMMIT_MESSAGE" value="修正软件跟踪的代码" />
  </component>
 </project>
--- a/6
+++ b/6
@ -0,0 +1,6 @@
+FROM node:latest
+EXPOSE 3000
+WORKDIR /docs
+COPY docs/ .
+RUN npm install -g docsify-cli@latest
+ENTRYPOINT docsify serve .
--- a/docs/docker-compose.yaml
+++ b/docs/docker-compose.yaml
@ -0,0 +1,12 @@
+version: "3.7"
+
+services:
+  doc:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ${PWD}/src:/home/node
+    ports:
+      - 3000:3000
+    command: docsify serve .
--- a/docs/index.html
+++ b/docs/index.html
@ -1,46 +1,35 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
+<head>
+    <meta charset="UTF-8"/>
    <title>docsify</title>
-    <link rel="icon" href="_media/favicon.ico" />
-    <meta
-      name="google-site-verification"
-      content="6t0LoIeFksrjF4c9sqUEsVXiQNxLp2hgoqo0KryT-sE"
-    />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta
-      name="keywords"
-      content="doc,docs,documentation,gitbook,creator,generator,github,jekyll,github-pages"
-    />
-    <meta name="description" content="A magical documentation generator." />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1.0, minimum-scale=1.0"
-    />
-    <link
-      rel="stylesheet"
-      href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css"
-      title="vue"
-    />
-    <link
-      rel="stylesheet"
-      href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/dark.css"
-      title="dark"
-      disabled
-    />
-    <link
-      rel="stylesheet"
-      href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/buble.css"
-      title="buble"
-      disabled
-    />
-    <link
-      rel="stylesheet"
-      href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/pure.css"
-      title="pure"
-      disabled
-    />
+    <link rel="icon" href="_media/favicon.ico"/>
+    <meta name="google-site-verification" content="6t0LoIeFksrjF4c9sqUEsVXiQNxLp2hgoqo0KryT-sE"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="keywords" content="doc,docs,documentation,gitbook,creator,generator,github,jekyll,github-pages"/>
+    <meta name="description" content="A magical documentation generator."/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0"/>
+    <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css" title="vue"/>
+    <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/dark.css" title="dark" disabled/>
+    <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/buble.css" title="buble" disabled/>
+    <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/pure.css" title="pure" disabled/>
+
+    <!-- Google Tag Manager -->
+    <script>(function (w, d, s, l, i) {
+        w[l] = w[l] || [];
+        w[l].push({
+            'gtm.start':
+                new Date().getTime(), event: 'gtm.js'
+        });
+        var f = d.getElementsByTagName(s)[0],
+            j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
+        j.async = true;
+        j.src =
+            'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+        f.parentNode.insertBefore(j, f);
+    })(window, document, 'script', 'dataLayer', 'GTM-W3NL9V');</script>
+    <!-- End Google Tag Manager -->
+
    <style>
        nav.app-nav li ul {
            min-width: 100px;
@ -51,12 +40,12 @@
            width: auto !important;
        }
    </style>
-  </head>
+</head>

-  <body>
-    <div id="app">Loading ...</div>
-    <script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1"></script>
-    <script>
+<body>
+<div id="app">Loading ...</div>
+<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1"></script>
+<script>
    // Set html "lang" attribute based on URL
    var lang = location.hash.match(/#\/(de-de|es|ru-ru|zh-cn)\//);

@ -89,11 +78,6 @@
        mergeNavbar: true,
        maxLevel: 4,
        subMaxLevel: 2,
-        ga: 'UA-106147152-1',
-        matomo: {
-          host: '//matomo.thunderwave.de',
-          id: 6,
-        },
        name: 'docsify',
        nameLink: {
            '/es/': '#/es/',
@ -138,9 +122,9 @@
                    message: 'Hello, World!',
                    // Fake API response
                    images: [
-                { title: 'Image 1', url: 'https://picsum.photos/150?random=1' },
-                { title: 'Image 2', url: 'https://picsum.photos/150?random=2' },
-                { title: 'Image 3', url: 'https://picsum.photos/150?random=3' },
+                        {title: 'Image 1', url: 'https://picsum.photos/150?random=1'},
+                        {title: 'Image 2', url: 'https://picsum.photos/150?random=2'},
+                        {title: 'Image 3', url: 'https://picsum.photos/150?random=3'},
                    ],
                };
            },
@ -181,13 +165,8 @@
                        url = vm.route.file
                            .replace('raw.githubusercontent.com', 'github.com')
                            .replace(/\/master/, '/blob/master');
-              } else if (/jsdelivr\.net/.test(vm.route.file)) {
-                console.log(vm.route.file)
-                url = vm.route.file
-                  .replace('cdn.jsdelivr.net/gh', 'github.com')
-                  .replace('@master', '/blob/master');
-                url ="https://src.isharkfly.com/iSharkFly-Docs/docsify-docs-cn/raw/branch/main/docs/custom-navbar.md"
-                console.log(url)
+                    } else if (/src\.isharkfly\.com/.test(vm.route.file)) {
+                        url = vm.route.file;
                    } else {
                        url =
                            'https://github.com/docsifyjs/docsify/blob/develop/docs/' +
@ -204,25 +183,19 @@
            },
        ],
    };
-    </script>
-    <script src="//cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/search.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-bash.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-markdown.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-php.min.js"></script>
-    <script>
+</script>
+<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/search.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-bash.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-markdown.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-php.min.js"></script>
+<script>
    // Public site only
    if (/docsify/.test(location.host)) {
-        document.write(
-          '<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/ga.min.js"><\/script>'
-        );
-        document.write(
-          '<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/matomo.min.js"><\/script>'
-        );
    }
-    </script>
-    <script src="//cdn.jsdelivr.net/npm/vue@2/dist/vue.min.js"></script>
-    <!-- <script src="//cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script> -->
-  </body>
+</script>
+<script src="//cdn.jsdelivr.net/npm/vue@2/dist/vue.min.js"></script>
+<!-- <script src="//cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script> -->
+</body>
 </html>