Merge branch 'feature/Ti12' into develop

trydofor · Dec 12, 2023 · d496a92 · d496a92
2 parents a4e68b3 + c272b41
commit d496a92
Show file tree

Hide file tree

Showing 641 changed files with 8,636 additions and 5,108 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "observe/mirana"]
 	path = observe/mirana
-	url = ../pro.fessional.mirana.git
+	url = ../professional-mirana.git
 	branch = main
 	shallow = true
 [submodule "observe/meepo"]
 	path = observe/meepo
-	url = ../pro.fessional.meepo.git
+	url = ../professional-meepo.git
 	branch = main
 	shallow = true
 [submodule "observe/docs"]

diff --git a/WingsBoot.t.md b/WingsBoot.t.md
diff --git a/changelog.md b/changelog.md
@@ -2,37 +2,13 @@
 
 # WingsBoot Changelog
 
-Help Yourself, Check [Commits]
+Help Yourself [Commits] and [History]
 
 ## Migrating and Changelog
 
-- notable [Changes] in Docs
+Notable [Changes] in [WingsDoc]
 
-## 3.x. Roadmap
-
-- stable api
-
-## 3.0.3.300-SNAPSHOT [Current]
-
-- spring-boot 3.0.3
-- Jakarta EE 9+
-- java 17
-- jooq 3.17.x
-
-## 2.7.7.220-SNAPSHOT [Temporary]
-
-- spring-boot 2.7.7 💥 OkHttp, Hazelcast, Cache2k
-
-## 2.6.6.210-SNAPSHOT [History]
-
-- java 11
-
-## 2.4.2.x-SNAPSHOT [History]
-
-- java 8
-
-[Current]: https://github.com/trydofor/pro.fessional.wings
 [History]: https://github.com/trydofor/pro.fessional.wings/tags
-[Temporary]: https://github.com/trydofor/pro.fessional.wings/tags
 [Commits]: https://github.com/trydofor/pro.fessional.wings/commits/develop
 [Changes]: https://wings.fessional.pro/9-example/9a.wings-change/
+[WingsDoc]: https://wings.fessional.pro/
diff --git a/...le/winx-admin/src/main/java/com/moilioncircle/wings/admin/controller/AdminController.java b/...le/winx-admin/src/main/java/com/moilioncircle/wings/admin/controller/AdminController.java
@@ -24,7 +24,7 @@ public class AdminController {
     @PostMapping("/admin/disable-root.json")
     public R<Void> rootNeverLogin() {
         authnService.disable(DefaultUserId.Root, WarlockAuthType.USERNAME);
-        log.info("disable root");
+        log.debug("disable root");
         return R.OK;
     }
 }
diff --git a/...nx-common/src/main/java/com/moilioncircle/wings/common/spring/prop/CommonEnabledProp.java b/...nx-common/src/main/java/com/moilioncircle/wings/common/spring/prop/CommonEnabledProp.java
@@ -4,7 +4,7 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * spring-wings-enabled-79.properties
+ * wings-enabled-79.properties
  *
  * @author trydofor
  * @see #Key

diff --git a/example/winx-common/src/main/resources/wings-conf/wings-watching.properties b/example/winx-common/src/main/resources/wings-conf/wings-watching.properties
@@ -1,5 +1,3 @@
-## Whether enable watching
-spring.wings.warlock.enabled.watching=true
 ## -1 means disable, 0 means enable, otherwise number in millis
 #wings.warlock.watching.jooq-threshold=-1
 #wings.warlock.watching.service-threshold=-1

diff --git a/example/winx-devops/src/main/resources/wings-conf/wings-boot-admin.properties b/example/winx-devops/src/main/resources/wings-conf/wings-boot-admin.properties
@@ -3,7 +3,7 @@
 spring.boot.admin.server.enabled=true
 wings.warlock.security.login-forward=false
 wings.warlock.security.logout-success-body=
-#spring.wings.warlock.enabled.controller-proc=false
+#wings.enabled.warlock.mvc-proc=false
 
 spring.boot.admin.context-path=
 spring.boot.admin.ui.title=Wings-Boot-Admin

diff --git a/example/winx-front/src/main/resources/application.properties b/example/winx-front/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 server.port=8094
 spring.application.name=winx-front
