Merge pull request #76 from trydofor/main

changelog, and semver

Author: trydofor

.vscode/settings.json

@@ -17,6 +17,7 @@
     "autonumber",
     "autoreg",
     "autorun",
+    "autosquash",
     "backquote",
     "baeldung",
     "batrider",
@@ -186,6 +187,7 @@
     "oapi",
     "Okhttp",
     "Omniknight",
+    "oneline",
     "OOTB",
     "operationthreadsamples",
     "Orika",
@@ -314,4 +316,24 @@
     "zhyd",
     "zoneid"
   ],
+  "workbench.colorCustomizations": {
+    "activityBar.activeBackground": "#65c89b",
+    "activityBar.background": "#65c89b",
+    "activityBar.foreground": "#15202b",
+    "activityBar.inactiveForeground": "#15202b99",
+    "activityBarBadge.background": "#945bc4",
+    "activityBarBadge.foreground": "#e7e7e7",
+    "commandCenter.border": "#15202b99",
+    "sash.hoverBorder": "#65c89b",
+    "statusBar.background": "#42b883",
+    "statusBar.foreground": "#15202b",
+    "statusBarItem.hoverBackground": "#359268",
+    "statusBarItem.remoteBackground": "#42b883",
+    "statusBarItem.remoteForeground": "#15202b",
+    "titleBar.activeBackground": "#42b883",
+    "titleBar.activeForeground": "#15202b",
+    "titleBar.inactiveBackground": "#42b88399",
+    "titleBar.inactiveForeground": "#15202b99"
+  },
+  "peacock.color": "#42b883",
 }

src/0-wings/0d-qa-devops.md

@@ -190,10 +190,43 @@ To get information about server, use the following,
 When debugging third-party integrations such as Oauth, payments, etc., you need to have a public ip or domain
 to forward public requests to the development machine for debugging.
 
-* Temporarily with ssh - `ssh -R 9988:127.0.0.1:8080 user@remote`
+* Temporarily with ssh - `ssh -R 9988:localhost:8080 user@remote`
 * persistent with frp - <https://gofrp.org/docs/>
 * Simple with netapp - <https://natapp.cn/>
 
+take local.moilioncircle.com for example, use ssh + nginx to forward
+
+* local port 8080
+* public domain local.moilioncircle.com
+* public port 9988, also http(80), 443 https(443)
+* forward request from public to localhost:8080
+
+```nginx
+# ssh -R 9988:localhost:8080 ubuntu@local.moilioncircle.com
+server {
+    listen       80;
+    listen       443 ssl;
+    server_name  local.moilioncircle.com;
+
+    access_log /data/logs/nginx/local.moilioncircle.com-access.log;
+    error_log  /data/logs/nginx/local.moilioncircle.com-error.log;
+
+    ssl_certificate     /data/nginx/cert/moilioncircle.com/fullchain.pem;
+    ssl_certificate_key /data/nginx/cert/moilioncircle.com/privkey.pem;
+
+    location / {
+      proxy_pass                      http://127.0.0.1:9988;
+      proxy_http_version              1.1;
+      proxy_cache_bypass              $http_upgrade;
+      proxy_set_header    Upgrade     $http_upgrade;
+      proxy_set_header    Connection  $http_connection;
+      proxy_set_header    Host        localhost;
+      proxy_set_header    X-Real-IP   $remote_addr;
+      proxy_redirect      http://     $scheme://;
+    }
+}
+```
+
 ## 0D.09.IDEA Hits Component/Scanned
 
 When importing the Wings project, IDEA cannot be able to handle the WingsAutoConfiguration in spring.factories,
@@ -222,8 +255,8 @@ at org.jooq.impl.AbstractQuery.execute(AbstractQuery.java:390)
 ## 0D.11.`Input length = 1` Error
 
 ```text
- Failed to execute goal org.apache.maven.plugins:maven-resources-plugin:3.2.0:resources
-  (default-resources) on project xxx-common: Input length = 1
+Failed to execute goal org.apache.maven.plugins:maven-resources-plugin:3.2.0:resources
+(default-resources) on project xxx-common: Input length = 1
 ```
 
 The reason is that there are non-text files (not readable by string) in the filter directory of the maven-resources-plugin.
@@ -681,3 +714,21 @@ so, when handling async/future tasks, interrupt, cancel and shutdown need to be
 
 * Tolerant of loss, await-termination=false
 * Recoverable, await-termination=true, actively interrupt or cancel
