Merge remote-tracking branch 'origin/main'
# Conflicts: # .idea/workspace.xml # docs/index.html
This commit is contained in:
commit
8c1d372877
|
@ -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>
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="JpaBuddyIdeaProjectConfig">
|
||||||
|
<option name="renamerInitialized" value="true" />
|
||||||
|
</component>
|
||||||
|
</project>
|
|
@ -3,4 +3,7 @@
|
||||||
<component name="ProjectRootManager">
|
<component name="ProjectRootManager">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
|
<component name="ProjectType">
|
||||||
|
<option name="id" value="jpab" />
|
||||||
|
</component>
|
||||||
</project>
|
</project>
|
|
@ -4,7 +4,7 @@
|
||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<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$/.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" />
|
<change beforePath="$PROJECT_DIR$/docs/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/index.html" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
|
@ -22,30 +22,30 @@
|
||||||
<component name="MarkdownSettingsMigration">
|
<component name="MarkdownSettingsMigration">
|
||||||
<option name="stateVersion" value="1" />
|
<option name="stateVersion" value="1" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectColorInfo"><![CDATA[{
|
<component name="ProjectColorInfo">{
|
||||||
"associatedIndex": 1
|
"associatedIndex": 1
|
||||||
}]]></component>
|
}</component>
|
||||||
<component name="ProjectId" id="2eCYZXFkbinR1HjObBpI4QTzny3" />
|
<component name="ProjectId" id="2eCYZXFkbinR1HjObBpI4QTzny3" />
|
||||||
<component name="ProjectViewState">
|
<component name="ProjectViewState">
|
||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent"><![CDATA[{
|
<component name="PropertiesComponent">{
|
||||||
"keyToString": {
|
"keyToString": {
|
||||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
"git-widget-placeholder": "main",
|
"git-widget-placeholder": "main",
|
||||||
"ignore.virus.scanning.warn.message": "true",
|
"ignore.virus.scanning.warn.message": "true",
|
||||||
"kotlin-language-version-configured": "true",
|
"kotlin-language-version-configured": "true",
|
||||||
"last_opened_file_path": "C:/WorkDir/Repository/iSharkfly-Docs/docsify-docs-cn/docs",
|
"last_opened_file_path": "C:/WorkDir/Repository/iSharkfly-Docs/docsify-docs-cn/docs",
|
||||||
"node.js.detected.package.eslint": "true",
|
"node.js.detected.package.eslint": "true",
|
||||||
"node.js.detected.package.tslint": "true",
|
"node.js.detected.package.tslint": "true",
|
||||||
"node.js.selected.package.eslint": "(autodetect)",
|
"node.js.selected.package.eslint": "(autodetect)",
|
||||||
"node.js.selected.package.tslint": "(autodetect)",
|
"node.js.selected.package.tslint": "(autodetect)",
|
||||||
"nodejs_package_manager_path": "npm",
|
"nodejs_package_manager_path": "npm",
|
||||||
"vue.rearranger.settings.migration": "true"
|
"vue.rearranger.settings.migration": "true"
|
||||||
}
|
}
|
||||||
}]]></component>
|
}</component>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
<key name="CopyFile.RECENT_KEYS">
|
||||||
<recent name="C:\WorkDir\Repository\iSharkfly-Docs\docsify-docs-cn\docs" />
|
<recent name="C:\WorkDir\Repository\iSharkfly-Docs\docsify-docs-cn\docs" />
|
||||||
|
@ -59,7 +59,8 @@
|
||||||
<option name="number" value="Default" />
|
<option name="number" value="Default" />
|
||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1706942673858</updated>
|
<updated>1706942673858</updated>
|
||||||
<workItem from="1711410086527" duration="8102000" />
|
<workItem from="1711410086527" duration="3852000" />
|
||||||
|
<workItem from="1711477746841" duration="3330000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="Docs init">
|
<task id="LOCAL-00001" summary="Docs init">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
|
@ -93,26 +94,56 @@
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1711413264699</updated>
|
<updated>1711413264699</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00005" summary="更新 MD 文件链接">
|
<task id="LOCAL-00005" summary="更新 CROS 可能出现问题的连接">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1711414937667</created>
|
<created>1711478854257</created>
|
||||||
<option name="number" value="00005" />
|
<option name="number" value="00005" />
|
||||||
<option name="presentableId" value="LOCAL-00005" />
|
<option name="presentableId" value="LOCAL-00005" />
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1711414937667</updated>
|
<updated>1711478854257</updated>
|
||||||
</task>
|
</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 />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
<option name="version" value="3" />
|
<option name="version" value="3" />
|
||||||
</component>
|
</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">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="Docs init" />
|
<MESSAGE value="Docs init" />
|
||||||
<MESSAGE value="添加 CNAME" />
|
<MESSAGE value="添加 CNAME" />
|
||||||
<MESSAGE value="测试中文翻译" />
|
<MESSAGE value="测试中文翻译" />
|
||||||
<MESSAGE value="更新文档连接" />
|
<MESSAGE value="更新文档连接" />
|
||||||
<MESSAGE value="更新 MD 文件链接" />
|
<MESSAGE value="域名配置到" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="更新 MD 文件链接" />
|
<MESSAGE value="更新 CROS 可能出现问题的连接" />
|
||||||
|
<MESSAGE value="更新链接" />
|
||||||
|
<MESSAGE value="修正软件跟踪的代码" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="修正软件跟踪的代码" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
|
@ -0,0 +1,6 @@
|
||||||
|
FROM node:latest
|
||||||
|
EXPOSE 3000
|
||||||
|
WORKDIR /docs
|
||||||
|
COPY docs/ .
|
||||||
|
RUN npm install -g docsify-cli@latest
|
||||||
|
ENTRYPOINT docsify serve .
|
|
@ -0,0 +1,12 @@
|
||||||
|
version: "3.7"
|
||||||
|
|
||||||
|
services:
|
||||||
|
doc:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
volumes:
|
||||||
|
- ${PWD}/src:/home/node
|
||||||
|
ports:
|
||||||
|
- 3000:3000
|
||||||
|
command: docsify serve .
|
129
docs/index.html
129
docs/index.html
|
@ -1,46 +1,35 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8"/>
|
||||||
<title>docsify</title>
|
<title>docsify</title>
|
||||||
<link rel="icon" href="_media/favicon.ico" />
|
<link rel="icon" href="_media/favicon.ico"/>
|
||||||
<meta
|
<meta name="google-site-verification" content="6t0LoIeFksrjF4c9sqUEsVXiQNxLp2hgoqo0KryT-sE"/>
|
||||||
name="google-site-verification"
|
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
|
||||||
content="6t0LoIeFksrjF4c9sqUEsVXiQNxLp2hgoqo0KryT-sE"
|
<meta name="keywords" content="doc,docs,documentation,gitbook,creator,generator,github,jekyll,github-pages"/>
|
||||||
/>
|
<meta name="description" content="A magical documentation generator."/>
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0"/>
|
||||||
<meta
|
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css" title="vue"/>
|
||||||
name="keywords"
|
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/dark.css" title="dark" disabled/>
|
||||||
content="doc,docs,documentation,gitbook,creator,generator,github,jekyll,github-pages"
|
<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/>
|
||||||
<meta name="description" content="A magical documentation generator." />
|
|
||||||
<meta
|
<!-- Google Tag Manager -->
|
||||||
name="viewport"
|
<script>(function (w, d, s, l, i) {
|
||||||
content="width=device-width, initial-scale=1.0, minimum-scale=1.0"
|
w[l] = w[l] || [];
|
||||||
/>
|
w[l].push({
|
||||||
<link
|
'gtm.start':
|
||||||
rel="stylesheet"
|
new Date().getTime(), event: 'gtm.js'
|
||||||
href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css"
|
});
|
||||||
title="vue"
|
var f = d.getElementsByTagName(s)[0],
|
||||||
/>
|
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
|
||||||
<link
|
j.async = true;
|
||||||
rel="stylesheet"
|
j.src =
|
||||||
href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/dark.css"
|
'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
|
||||||
title="dark"
|
f.parentNode.insertBefore(j, f);
|
||||||
disabled
|
})(window, document, 'script', 'dataLayer', 'GTM-W3NL9V');</script>
|
||||||
/>
|
<!-- End Google Tag Manager -->
|
||||||
<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
|
|
||||||
/>
|
|
||||||
<style>
|
<style>
|
||||||
nav.app-nav li ul {
|
nav.app-nav li ul {
|
||||||
min-width: 100px;
|
min-width: 100px;
|
||||||
|
@ -51,12 +40,12 @@
|
||||||
width: auto !important;
|
width: auto !important;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div id="app">Loading ...</div>
|
<div id="app">Loading ...</div>
|
||||||
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1"></script>
|
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1"></script>
|
||||||
<script>
|
<script>
|
||||||
// Set html "lang" attribute based on URL
|
// Set html "lang" attribute based on URL
|
||||||
var lang = location.hash.match(/#\/(de-de|es|ru-ru|zh-cn)\//);
|
var lang = location.hash.match(/#\/(de-de|es|ru-ru|zh-cn)\//);
|
||||||
|
|
||||||
|
@ -89,11 +78,6 @@
|
||||||
mergeNavbar: true,
|
mergeNavbar: true,
|
||||||
maxLevel: 4,
|
maxLevel: 4,
|
||||||
subMaxLevel: 2,
|
subMaxLevel: 2,
|
||||||
ga: 'UA-106147152-1',
|
|
||||||
matomo: {
|
|
||||||
host: '//matomo.thunderwave.de',
|
|
||||||
id: 6,
|
|
||||||
},
|
|
||||||
name: 'docsify',
|
name: 'docsify',
|
||||||
nameLink: {
|
nameLink: {
|
||||||
'/es/': '#/es/',
|
'/es/': '#/es/',
|
||||||
|
@ -138,9 +122,9 @@
|
||||||
message: 'Hello, World!',
|
message: 'Hello, World!',
|
||||||
// Fake API response
|
// Fake API response
|
||||||
images: [
|
images: [
|
||||||
{ title: 'Image 1', url: 'https://picsum.photos/150?random=1' },
|
{title: 'Image 1', url: 'https://picsum.photos/150?random=1'},
|
||||||
{ title: 'Image 2', url: 'https://picsum.photos/150?random=2' },
|
{title: 'Image 2', url: 'https://picsum.photos/150?random=2'},
|
||||||
{ title: 'Image 3', url: 'https://picsum.photos/150?random=3' },
|
{title: 'Image 3', url: 'https://picsum.photos/150?random=3'},
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
@ -181,13 +165,8 @@
|
||||||
url = vm.route.file
|
url = vm.route.file
|
||||||
.replace('raw.githubusercontent.com', 'github.com')
|
.replace('raw.githubusercontent.com', 'github.com')
|
||||||
.replace(/\/master/, '/blob/master');
|
.replace(/\/master/, '/blob/master');
|
||||||
} else if (/jsdelivr\.net/.test(vm.route.file)) {
|
} else if (/src\.isharkfly\.com/.test(vm.route.file)) {
|
||||||
console.log(vm.route.file)
|
url = 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 {
|
} else {
|
||||||
url =
|
url =
|
||||||
'https://github.com/docsifyjs/docsify/blob/develop/docs/' +
|
'https://github.com/docsifyjs/docsify/blob/develop/docs/' +
|
||||||
|
@ -204,25 +183,19 @@
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></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/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-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-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-nginx.min.js"></script>
|
||||||
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-php.min.js"></script>
|
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-php.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
// Public site only
|
// Public site only
|
||||||
if (/docsify/.test(location.host)) {
|
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>
|
||||||
<script src="//cdn.jsdelivr.net/npm/vue@2/dist/vue.min.js"></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> -->
|
<!-- <script src="//cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script> -->
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
Loading…
Reference in New Issue