+#spring.index.ignore=true
diff --git a/observe/docs b/observe/docs
diff --git a/observe/mirana b/observe/mirana
diff --git a/observe/scripts/wings-mysql-user.sh b/observe/scripts/wings-mysql-user.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-THIS_VERSION=2023-04-14
+THIS_VERSION=2023-11-09
 
 cat <<EOF
 #################################################
@@ -91,17 +91,6 @@ fi
 [[ "$host_dev" == "" ]] && host_dev=%
 [[ "$host_dba" == "" ]] && host_dba=%
 
-exec_cmd=":"
-if [[ "$execute" == "true" ]]; then
-  unalias mysql >/dev/null 2>&1
-  exec_cmd="mysql -vvv -f "
-  if [[ -f "$option" ]]; then
-    echo -e "\033[0;33mNOTE: current option file \033[m"
-    cat "$option"
-    exec_cmd="mysql --defaults-extra-file=$option -vvv -f "
-  fi
-fi
-
 echo -e '\033[37;42;1mNOTE: users and passwd\033[m'
 grep -v '^#' <<EOF
 ${user_raw}${user_pre}${name_pre}raw  $pass_raw
@@ -110,10 +99,12 @@ ${user_dev}${user_pre}${name_pre}dev  $pass_dev
 ${user_dba}${user_pre}${name_pre}dba  $pass_dba
 EOF
 
-echo -e '\033[37;42;1mNOTE: sql script to execute\033[m'
+temp_sql="$userenv.sql"
+echo -e "\033[37;42;1mNOTE: sql script $temp_sql\033[m"
+rm "$temp_sql" >/dev/null 2>&1
 
 if [[ "$command" == "create" ]]; then
-  grep -v '^#' <<EOF | tee /dev/tty | $exec_cmd
+  grep -v '^#' >> "$temp_sql" <<EOF
 -- create
 ${user_raw}CREATE USER '${user_pre}${name_pre}raw'@'$host_raw' IDENTIFIED BY '$pass_raw';
 ${user_app}CREATE USER '${user_pre}${name_pre}app'@'$host_app' IDENTIFIED BY '$pass_app';
@@ -124,7 +115,7 @@ fi
 
 if [[ "$command" == "grant" ]]; then
   for db_main in $grant_db; do