+
+## 0D.42.Git fixup commit
+
+```bash
+git log --oneline -n 5 | cat -n # check commit history
+# 1  86f226c 📝 changelog of 337, 346
+# 2  0fccb54 ✨ ssh+nginx to test Oauth
+# 3  32d98bc 📝 changelog of 301.741
+# 4  fb31cf0 📝 semver detail meaning
+# 5  0fb5232 📝 typo Wings TerminalContext
+git add . # add all changes
+git status # check changes
+
+## fixup by hash or ^4
+git commit --fixup=fb31cf0 # HEAD^4
+git rebase -i --autosquash fb31cf0^ # HEAD^5
+git push -f
+```

src/0-wings/README.md

@@ -30,8 +30,14 @@ to microservices. At any project stage and business size, it can:
 
 ## 0.1.Version Number
 
-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`).
+From `x01.x.x`, Wings version is a standard [3-segment](https://semver.org), and
+
+* major - mainly project compatibility, including its major dependencies
+* minor - mainly structural or framework-level addition, defensive compilation errors
+* patch - function enhancement, option and config addition
+* defensive compilation errors - compilation errors instead of runtime errors
+
+Version number is the wings dev version (`m.n.p-SNAPSHOT`) with SpringBoot (`M.N.P`).
 
 `V` = `M*100+m`.`N*100+n`.`P*100+p`-`SNAPSHOT`
 

src/3-slardar/3d-i18n-zone.md

@@ -33,9 +33,9 @@ The `LocaleResolver` acts in the `doService`, after the `doFilter`, so there is
 `WingsLocaleResolver` is a servlet implementation and does not support webflux.
 
 * After user login, Locale and ZoneId is automatically generated in the Context
-* `SecurityContextUtil` gets the Context in the Mvc layer, implemented by Filter
-* `WingsTerminalContext` is used in the Service layer, implemented by TerminalInterceptor
-* `LocaleZoneIdUtil` is based on `WingsTerminalContext`, used in non-spring bean
+* Spring `SecurityContextUtil` gets the Context in the Mvc layer, implemented by Filter
+* Wings `TerminalContext` is used in the Service layer, implemented by TerminalInterceptor
+* `LocaleZoneIdUtil` is based on `TerminalContext`, used in non-spring bean
 * `LocaleContextHolder` is from SpringMvc, used in Mvc without request
 * `RequestHelper` is used in Mvc with request
 

src/9-example/9a.wings-change/9a0.notable.md

@@ -30,6 +30,9 @@ Incompatible and important features grouped by feather branch in reverse order.
 
 ## ![BountyHunter](/bountyhunter_minimap_icon.png "BountyHunter") ongoing [BountyHunter] 300.301.741-SS
 
+* 💥 add apple oauth login [#337](https://github.com/trydofor/professional-wings/issues/337)
+* 💥 change oauth check nonce api [#346](https://github.com/trydofor/professional-wings/issues/346)
+
 ## ![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)

src/9-example/9a.wings-change/9a8.300-301-741.md

@@ -0,0 +1,35 @@
+---
+isOriginal: true
+icon: circle-up
+category:
+  - Practice
+  - Upgrade
+---
+
+# 9A7.Upgrade 300.301.741
+
+Upgrade manual from `3.3.140` after having upgraded to `300.301.741`, including,
+
+* Bounty Hunter
+  - 300.301.741
+
+## ![BountyHunter](/bountyhunter_minimap_icon.png "BountyHunter") 9A8.1.Bounty Hunter
+
+SemVer composed Spring Boot and wingsDev. including many breaking refactorings.
+
+### 300.301.741 Oauth nonceCheck
+
+[#337](https://github.com/trydofor/professional-wings/issues/337) ⚠️ Runtime - AuthCheckController#nonceCheck
+
+rename to `JustAuthRequestManager`
+
+[#346](https://github.com/trydofor/professional-wings/issues/346) 💥 Compile - JustAuthRequestBuilder
+
+```diff
+- * @return {401} token is not-found, expired, or failed
++ * @return {200 | Result(false))
+- * @return {200 | Result(false, message='authing')} in authing
++ * @return {200 | Result(false, code='authing', message='authing')} in authing
+- * @return {200 | Result(true, data=sessionId)}
++ * @return {200 | Result(true, code='session', data=sessionId)}
+```

src/9-example/9a.wings-change/README.md

@@ -24,3 +24,4 @@ miro version change log, major version upgrade guide.
 * [Upgrade 3.0.6.300 Guide](./9a5.306-300.md)
 * [Upgrade 3.2.100 Guide](./9a6.320-100.md)
 * [Upgrade 3.3.140 Guide](./9a7.330-140.md)
+* [Upgrade 300.301.741 Guide](./9a8.300-301-741.md)

src/9-example/README.md

@@ -125,7 +125,7 @@ server {
         proxy_http_version  1.1;
         proxy_cache_bypass  $http_upgrade;
 
-        proxy_set_header  Connection   "";            # long conn
+        proxy_set_header  Connection   "";            # delete header, long conn
         #proxy_set_header Connection   "upgrade";     # ws
         #proxy_set_header Upgrade      $http_upgrade; # ws
         proxy_set_header  Host         $host;

src/zh/0-wings/0d-qa-devops.md

@@ -190,6 +190,39 @@ Mapper        ReMap-4.2.6  thrpt   25    505843.993 ±   25950.082  ops/s
 * 持久用 frp - <https://gofrp.org/docs/>
 * 简单用 netapp - <https://natapp.cn/>
 
+以 local.moilioncircle.com 为例，临时使用 ssh + nginx 以下转发
+
+* 本地端口 8080
+* 公网域名 local.moilioncircle.com
+* 公网端口 9988, 及 http(80), 443 https(443)
+* 转发公网的请求到 localhost:8080
+
+```nginx
+# ssh -R 9988:127.0.0.1:8080 ubuntu@local.moilioncircle.com
+server {
+    listen       80;
+    listen       443 ssl;
+    server_name  local.moilioncircle.com;
+
+    access_log /data/logs/nginx/local.moilioncircle.com-access.log;
+    error_log  /data/logs/nginx/local.moilioncircle.com-error.log;
+
+    ssl_certificate     /data/nginx/cert/moilioncircle.com/fullchain.pem;
+    ssl_certificate_key /data/nginx/cert/moilioncircle.com/privkey.pem;
+
+    location / {
+      proxy_pass                      http://127.0.0.1:9988;
+      proxy_http_version              1.1;
+      proxy_cache_bypass              $http_upgrade;
+      proxy_set_header    Upgrade     $http_upgrade;
+      proxy_set_header    Connection  $http_connection;
+      proxy_set_header    Host        localhost;
+      proxy_set_header    X-Real-IP   $remote_addr;
+      proxy_redirect      http://     $scheme://;
+    }
+}
+```
+
 ## 0D.09.IDEA提示component/scanned
 
 导入wings工程，Idea会无法处理spring.factories中的WingsAutoConfiguration，会报类似以下信息
@@ -216,8 +249,8 @@ at org.jooq.impl.AbstractQuery.execute(AbstractQuery.java:390)
 ## 0D.11.错误`Input length = 1`
 
 ```text
