diff --git a/.codechina-ci.yml b/.codechina-ci.yml index 23daa4e3e5c10cd87be7872aded964332281267d..5a6173b33df50f1f70881d9291ecf7cd731f263e 100644 --- a/.codechina-ci.yml +++ b/.codechina-ci.yml @@ -15,4 +15,4 @@ pages: - public expire_in: 1 day only: - - master \ No newline at end of file + - pages \ No newline at end of file diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index c604da74a41adb06eb0c7574a3b6fc978d93a4ce..d2192be85b7fc814bc91e28e6297e5615abc5970 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -90,14 +90,6 @@ module.exports = { logo: '/images/icons/spring-logo.svg', sidebarDepth: 3, activeHeaderLinks: true, - // nav: [{ - // text: '语言', - // ariaLabel: 'Language', - // items: [ - // { text: '中文文档', link: '/' }, - // { text: '英文原文', link: '/en/' } - // ] - // }], locales: { '/en/': { // 多语言下拉菜单的标题 @@ -109,62 +101,133 @@ module.exports = { // 编辑链接文字 editLinkText: 'Edit this page on GitCode', algolia: {}, - // nav: [ - // { text: 'English', link: '/en/' } - // ], - sidebar: [{ - title: 'Spring Docs', // 必要的 - // path: '/', // 可选的, 标题的跳转链接,应为绝对路径且必须存在 - collapsable: false, // 可选的, 默认值是 true, - sidebarDepth: 1, // 可选的, 默认值是 1 - children: [ - '/en/' - ] + nav: [ + { + text: 'Spring', + link: '/en/' }, { - title: 'INTRO', - sidebarDepth: 2, - collapsable: false, - children: [ - "/en/why-spring.md", - "/en/introducing-spring-boot.md", - "/en/quickstart.md" - ], - initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + text: 'Spring Boot', + link: '/en/spring-boot/' }, { - title: 'GUIDE', - sidebarDepth: 2, - collapsable: false, - children: [ - "/en/system-requirements.md", - "/en/installing.md", - "/en/initializr.md" - ], - initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + text: 'Spring Framework', + link: '/en/spring-framework/' }, { - title: 'IDE', - sidebarDepth: 2, - collapsable: false, - children: [ - "/en/vscode_java.md", - "/en/intellij_idea.md" - ], - initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + text: 'Spring Data', + link: '/en/spring-data/' }, { - title: 'DEMO', - sidebarDepth: 2, - collapsable: false, - children: [ - "/en/getting-started_first-application.md", - "/en/rest-service.md", - "/en/consuming-rest.md" - ], - initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + text: 'Spring Cloud', + link: '/en/spring-cloud/' + }, + { + text: 'More', + ariaLabel: 'Others', + items: [ + { text: 'Spring Cloud Data Flow', link: '/en/spring-cloud-data-flow/'}, + { text: 'Spring Security', link: '/en/spring-security/'}, + { text: 'Spring for GraphQL', link: '/en/spring-for-graphql/'}, + { text: 'Spring Session', link: '/en/spring-session/'}, + { text: 'Spring Integration', link: '/en/spring-integration/'}, + { text: 'Spring HATEOAS', link: '/en/spring-hateoas/'}, + { text: 'Spring REST Docs', link: '/en/spring-rest-docs/'}, + { text: 'Spring Batch', link: '/en/spring-batch/'}, + { text: 'Spring AMQP', link: '/en/spring-amqp/'}, + { text: 'Spring CredHub', link: '/en/spring-credhub/'}, + { text: 'Spring Flo', link: '/en/spring-flo/'}, + { text: 'Spring for Apache Kafka', link: '/en/spring-for-apache-kafka/'}, + { text: 'Spring LDAP', link: '/en/spring-ldap/'}, + { text: 'Spring Shell', link: '/en/spring-shell/'}, + { text: 'Spring Statemachine', link: '/en/spring-statemachine/'}, + { text: 'Spring Vault', link: '/en/spring-vault/'}, + { text: 'Spring Web Flow', link: '/en/spring-web-flow/'}, + { text: 'Spring Web Services', link: '/en/spring-web-services/'} + ] } - ] + ], + sidebar: { + '/en/spring-boot/': [ + { + title: 'Spring Boot', + sidebarDepth: 2, + collapsable: false, + children: [ + "/en/spring-boot/legal.md", + "/en/spring-boot/getting-help.md", + "/en/spring-boot/documentation-overview.md", + "/en/spring-boot/getting-started.md", + "/en/spring-boot/upgrading-spring-boot-applications.md", + "/en/spring-boot/documentation-overview.md", + "/en/spring-boot/documentation-overview.md", + "/en/spring-boot/documentation-overview.md", + "/en/spring-boot/documentation-overview.md", + "/en/spring-boot/documentation-overview.md", + "/en/spring-boot/documentation-overview.md", + "/en/spring-boot/documentation-overview.md", + "/en/spring-boot/documentation-overview.md", + "/en/spring-boot/documentation-overview.md", + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + } + ], + // fallback + '/en/': + [{ + title: 'Spring Doc', // 必要的 + // path: '/', // 可选的, 标题的跳转链接,应为绝对路径且必须存在 + collapsable: false, // 可选的, 默认值是 true, + sidebarDepth: 1, // 可选的, 默认值是 1 + children: [ + '' + ] + }, + { + title: 'INTRO', + sidebarDepth: 2, + collapsable: false, + children: [ + "/en/why-spring.md", + "/en/introducing-spring-boot.md", + "/en/quickstart.md" + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + }, + { + title: 'GUIDE', + sidebarDepth: 2, + collapsable: false, + children: [ + "/en/system-requirements.md", + "/en/installing.md", + "/en/initializr.md" + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + }, + { + title: 'IDE', + sidebarDepth: 2, + collapsable: false, + children: [ + "/en/vscode_java.md", + "/en/intellij_idea.md" + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + }, + { + title: 'DEMO', + sidebarDepth: 2, + collapsable: false, + children: [ + "/en/getting-started_first-application.md", + "/en/rest-service.md", + "/en/consuming-rest.md" + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + } + ] + } }, '/': { selectText: '选择语言', @@ -174,62 +237,125 @@ module.exports = { editLinkText: '在 GitCode 上编辑此页', lastUpdated: '上次更新', algolia: {}, - // nav: [ - // { text: '中文文档', link: '/', ariaLabel: '中文文档' } - // ], - sidebar: [{ - title: 'Spring 文档', // 必要的 - // path: '/', // 可选的, 标题的跳转链接,应为绝对路径且必须存在 - collapsable: false, // 可选的, 默认值是 true, - sidebarDepth: 1, // 可选的, 默认值是 1 - children: [ - '/' - ] + nav: [ + { + text: 'Spring', + link: '/' }, { - title: '介绍', - sidebarDepth: 2, - collapsable: false, - children: [ - "why-spring.md", - "introducing-spring-boot.md", - "quickstart.md" - ], - initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + text: 'Spring Boot', + link: '/spring-boot/' }, { - title: '教程', - sidebarDepth: 2, - collapsable: false, - children: [ - "system-requirements.md", - "installing.md", - "initializr.md" - ], - initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + text: 'Spring Framework', + link: '/spring-framework/' }, { - title: '编辑器', - sidebarDepth: 2, - collapsable: false, - children: [ - "vscode_java.md", - "intellij_idea.md" - ], - initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + text: 'Spring Data', + link: '/spring-data/' }, { - title: '代码案例', - sidebarDepth: 2, - collapsable: false, - children: [ - "getting-started_first-application.md", - "rest-service.md", - "consuming-rest.md" - ], - initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + text: 'Spring Cloud', + link: '/spring-cloud/' + }, + { + text: '更多文档', + ariaLabel: 'Others', + items: [ + { text: 'Spring Cloud Data Flow', link: '/spring-cloud-data-flow/'}, + { text: 'Spring Security', link: '/spring-security/'}, + { text: 'Spring for GraphQL', link: '/spring-for-graphql/'}, + { text: 'Spring Session', link: '/spring-session/'}, + { text: 'Spring Integration', link: '/spring-integration/'}, + { text: 'Spring HATEOAS', link: '/spring-hateoas/'}, + { text: 'Spring REST Docs', link: '/spring-rest-docs/'}, + { text: 'Spring Batch', link: '/spring-batch/'}, + { text: 'Spring AMQP', link: '/spring-amqp/'}, + { text: 'Spring CredHub', link: '/spring-credhub/'}, + { text: 'Spring Flo', link: '/spring-flo/'}, + { text: 'Spring for Apache Kafka', link: '/spring-for-apache-kafka/'}, + { text: 'Spring LDAP', link: '/spring-ldap/'}, + { text: 'Spring Shell', link: '/spring-shell/'}, + { text: 'Spring Statemachine', link: '/spring-statemachine/'}, + { text: 'Spring Vault', link: '/spring-vault/'}, + { text: 'Spring Web Flow', link: '/spring-web-flow/'}, + { text: 'Spring Web Services', link: '/spring-web-services/'} + ] } - ] + ], + sidebar: { + + '/spring-boot/': [ + { + title: '介绍', + sidebarDepth: 2, + collapsable: false, + children: [ + "/spring-boot/getting-help.md", + "/spring-boot/build-tool-plugins.md", + "/spring-boot/getting-started.md", + "/spring-boot/upgrading.md", + "/spring-boot/documentation.md" + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + } + ], + // fallback + '/': + [{ + title: 'Spring 文档', // 必要的 + // path: '/', // 可选的, 标题的跳转链接,应为绝对路径且必须存在 + collapsable: false, // 可选的, 默认值是 true, + sidebarDepth: 1, // 可选的, 默认值是 1 + children: [ + '' + ] + }, + { + title: '介绍', + sidebarDepth: 2, + collapsable: false, + children: [ + "why-spring.md", + "introducing-spring-boot.md", + "quickstart.md" + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + }, + { + title: '教程', + sidebarDepth: 2, + collapsable: false, + children: [ + "system-requirements.md", + "installing.md", + "initializr.md" + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + }, + { + title: '编辑器', + sidebarDepth: 2, + collapsable: false, + children: [ + "vscode_java.md", + "intellij_idea.md" + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + }, + { + title: '代码案例', + sidebarDepth: 2, + collapsable: false, + children: [ + "getting-started_first-application.md", + "rest-service.md", + "consuming-rest.md" + ], + initialOpenGroupIndex: 0 // 可选的, 默认值是 0 + } + ] + } } } } diff --git a/docs/en/spring-boot/README.md b/docs/en/spring-boot/README.md new file mode 100644 index 0000000000000000000000000000000000000000..98f6ceb2e5de2f79b479255ff266b95cef0fee76 --- /dev/null +++ b/docs/en/spring-boot/README.md @@ -0,0 +1 @@ +# Spring Boot \ No newline at end of file diff --git a/docs/spring-boot/README.md b/docs/spring-boot/README.md new file mode 100644 index 0000000000000000000000000000000000000000..98f6ceb2e5de2f79b479255ff266b95cef0fee76 --- /dev/null +++ b/docs/spring-boot/README.md @@ -0,0 +1 @@ +# Spring Boot \ No newline at end of file diff --git a/docs/spring-boot/actuator.md b/docs/spring-boot/actuator.md index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7087f948a2b6436ef25146513acce2dc57308c8c 100644 --- a/docs/spring-boot/actuator.md +++ b/docs/spring-boot/actuator.md @@ -0,0 +1 @@ +# actuator \ No newline at end of file diff --git a/docs/why-spring.md b/docs/why-spring.md index b33409003448de6f8ecf6f44129f2b89320c7664..5a6e45b57793419f4cbb5fb20d804741e4d175fb 100644 --- a/docs/why-spring.md +++ b/docs/why-spring.md @@ -1,3 +1,7 @@ +--- +navbar: / +--- + # 为什么是Spring? Spring 让每个人都可以更快、更轻松、更安全地编写 Java。Spring 对速度、简单性和生产力的关注使其成为[世界上最受欢迎的](https://snyk.io/blog/jvm-ecosystem-report-2018-platform-application/)Java 框架。