-    grep -v '^#' <<EOF | tee /dev/tty | $exec_cmd
+    grep -v '^#' >> "$temp_sql" <<EOF
 -- grant
 ${user_raw}GRANT SELECT, CREATE TEMPORARY TABLES ON \`$db_main\`.* TO '${user_pre}${name_pre}raw'@'$host_raw';
 ${user_app}GRANT SELECT, CREATE TEMPORARY TABLES, INSERT, UPDATE, DELETE, EXECUTE ON \`$db_main\`.* TO '${user_pre}${name_pre}app'@'$host_app';
@@ -134,19 +125,33 @@ ${user_dba}GRANT ALL ON \`$db_main\`.* TO '${user_pre}${name_pre}dba'@'$host_dba
 ${user_dba}GRANT RELOAD,SHOW VIEW,EXECUTE,PROCESS,REPLICATION CLIENT,REPLICATION SLAVE ON *.* TO '${user_pre}${name_pre}dba'@'$host_dba';
 EOF
     for mb in $more_dba; do
-      grep -v '^#' <<EOF | tee /dev/tty | $exec_cmd
+      grep -v '^#' >> "$temp_sql" <<EOF
 ${user_dba}GRANT SELECT ON \`$mb\`.* TO '${user_pre}${name_pre}dba'@'$host_dba';
 EOF
     done
   done
 fi
 
 if [[ "$command" == "passwd" ]]; then
-  grep -v '^#' <<EOF | tee /dev/tty | $exec_cmd
+  grep -v '^#' >> "$temp_sql" <<EOF
 -- change passwd
 ${user_raw}ALTER USER '${user_pre}${name_pre}raw'@'$host_raw' IDENTIFIED BY '$pass_raw';
 ${user_app}ALTER USER '${user_pre}${name_pre}app'@'$host_app' IDENTIFIED BY '$pass_app';
 ${user_dev}ALTER USER '${user_pre}${name_pre}dev'@'$host_dev' IDENTIFIED BY '$pass_dev';
 ${user_dba}ALTER USER '${user_pre}${name_pre}dba'@'$host_dba' IDENTIFIED BY '$pass_dba';
 EOF
 fi
+
+cat "$temp_sql"
+
+if [[ "$execute" == "true" ]]; then
+  unalias mysql >/dev/null 2>&1
+
+  if [[ -f "$option" ]]; then
+    echo -e "\033[0;33mNOTE: current option file \033[m"
+    cat "$option"
+    mysql --defaults-extra-file="$option" -vvv --force < "$temp_sql"
+  else
+    mysql -vvv --force < "$temp_sql"
+  fi
+fi
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.9</version> <!-- https://github.com/spring-projects/spring-boot/releases -->
+        <version>3.0.12</version> <!-- https://github.com/spring-projects/spring-boot/releases -->
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -21,7 +21,7 @@
 
     <properties>
         <!-- https://github.com/spring-projects/spring-boot/releases -->
-        <revision>3.0.9</revision>
+        <revision>3.0.12</revision>
         <!-- https://maven.apache.org/maven-ci-friendly.html -->
         <changelist>300-SNAPSHOT</changelist>
         <!-- https://docs.spring.io/spring-boot/docs/3.0.3/reference/html/dependency-versions.html -->
@@ -41,21 +41,21 @@
         <annotations.version>24.0.1</annotations.version> <!-- https://github.com/JetBrains/java-annotations/releases -->
         <!-- common utils-->
         <mapstruct.version>1.5.5.Final</mapstruct.version> <!-- https://github.com/mapstruct/mapstruct/releases -->
-        <guava.version>32.1.1-jre</guava.version> <!-- https://github.com/google/guava/releases/ -->
-        <commons-io.version>2.13.0</commons-io.version> <!-- https://commons.apache.org/proper/commons-io/ -->
+        <guava.version>32.1.3-jre</guava.version> <!-- https://github.com/google/guava/releases/ -->
+        <commons-io.version>2.14.0</commons-io.version> <!-- https://commons.apache.org/proper/commons-io/ -->
         <commons-collections4.version>4.4</commons-collections4.version> <!-- https://commons.apache.org/proper/commons-collections/ -->
         <commons-text.version>1.10.0</commons-text.version> <!-- https://commons.apache.org/proper/commons-text/ -->
         <joda-convert.version>2.2.3</joda-convert.version> <!-- https://github.com/JodaOrg/joda-convert/releases -->
         <!-- wings project -->
-        <mirana.version>2.6.0-SNAPSHOT</mirana.version> <!-- https://github.com/trydofor/pro.fessional.mirana -->
-        <meepo.version>1.4.1-SNAPSHOT</meepo.version> <!-- https://github.com/trydofor/pro.fessional.meepo -->
+        <mirana.version>2.6.4-SNAPSHOT</mirana.version> <!-- https://github.com/trydofor/pro.fessional.mirana -->
+        <meepo.version>1.4.14-SNAPSHOT</meepo.version> <!-- https://github.com/trydofor/pro.fessional.meepo -->
         <shardingsphere.version>5.3.2</shardingsphere.version> <!-- https://github.com/apache/shardingsphere/releases -->
         <kaptcha.version>2.3.3</kaptcha.version> <!-- https://github.com/trydofor/kaptcha -->
-        <fastjson2.version>2.0.36</fastjson2.version> <!-- https://github.com/alibaba/fastjson2/releases -->
+        <fastjson2.version>2.0.41</fastjson2.version> <!-- https://github.com/alibaba/fastjson2/releases -->
         <fastjson.version>${fastjson2.version}</fastjson.version> <!-- https://github.com/alibaba/fastjson/releases -->
         <kryo.version>5.5.0</kryo.version> <!-- https://github.com/EsotericSoftware/kryo/releases -->
         <transmittable.version>2.14.3</transmittable.version> <!-- https://github.com/alibaba/transmittable-thread-local/releases -->
-        <bouncycastle.version>1.74</bouncycastle.version> <!-- https://bouncycastle.org/releasenotes.html -->
+        <bouncycastle.version>1.76</bouncycastle.version> <!-- https://bouncycastle.org/releasenotes.html -->
         <justauth.version>1.16.5</justauth.version> <!-- https://github.com/justauth/JustAuth/releases -->
         <!-- servicecomb -->
         <servicecomb.version>2.8.8</servicecomb.version> <!-- https://github.com/apache/servicecomb-java-chassis/releases -->
@@ -64,6 +64,7 @@
         <boot-admin.version>3.0.4</boot-admin.version> <!-- https://github.com/codecentric/spring-boot-admin/releases -->
         <sentry.version>6.23.0</sentry.version> <!-- https://github.com/getsentry/sentry-java/releases buildSrc/src/main/java/Config.kt -->
         <retrofit.version>2.9.0</retrofit.version> <!-- https://github.com/square/retrofit/tags -->
+        <allure.version>2.24.0</allure.version> <!-- https://github.com/allure-framework/allure-java/releases -->
         <!-- mvn-build-plugin -->
         <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version> <!-- https://github.com/mojohaus/flatten-maven-plugin/releases/tag -->
         <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version> <!-- https://github.com/apache/maven-gpg-plugin/tags -->
@@ -125,11 +126,6 @@
                 <version>${mirana.version}</version>
             </dependency>
             <!-- pro.fessional.wings -->
-            <dependency>
-                <groupId>pro.fessional.wings</groupId>
-                <artifactId>aegis</artifactId>
-                <version>${wings.version}</version>
-            </dependency>
             <dependency>
                 <groupId>pro.fessional.wings</groupId>
                 <artifactId>silencer</artifactId>
@@ -486,6 +482,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.qameta.allure</groupId>
+                <artifactId>allure-java-commons</artifactId>
+                <version>${allure.version}</version>
+            </dependency>
             <!-- do NOT import any BOM -->
         </dependencies>
     </dependencyManagement>
@@ -583,7 +584,11 @@
                                 <artifactId>spring-boot-autoconfigure-processor</artifactId>
                                 <version>${spring-boot.version}</version>
                             </path>
-
+                            <path>
+                                <groupId>org.springframework</groupId>
+                                <artifactId>spring-context-indexer</artifactId>
+                                <version>${spring-framework.version}</version>
+                            </path>
                         </annotationProcessorPaths>
                     </configuration>
                 </plugin>

diff --git a/radiant/devs-codegen/pom.xml b/radiant/devs-codegen/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>pro.fessional.wings</groupId>
+        <artifactId>radiant</artifactId>
+        <version>${revision}.${changelist}</version>
+    </parent>
+
+    <artifactId>devs-codegen</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Radiant::Devs::CodeGen</name>
+    <description>generate the wings auto-gen code automatically</description>
+
+    <dependencies>
+        <!-- codegen  -->
+        <dependency>
+            <groupId>pro.fessional.wings</groupId>
+            <artifactId>faceless-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>pro.fessional.wings</groupId>
+            <artifactId>faceless-codegen</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>pro.fessional.wings</groupId>
+            <artifactId>warlock-codegen</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...s/devs/codegen/AutogenDependencyTest.java → ...nal/wings/devs/AutogenDependencyTest.java b/...s/devs/codegen/AutogenDependencyTest.java → ...nal/wings/devs/AutogenDependencyTest.java
@@ -1,4 +1,4 @@
-package pro.fessional.wings.devs.codegen;
+package pro.fessional.wings.devs;
 
 import lombok.Setter;
 import org.junit.jupiter.api.Disabled;
@@ -41,19 +41,25 @@ public class AutogenDependencyTest {
     private final String projectRoot = "../../";
 
     @Test
-    void test01AllTestCode() {
+    void test01AllTestJooq() {
         test11FacelessJooqTest();// faceless-jooq
         test11FacelessShardTest();// faceless-shard
     }
 
+    @Test
+    void test01AllMainJooq() {
+        test21WarlockAutogenJooq();// warlock-autogen/database
+        test31TinyMailAutogenJooq();// tiny-autogen/mail
+        test31TinyTaskAutogenJooq();// tiny-autogen/task
+    }
+
     @Test
     void test01AllMainCode() {
+        test01AllMainJooq();
+
         test10FacelessAutogen();// faceless-autogen/enums
         test20WarlockAutogenEnum();// warlock-autogen/enums
         test20WarlockAutogenAuth();// warlock-autogen/security
-        test21WarlockAutogenJooq();// warlock-autogen/database
-        test31TinyMailAutogenJooq();// tiny-autogen/mail
-        test31TinyTaskAutogenJooq();// tiny-autogen/task
     }
 
     // ////////////////// individual test  //////////////////
@@ -73,7 +79,7 @@ void test10FacelessAutogen() {
     void test11FacelessJooqTest() {
         Warlock3JooqGenerator generator = new Warlock3JooqGenerator();
         generator.setTargetDir(projectRoot + "wings/faceless-jooq/src/test/java/");
-        generator.setTargetPkg("pro.fessional.wings.faceless.database.autogen");
+        generator.setTargetPkg("pro.fessional.wings.faceless.app.database.autogen");
         generator.gen(jdbcUrl, jdbcUser, jdbcPass,
                 h -> h.databaseIncludes("sys_constant_enum", "sys_standard_i18n", "tst_sharding", "tst_normal_table")
                       .forcedIntConsEnum(StandardLanguage.class, "tst_sharding.language")
@@ -85,7 +91,7 @@ void test11FacelessJooqTest() {
     void test11FacelessShardTest() {
         Warlock3JooqGenerator generator = new Warlock3JooqGenerator();
         generator.setTargetDir(projectRoot + "wings/faceless-shard/src/test/java/");
-        generator.setTargetPkg("pro.fessional.wings.faceless.database.autogen");
+        generator.setTargetPkg("pro.fessional.wings.faceless.app.database.autogen");
         generator.gen(jdbcUrl, jdbcUser, jdbcPass,
                 h -> h.databaseIncludes("tst_sharding", "tst_normal_table"));
     }

diff --git a/...essional/wings/devs/BootDatabaseTest.java → ...essional/wings/devs/BootDatabaseTest.java b/...essional/wings/devs/BootDatabaseTest.java → ...essional/wings/devs/BootDatabaseTest.java
@@ -27,8 +27,8 @@
  * @since 2021-02-22
  */
 @SpringBootTest(properties = {
-        "spring.wings.faceless.flywave.enabled.module=true",
-        "spring.wings.faceless.flywave.enabled.checker=false",
+        "wings.enabled.faceless.flywave=true",
+        "wings.faceless.flywave.checker=false",
 })
 @Disabled("manual initialization")
 public class BootDatabaseTest {

diff --git a/...onal/wings/devs/WingsDevsApplication.java → ...onal/wings/devs/WingsDevsApplication.java b/...onal/wings/devs/WingsDevsApplication.java → ...onal/wings/devs/WingsDevsApplication.java
diff --git a/radiant/devs-codegen/src/test/resources/application.properties b/radiant/devs-codegen/src/test/resources/application.properties
@@ -0,0 +1,6 @@
+wings.enabled.silencer.scanner=false
+
+wings.faceless.flywave.checker=false
+
+spring.application.name=wings-codegen
+debug=true
diff --git a/...ings-conf/spring-datasource-99.properties → ...ings-conf/spring-datasource-99.properties b/...ings-conf/spring-datasource-99.properties → ...ings-conf/spring-datasource-99.properties
diff --git a/radiant/devs-mvndep/src/test/resources/application.properties b/radiant/devs-mvndep/src/test/resources/application.properties
+13 −13		pom.xml
+40 −3		src/main/java/pro/fessional/mirana/best/TypedKey.java
+39 −2		src/main/java/pro/fessional/mirana/best/TypedReg.java
+49 −55		src/main/java/pro/fessional/mirana/id/LightIdBufferedProvider.java
+10 −0		src/main/java/pro/fessional/mirana/id/LightIdProvider.java
+62 −27		src/main/java/pro/fessional/mirana/stat/LogStat.java
+41 −20		src/main/java/pro/fessional/mirana/text/WhiteUtil.java
+13 −4		src/test/java/pro/fessional/mirana/best/TypedRegTest.java
+43 −0		src/test/java/pro/fessional/mirana/text/WhiteUtilTest.java