Merge pull request #75 from trydofor/main

trydofor · web-flow · commit e70b762ba982 · 2025-03-19T12:35:22.000+08:00
version schema to semver
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+22.13.0
diff --git a/.tool-versions b/.tool-versions
diff --git a/README.md b/README.md
@@ -14,7 +14,8 @@ make sure the versions matches,
 
 * `vue` to [hope vue]
 * `vuepress/*` to [hope vue]
-* `execa` to [hope npm]
+* `execa` to [hope cli]
+* `prettier` to [hope npm]
 * `deploy-docs.yml` to [git workflow]
 
 then npm commands,
@@ -24,7 +25,8 @@ then npm commands,
 * `npm run docs:dev-clean` - clean and review
 * `npm run docs:update-package` - update deps helper
 
-[hope vue]: https://github.com/vuepress-theme-hope/vuepress-theme-hope/blob/main/packages/components/package.json
+[hope vue]: https://github.com/vuepress-theme-hope/vuepress-theme-hope/blob/main/pnpm-workspace.yaml
+[hope cli]: https://github.com/vuepress-theme-hope/vuepress-theme-hope/blob/main/packages/create/package.json
 [hope npm]: https://github.com/vuepress-theme-hope/vuepress-theme-hope/blob/main/package.json
 [git workflow]: https://github.com/vuepress-theme-hope/vuepress-theme-hope/blob/main/packages/create/src/config/workflow.ts
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,14 +12,14 @@
     "docs:update-package": "npx vp-update"
   },
   "devDependencies": {
-    "@vuepress/bundler-vite": "2.0.0-rc.19",
-    "@vuepress/plugin-docsearch": "2.0.0-rc.74",
-    "mermaid": "^11.2.0",
-    "prettier": "^3.2.5",
-    "sass-embedded": "^1.83.4",
-    "vue": "^3.5.13",
-    "vuepress": "2.0.0-rc.19",
-    "vuepress-theme-hope": "2.0.0-rc.71"
+    "@vuepress/bundler-vite": "2.0.0-rc.20",
+    "@vuepress/plugin-docsearch": "2.0.0-rc.82",
+    "mermaid": "11.4.1",
+    "prettier": "3.5.3",
+    "sass-embedded": "1.85.1",
+    "vue": "3.5.13",
+    "vuepress": "2.0.0-rc.20",
+    "vuepress-theme-hope": "2.0.0-rc.74"
   },
   "engines": {
     "node": ">=20"
diff --git a/src/0-wings/0a-code-style.md b/src/0-wings/0a-code-style.md
@@ -486,4 +486,4 @@ Setter naming in Pojo, taking into account the common serialization tool compati
 In this context, non-serialized Setters refer to polymorphic Setters with the same name but different parameters.
 In particular, a single parameter tends to interfere with the serialization of pojo's real Setters.
 
-For differences between jackson and fastjson, see [0D.03.jackson and fastjson](. /0d-qa-devops.md#0d03)
+For differences between jackson and fastjson, see [0D.03.jackson and fastjson](./0d-qa-devops.md#0d03)
diff --git a/src/0-wings/0f-qa-others.md b/src/0-wings/0f-qa-others.md
@@ -80,7 +80,7 @@ $0.childNodes.forEach(a=>console.log('![' + a.title +'](' + a.firstChild.src.
 | ![Ancient Apparition](/ancientapparition_minimap_icon.png) Ancient Apparition | 2023-10-20 | ![Ti12](/team_spirit.png) Ti12 Team Spirit | 2023-12-12 |
 | ![Anti-Mage](/antimage_minimap_icon.png) Anti-Mage | 2024-01-29 | ![Arc Warden](/arcwarden_minimap_icon.png) Arc Warden | 2024-03-03 |
 | ![Bane](/bane_minimap_icon.png "Bane") Bane | 2024-05-14 | ![Batrider](/batrider_minimap_icon.png "Batrider") Batrider | 2024-08-31 |
-| ![Bloodseeker](/bloodseeker_minimap_icon.png "Bloodseeker") Bloodseeker | - | ![Bounty Hunter](/bountyhunter_minimap_icon.png "Bounty Hunter") Bounty Hunter | - |
+| ![Bloodseeker](/bloodseeker_minimap_icon.png "Bloodseeker") Bloodseeker | 2025-02-08 | ![Bounty Hunter](/bountyhunter_minimap_icon.png "Bounty Hunter") Bounty Hunter | - |
 | ![Broodmother](/broodmother_minimap_icon.png "Broodmother") Broodmother | - | ![Chen](/chen_minimap_icon.png "Chen") Chen | - |
 
 ---
diff --git a/src/0-wings/README.md b/src/0-wings/README.md
@@ -30,14 +30,21 @@ to microservices. At any project stage and business size, it can:
 
 ## 0.1.Version Number
 
-Wings version is [3-segment](https://semver.org), the first 2 is SpringBoot's,
-the 3rd is Wings `BUILD` number. For example, `3.2.100-SNAPSHOT` are,
-
-* `3.2` - SpringBoot's `MAJOR` and `MINOR`
-* `100` - 3 digits, should reset to `100` when `MAJOR` changed
-  - first 2, range [10-99], semver's `MINOR` meaning
-  - last 1, range [0-9], semver's `PATCH` meaning
-* `SNAPSHOT` - maven's SNAPSHOT
+From `x01.x.x`, Wings version is a standard [3-segment](https://semver.org),
+Combined with the dev version (`m.n.p-SNAPSHOT`) based on SpringBoot (`M.N.P`).
+
+`V` = `M*100+m`.`N*100+n`.`P*100+p`-`SNAPSHOT`
+
+So, a Wings version is `300.201.1230-SNAPSHOT`, then.
+
+* SpringBoot - `3.2.12`
+* Wings Dev - `0.1.30-SNAPSHOT`
+
+But, under `x00.x.x`, i.e. Wings dev is `0.x.x`, semantic downgrades,
+
+* `SNAPSHOT` equals to `path`
+* `path` equals to `minor`
+* `minor` equals to `major`
 
 Wings uses the `revision` and `changelist` CI placeholders, requires Maven 3.5.0+.
 
diff --git a/src/4-warlock/4a-authn.md b/src/4-warlock/4a-authn.md
@@ -37,14 +37,19 @@ In Wings, there are 2 AuthenticationEntryPoint by default.
 LoginUrl can select which form of login to provide to the user by login-forward setting.
 
 On the EntryPoint selection, `http header` can be set to satisfy specific matching rules.
-The following settings can skip basic authentication rules, see HttpBasicConfigurer.registerDefaults for details
-
-* Without the `X-Requested-With: XMLHttpRequest` header
-* Include any of the following values in `Accept`
-  - application/xhtml+xml
-  - image/*
-  - text/html
-  - text/plain
+The following settings use basic authentication if any of the rules are met.
+see [HttpBasicConfigurer.registerDefaults](https://github.com/spring-projects/spring-security/blob/39a80497c27b4cbab70f331f1f92eac7d555f502/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java#L168-L187) for details
+
+* X_REQUESTED_WITH - contains `X-Requested-With: XMLHttpRequest` header
+* restNotHtmlMatcher - `Accept` dont contain `text/html`, and contains any of the following,
+  - application/atom+xml
+  - application/x-www-form-urlencoded
+  - application/json
+  - application/octet-stream
+  - application/xml
+  - multipart/form-data
+  - text/xml
+* allMatcher - `Accept` contains `*/*`
 
 ## 4A.3.OpenAPI3 Features
 
diff --git a/src/9-example/9a.wings-change/9a0.notable.md b/src/9-example/9a.wings-change/9a0.notable.md
@@ -10,7 +10,8 @@ category:
 
 Incompatible and important features grouped by feather branch in reverse order.
 
-[Bloodseeker]: https://github.com/trydofor/professional-wings/tree/develop
+[BountyHunter]: https://github.com/trydofor/professional-wings/tree/develop
+[Bloodseeker]: https://github.com/trydofor/professional-wings/tree/3.3.140
 [Batrider]: https://github.com/trydofor/professional-wings/tree/3.2.130
 [Bane]:  https://github.com/trydofor/professional-wings/tree/3.2.120
 [ArcWarden]: https://github.com/trydofor/professional-wings/tree/3.2.110
@@ -27,7 +28,9 @@ Incompatible and important features grouped by feather branch in reverse order.
 [Clockwerk]: https://github.com/trydofor/professional-wings/tree/4ff27bf31299303956b5e63999a3183d2c474d36
 [ChaosKnight]: https://github.com/trydofor/professional-wings/tree/731a61c9aea5f5c7bbc6a0ce69f379f14b85a0c9
 
-## ![Bloodseeker](/bloodseeker_minimap_icon.png "Bloodseeker") ongoing [Bloodseeker] 3.3.140.SS
+## ![BountyHunter](/bountyhunter_minimap_icon.png "BountyHunter") ongoing [BountyHunter] 300.301.741-SS
+
+## ![Bloodseeker](/bloodseeker_minimap_icon.png "Bloodseeker") 250208 [Bloodseeker] 3.3.140
 
 * 💥 up deps: boot 3.3, mirana new i18n [#309](https://github.com/trydofor/professional-wings/issues/309)
 * 💥 extract i18n text to codeEnum [#310](https://github.com/trydofor/professional-wings/issues/310)
diff --git a/src/a-mirana/a1.mirana.md b/src/a-mirana/a1.mirana.md
@@ -55,7 +55,7 @@ java8, 0-dependency, is an addition to guava, `commons-*`.
 
 ## A1.3.Version number
 
-From `2.7.0`, back to the standard [3-segment](https://semver.org).
+From `3.0.0`, back to the standard [3-segment](https://semver.org).
 
 And before that, the version is `sqrt` + `3-segment`, e.g. √2 are `1.4.0`, `1.4.1`, `1.4.14`.
 If the version is not enough, then write infinitely `1.4.14213562373095`
diff --git a/src/zh/0-wings/README.md b/src/zh/0-wings/README.md
@@ -29,14 +29,21 @@ WingsBoot(代号神翼)是SpringBoot的一个脚手架，没有魔法和定制
 
 ## 0.1.版本号说明
 
-Wings版本号为标准的[3段式](https://semver.org/lang/zh-CN/)，前2段为SpringBoot的版本，
-第3段为Wings的`BUILD`，例如，`3.2.100-SNAPSHOT`的含义如下，
-
-* `3.2` - SpringBoot的`MAJOR`和`MINOR`
-* `100` - 3位数字，当`MINOR`变化时，应该重置为`100`
-  - 前2位数字，范围[10-99]，语义化`MINOR`含义
-  - 后1位数字，范围[0-9]，语义化`PATCH`含义
-* `SNAPSHOT` - maven的SNAPSHOT
+从`x01.x.x`起，Wings版本号为标准的[3段式](https://semver.org/lang/zh-CN/)，
+由基于SpringBoot（`M.N.P`）的开发版（`m.n.p-SNAPSHOT`）组合而成，
+
+`V` = `M*100+m`.`N*100+n`.`P*100+p`-`SNAPSHOT`
+
+因此，当Wings版本为`300.201.1230-SNAPSHOT`，那么，
+
+* SpringBoot - `3.2.12`
+* Wings开发版 - `0.1.30-SNAPSHOT`
+
+但是，版本为`x00.x.x`，即wings开发版为`0.x.x`时，语义降级，
+
+* `SNAPSHOT` 相当于 `path`
+* `path` 相当于 `minor`
+* `minor` 相当于 `major`
 
 Wings使用了`revision`和`changelist`的CI占位属性，Maven需要3.5.0以上。
 
diff --git a/src/zh/4-warlock/4a-authn.md b/src/zh/4-warlock/4a-authn.md
@@ -36,14 +36,18 @@ wings中，默认存在2个AuthenticationEntryPoint，
 LoginUrl可以通过设置login-forward，选择以何种形式提供给用户端登录。
 
 在EntryPoint的选择上，可以设置`http header`来满足特定的匹配规则。
-以下设置可跳过basic验证规则，详见 HttpBasicConfigurer.registerDefaults
-
-* 不含`X-Requested-With: XMLHttpRequest` header
-* `Accept`中包括以下任意值
-  - application/xhtml+xml
-  - image/*
-  - text/html
-  - text/plain
+以下设置任意规则满足，则符合 basic 验证，详见 [HttpBasicConfigurer.registerDefaults](https://github.com/spring-projects/spring-security/blob/39a80497c27b4cbab70f331f1f92eac7d555f502/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java#L168-L187)
+
+* X_REQUESTED_WITH - 含`X-Requested-With: XMLHttpRequest` header
+* restNotHtmlMatcher - `Accept` 不含 `text/html`，且包含以下值之一
+  - application/atom+xml
+  - application/x-www-form-urlencoded
+  - application/json
+  - application/octet-stream
+  - application/xml
+  - multipart/form-data
+  - text/xml
+* allMatcher - `Accept` 包含 `*/*`
 
 ## 4A.3.OpenAPI3特点
 
diff --git a/src/zh/a-mirana/a1.mirana.md b/src/zh/a-mirana/a1.mirana.md
@@ -53,7 +53,7 @@ Java8, 零依赖，是`guava`, `commons-*`的补充。
 
 ## A1.3.版本序号
 
-从 `2.7.0`开始，回归标准的[三段法](https://semver.org/lang/zh-CN/)。
+从 `3.0.0`开始，回归标准的[三段法](https://semver.org/lang/zh-CN/)。
 
 在此之前的版本号为开根号+三段法，如√2对应的`1.4.0`, `1.4.1`, `1.4.14`，
 若版本不够且不想跳版本，则无限的写下去`1.4.14213562373095`