- Failed to execute goal org.apache.maven.plugins:maven-resources-plugin:3.2.0:resources
-  (default-resources) on project xxx-common: Input length = 1
+Failed to execute goal org.apache.maven.plugins:maven-resources-plugin:3.2.0:resources
+(default-resources) on project xxx-common: Input length = 1
 ```
 
 原因是maven-resources-plugin的filter目录中存在非文本文件(不可按字符串读取)，
@@ -657,3 +690,21 @@ wings的线程池，默认配置如下，会等待任务（执行中及队列中
 
 * 可丢失型，await-termination=false
 * 可恢复型，await-termination=true，主动处理中断或取消
+
+## 0D.42.git fixup 提交
+
+```bash
+git log --oneline -n 5 | cat -n # check commit history
+# 1  86f226c 📝 changelog of 337, 346
+# 2  0fccb54 ✨ ssh+nginx to test Oauth
+# 3  32d98bc 📝 changelog of 301.741
+# 4  fb31cf0 📝 semver detail meaning
+# 5  0fb5232 📝 typo Wings TerminalContext
+git add . # add all changes
+git status # check changes
+
+## fixup by hash or ^4
+git commit --fixup=fb31cf0 # HEAD^4
+git rebase -i --autosquash fb31cf0^ # HEAD^5
+git push -f
+```

src/zh/0-wings/README.md

@@ -29,8 +29,14 @@ WingsBoot(代号神翼)是SpringBoot的一个脚手架，没有魔法和定制
 
 ## 0.1.版本号说明
 
-从`x01.x.x`起，Wings版本号为标准的[3段式](https://semver.org/lang/zh-CN/)，
-由基于SpringBoot（`M.N.P`）的开发版（`m.n.p-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`